You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/11/13 06:28:01 UTC
[01/51] [abbrv] stratos git commit: works 6 oct
Repository: stratos
Updated Branches:
refs/heads/master e8416d340 -> 762845d1d
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd9c0ec5/hs_err_pid19968.log
----------------------------------------------------------------------
diff --git a/hs_err_pid19968.log b/hs_err_pid19968.log
new file mode 100644
index 0000000..7f2ccb4
--- /dev/null
+++ b/hs_err_pid19968.log
@@ -0,0 +1,1394 @@
+#
+# A fatal error has been detected by the Java Runtime Environment:
+#
+# SIGSEGV (0xb) at pc=0x00007f17912fbb52, pid=19968, tid=139738837137152
+#
+# JRE version: 6.0_45-b06
+# Java VM: Java HotSpot(TM) 64-Bit Server VM (20.45-b01 mixed mode linux-amd64 compressed oops)
+# Problematic frame:
+# V [libjvm.so+0x233b52] markOopDesc::must_be_preserved_with_bias(oopDesc*) const+0x32
+#
+# If you would like to submit a bug report, please visit:
+# http://java.sun.com/webapps/bugreport/crash.jsp
+#
+
+--------------- T H R E A D ---------------
+
+Current thread (0x00007f178c065800): VMThread [stack: 0x00007f177bafb000,0x00007f177bbfc000] [id=19984]
+
+siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x00000000000000b0
+
+Registers:
+RAX=0x0000000080012ba8, RBX=0x00000000c6cbeaa8, RCX=0x0000000000000000, RDX=0x0000000000000000
+RSP=0x00007f177bbfa5d0, RBP=0x00007f177bbfa5d0, RSI=0x00000000c6cbeaa8, RDI=0x0000001700000000
+R8 =0x00007f1791b6e300, R9 =0x0000000080012b90, R10=0x0000000000000002, R11=0x000000000000000b
+R12=0x00000000c6cbeaa4, R13=0x0000001700000000, R14=0x0000000080012ba0, R15=0x00000000c6cbeaa8
+RIP=0x00007f17912fbb52, EFLAGS=0x0000000000010246, CSGSFS=0x0000000000000033, ERR=0x0000000000000004
+ TRAPNO=0x000000000000000e
+
+Top of Stack: (sp=0x00007f177bbfa5d0)
+0x00007f177bbfa5d0: 00007f177bbfa620 00007f179157ae9d
+0x00007f177bbfa5e0: 0000000080012ba8 00000000c6cbea98
+0x00007f177bbfa5f0: 0000000000000003 00007f1791b6e300
+0x00007f177bbfa600: 00007f1791ca4400 0000000000000000
+0x00007f177bbfa610: 00007f177bbfa6a0 00007f178c015a40
+0x00007f177bbfa620: 00007f177bbfa660 00007f17917666eb
+0x00007f177bbfa630: 0000000000000000 00007f1791ca46a0
+0x00007f177bbfa640: 00000000c6c95f98 00007f1700000600
+0x00007f177bbfa650: 00007f1791ca46a0 00007f177bbfa690
+0x00007f177bbfa660: 00007f177bbfa700 00007f1791820904
+0x00007f177bbfa670: 00007f1791b5c710 0000000000000000
+0x00007f177bbfa680: 00007f1791ca46a0 0000000000000001
+0x00007f177bbfa690: 0000000000000001 00007f178c063201
+0x00007f177bbfa6a0: 00007f178c010100 0000000000000000
+0x00007f177bbfa6b0: 00007f178c064c30 00007f178c024300
+0x00007f177bbfa6c0: 00007f177bbfa6e0 00007f178c0008c0
+0x00007f177bbfa6d0: 00007f178c0630b0 00007f1791b68250
+0x00007f177bbfa6e0: 00007f177bbfa800 00007f1791b681f8
+0x00007f177bbfa6f0: 00007f1791b64750 0000000000000000
+0x00007f177bbfa700: 00007f177bbfa960 00007f179181f7b1
+0x00007f177bbfa710: 00007f1790dbfd01 000000000618d401
+0x00007f177bbfa720: 000000002aab0001 00007f177bbfa7d0
+0x00007f177bbfa730: 00007f178c0638d0 000000008618d4c0
+0x00007f177bbfa740: 0000000011dd8020 0000000013ea47f8
+0x00007f177bbfa750: 00007f177bbfa910 00007f177bbfa8e0
+0x00007f177bbfa760: 00007f177bbfa860 00007f177bbfa890
+0x00007f177bbfa770: 00007f177bbfa8c0 0000000025c7c818
+0x00007f177bbfa780: 00007f177bbfa920 0000000001d90000
+0x00007f177bbfa790: 0000000014903b88 000000000618d4c0
+0x00007f177bbfa7a0: 0000000016693b88 00007f177bbfa840
+0x00007f177bbfa7b0: 00007f177bbfa880 00007f177bbfa8b0
+0x00007f177bbfa7c0: 00007f177bbfa910 00007f178c017d90
+
+Instructions: (pc=0x00007f17912fbb52)
+0x00007f17912fbb32: 48 8b 15 cf c5 99 00 80 3a 00 74 52 4c 8b 05 93
+0x00007f17912fbb42: a9 99 00 8b 56 08 41 8b 48 08 48 d3 e2 49 03 10
+0x00007f17912fbb52: 48 8b 8a b0 00 00 00 ba 01 00 00 00 83 e1 07 48
+0x00007f17912fbb62: 83 f9 05 74 21 48 89 fe 31 d2 83 e6 07 48 83 fe
+
+Register to memory mapping:
+
+RAX=0x0000000080012ba8 is an oop
+[S
+ - klass: {type array short}
+ - length: 8
+RBX=0x00000000c6cbeaa8 is an oop
+java.lang.String
+ - klass: 'java/lang/String'
+RCX=0x0000000000000000 is an unknown value
+RDX=0x0000000000000000 is an unknown value
+RSP=0x00007f177bbfa5d0 is an unknown value
+RBP=0x00007f177bbfa5d0 is an unknown value
+RSI=0x00000000c6cbeaa8 is an oop
+java.lang.String
+ - klass: 'java/lang/String'
+RDI=0x0000001700000000 is an unknown value
+R8 =0x00007f1791b6e300: <offset 0xaa6300> in /usr/local/java6/jdk1.6.0_45/jre/lib/amd64/server/libjvm.so at 0x00007f17910c8000
+R9 =0x0000000080012b90 is an oop
+{instance class}
+ - klass: {other class}
+R10=0x0000000000000002 is an unknown value
+R11=0x000000000000000b is an unknown value
+R12=0x00000000c6cbeaa4 is an oop
+java.lang.String
+ - klass: 'java/lang/String'
+R13=0x0000001700000000 is an unknown value
+R14=0x0000000080012ba0 is an oop
+{instance class}
+ - klass: {other class}
+R15=0x00000000c6cbeaa8 is an oop
+java.lang.String
+ - klass: 'java/lang/String'
+
+
+Stack: [0x00007f177bafb000,0x00007f177bbfc000], sp=0x00007f177bbfa5d0, free space=1021k
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V [libjvm.so+0x233b52] markOopDesc::must_be_preserved_with_bias(oopDesc*) const+0x32
+V [libjvm.so+0x4b2e9d] instanceKlass::oop_follow_contents(oopDesc*)+0x1dd
+V [libjvm.so+0x69e6eb] MarkSweep::follow_stack()+0x7b
+V [libjvm.so+0x758904] PSMarkSweep::mark_sweep_phase1(bool)+0xe4
+V [libjvm.so+0x7577b1] PSMarkSweep::invoke_no_policy(bool)+0x481
+V [libjvm.so+0x764317] PSScavenge::invoke()+0x147
+V [libjvm.so+0x7262fe] ParallelScavengeHeap::failed_mem_allocate(unsigned long, bool)+0x5e
+V [libjvm.so+0x863638] VM_ParallelGCFailedAllocation::doit()+0x68
+V [libjvm.so+0x870a2a] VM_Operation::evaluate()+0x4a
+V [libjvm.so+0x86fff2] VMThread::evaluate_operation(VM_Operation*)+0x82
+V [libjvm.so+0x870268] VMThread::loop()+0x198
+V [libjvm.so+0x86fd6e] VMThread::run()+0x6e
+V [libjvm.so+0x712eef] java_start(Thread*)+0x13f
+
+VM_Operation (0x00007f1790dbfa60): ParallelGCFailedAllocation, mode: safepoint, requested by thread 0x00007f178c007800
+
+
+--------------- P R O C E S S ---------------
+
+Java Threads: ( => current thread )
+ 0x00007f178ca43000 JavaThread "resolver-5" daemon [_thread_blocked, id=20365, stack(0x00007f177a58b000,0x00007f177a68c000)]
+ 0x00007f178ca42800 JavaThread "resolver-4" daemon [_thread_blocked, id=20364, stack(0x00007f177a68c000,0x00007f177a78d000)]
+ 0x00007f178c26c000 JavaThread "resolver-3" daemon [_thread_blocked, id=20363, stack(0x00007f177a78d000,0x00007f177a88e000)]
+ 0x00007f178c26b000 JavaThread "resolver-2" daemon [_thread_blocked, id=20362, stack(0x00007f177a88e000,0x00007f177a98f000)]
+ 0x00007f178c1ce800 JavaThread "resolver-1" daemon [_thread_blocked, id=20361, stack(0x00007f177ac11000,0x00007f177ad12000)]
+ 0x00007f178c091800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=19990, stack(0x00007f177ae13000,0x00007f177af14000)]
+ 0x00007f178c08f000 JavaThread "C2 CompilerThread1" daemon [_thread_blocked, id=19989, stack(0x00007f177af14000,0x00007f177b015000)]
+ 0x00007f178c08c800 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=19988, stack(0x00007f177b015000,0x00007f177b116000)]
+ 0x00007f178c08a000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=19987, stack(0x00007f177b116000,0x00007f177b217000)]
+ 0x00007f178c06e000 JavaThread "Finalizer" daemon [_thread_blocked, id=19986, stack(0x00007f177b8f9000,0x00007f177b9fa000)]
+ 0x00007f178c06c000 JavaThread "Reference Handler" daemon [_thread_blocked, id=19985, stack(0x00007f177b9fa000,0x00007f177bafb000)]
+ 0x00007f178c007800 JavaThread "main" [_thread_blocked, id=19979, stack(0x00007f1790cc2000,0x00007f1790dc3000)]
+
+Other Threads:
+=>0x00007f178c065800 VMThread [stack: 0x00007f177bafb000,0x00007f177bbfc000] [id=19984]
+ 0x00007f178c0a4000 WatcherThread [stack: 0x00007f177ad12000,0x00007f177ae13000] [id=19991]
+
+VM state:at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: ([mutex/lock_event])
+[0x00007f178c004680] Threads_lock - owner thread: 0x00007f178c065800
+[0x00007f178c004b80] Heap_lock - owner thread: 0x00007f178c007800
+
+Heap
+ PSYoungGen total 300032K, used 30272K [0x00000000eaab0000, 0x0000000100000000, 0x0000000100000000)
+ eden space 269760K, 0% used [0x00000000eaab0000,0x00000000eaab0000,0x00000000fb220000)
+ from space 30272K, 100% used [0x00000000fdd20000,0x00000000ffab0000,0x00000000ffab0000)
+ to space 39872K, 0% used [0x00000000fb220000,0x00000000fb220000,0x00000000fd910000)
+ PSOldGen total 349568K, used 336910K [0x00000000c0000000, 0x00000000d5560000, 0x00000000eaab0000)
+ object space 349568K, 96% used [0x00000000c0000000,0x00000000d4903b88,0x00000000d5560000)
+ PSPermGen total 174016K, used 99893K [0x0000000080000000, 0x000000008a9f0000, 0x00000000c0000000)
+ object space 174016K, 57% used [0x0000000080000000,0x000000008618d4c0,0x000000008a9f0000)
+
+Code Cache [0x00007f1788eec000, 0x00007f178a65c000, 0x00007f178beec000)
+ total_blobs=4900 nmethods=4520 adapters=333 free_code_cache=27884736 largest_free_block=116224
+
+Dynamic libraries:
+40000000-40009000 r-xp 00000000 08:01 18616728 /usr/local/java6/jdk1.6.0_45/bin/java
+40108000-4010a000 rwxp 00008000 08:01 18616728 /usr/local/java6/jdk1.6.0_45/bin/java
+419ef000-41a10000 rwxp 00000000 00:00 0 [heap]
+80000000-8a9f0000 rwxp 00000000 00:00 0
+8a9f0000-c0000000 rwxp 00000000 00:00 0
+c0000000-d5560000 rwxp 00000000 00:00 0
+d5560000-eaab0000 rwxp 00000000 00:00 0
+eaab0000-100000000 rwxp 00000000 00:00 0
+7f1718000000-7f171bfff000 rwxp 00000000 00:00 0
+7f171bfff000-7f171c000000 ---p 00000000 00:00 0
+7f171c000000-7f171f56b000 rwxp 00000000 00:00 0
+7f171f56b000-7f1720000000 ---p 00000000 00:00 0
+7f1720000000-7f1720021000 rwxp 00000000 00:00 0
+7f1720021000-7f1724000000 ---p 00000000 00:00 0
+7f1728000000-7f17280c7000 rwxp 00000000 00:00 0
+7f17280c7000-7f172c000000 ---p 00000000 00:00 0
+7f172c000000-7f172c021000 rwxp 00000000 00:00 0
+7f172c021000-7f1730000000 ---p 00000000 00:00 0
+7f1730000000-7f1730021000 rwxp 00000000 00:00 0
+7f1730021000-7f1734000000 ---p 00000000 00:00 0
+7f1734000000-7f1734021000 rwxp 00000000 00:00 0
+7f1734021000-7f1738000000 ---p 00000000 00:00 0
+7f1738000000-7f1738021000 rwxp 00000000 00:00 0
+7f1738021000-7f173c000000 ---p 00000000 00:00 0
+7f173c000000-7f173c021000 rwxp 00000000 00:00 0
+7f173c021000-7f1740000000 ---p 00000000 00:00 0
+7f1740000000-7f1740021000 rwxp 00000000 00:00 0
+7f1740021000-7f1744000000 ---p 00000000 00:00 0
+7f1744000000-7f1744021000 rwxp 00000000 00:00 0
+7f1744021000-7f1748000000 ---p 00000000 00:00 0
+7f1748000000-7f1748021000 rwxp 00000000 00:00 0
+7f1748021000-7f174c000000 ---p 00000000 00:00 0
+7f174c000000-7f174c021000 rwxp 00000000 00:00 0
+7f174c021000-7f1750000000 ---p 00000000 00:00 0
+7f1750000000-7f1750021000 rwxp 00000000 00:00 0
+7f1750021000-7f1754000000 ---p 00000000 00:00 0
+7f1754000000-7f1754021000 rwxp 00000000 00:00 0
+7f1754021000-7f1758000000 ---p 00000000 00:00 0
+7f1758000000-7f175ba66000 rwxp 00000000 00:00 0
+7f175ba66000-7f175c000000 ---p 00000000 00:00 0
+7f175c000000-7f175c021000 rwxp 00000000 00:00 0
+7f175c021000-7f1760000000 ---p 00000000 00:00 0
+7f1760000000-7f1763ebf000 rwxp 00000000 00:00 0
+7f1763ebf000-7f1764000000 ---p 00000000 00:00 0
+7f1764000000-7f1764021000 rwxp 00000000 00:00 0
+7f1764021000-7f1768000000 ---p 00000000 00:00 0
+7f1768000000-7f1768021000 rwxp 00000000 00:00 0
+7f1768021000-7f176c000000 ---p 00000000 00:00 0
+7f176c000000-7f176c021000 rwxp 00000000 00:00 0
+7f176c021000-7f1770000000 ---p 00000000 00:00 0
+7f1770000000-7f1770288000 rwxp 00000000 00:00 0
+7f1770288000-7f1774000000 ---p 00000000 00:00 0
+7f1774000000-7f1774026000 rwxp 00000000 00:00 0
+7f1774026000-7f1778000000 ---p 00000000 00:00 0
+7f1778542000-7f1778543000 r-xs 00010000 08:01 26874783 /home/sanjaya/.m2/repository/org/wso2/maven/carbon-p2-plugin/1.5/carbon-p2-plugin-1.5.jar
+7f1778543000-7f1778545000 r-xs 00002000 08:01 16122990 /home/sanjaya/.m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.tools.facade/0.13.0/org.eclipse.tycho.p2.tools.facade-0.13.0.jar
+7f1778545000-7f1778547000 r-xs 00005000 08:01 16122989 /home/sanjaya/.m2/repository/org/eclipse/tycho/org.eclipse.tycho.p2.resolver.facade/0.13.0/org.eclipse.tycho.p2.resolver.facade-0.13.0.jar
+7f1778547000-7f1778549000 r-xs 00009000 08:01 16122986 /home/sanjaya/.m2/repository/org/eclipse/tycho/tycho-p2-facade/0.13.0/tycho-p2-facade-0.13.0.jar
+7f1778549000-7f177854b000 r-xs 00001000 08:01 16122984 /home/sanjaya/.m2/repository/org/eclipse/tycho/tycho-embedder-api/0.13.0/tycho-embedder-api-0.13.0.jar
+7f177854b000-7f177854e000 r-xs 00019000 08:01 11313836 /home/sanjaya/.m2/repository/de/pdark/decentxml/1.3/decentxml-1.3.jar
+7f177854e000-7f1778550000 r-xs 00005000 08:01 16122982 /home/sanjaya/.m2/repository/org/eclipse/tycho/tycho-metadata-model/0.13.0/tycho-metadata-model-0.13.0.jar
+7f1778550000-7f1778554000 r-xs 00029000 08:01 15861220 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-archiver/1.2/plexus-archiver-1.2.jar
+7f1778554000-7f1778558000 r-xs 0001f000 08:01 16122981 /home/sanjaya/.m2/repository/org/eclipse/tycho/tycho-core/0.13.0/tycho-core-0.13.0.jar
+7f1778558000-7f177855a000 r-xs 00004000 08:01 16122979 /home/sanjaya/.m2/repository/org/eclipse/tycho/tycho-equinox-launching/0.13.0/tycho-equinox-launching-0.13.0.jar
+7f177855a000-7f177855b000 r-xs 00000000 08:01 16122977 /home/sanjaya/.m2/repository/org/eclipse/tycho/tycho-equinox-api/0.13.0/tycho-equinox-api-0.13.0.jar
+7f177855b000-7f177856e000 r-xs 0013c000 08:01 16122975 /home/sanjaya/.m2/repository/org/eclipse/tycho/org.eclipse.osgi/3.8.0.v20110726-1606/org.eclipse.osgi-3.8.0.v20110726-1606.jar
+7f177856e000-7f1778570000 r-xs 00001000 08:01 16122974 /home/sanjaya/.m2/repository/org/eclipse/tycho/tycho-equinox/0.13.0/tycho-equinox-0.13.0.jar
+7f1778570000-7f1778574000 r-xs 00033000 08:01 13112283 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.jar
+7f1778574000-7f1778576000 r-xs 00010000 08:01 16122994 /home/sanjaya/.m2/repository/org/wso2/maven/carbon-p2-plugin/1.5.3/carbon-p2-plugin-1.5.3.jar
+7f1778576000-7f1778578000 r-xs 00007000 08:01 15860742 /home/sanjaya/.m2/repository/org/apache/maven/shared/maven-filtering/1.0-beta-2/maven-filtering-1.0-beta-2.jar
+7f1778578000-7f1778583000 r-xs 0005f000 08:01 15861222 /home/sanjaya/.m2/repository/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar
+7f1778583000-7f1778586000 r-xs 00011000 08:01 28447127 /home/sanjaya/.m2/repository/org/apache/maven/plugins/maven-war-plugin/2.2/maven-war-plugin-2.2.jar
+7f1778586000-7f1778588000 r-xs 00002000 08:01 15860029 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-compiler-javac/1.8.1/plexus-compiler-javac-1.8.1.jar
+7f1778588000-7f177858a000 r-xs 00000000 08:01 15860028 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-compiler-manager/1.8.1/plexus-compiler-manager-1.8.1.jar
+7f177858a000-7f177858c000 r-xs 00006000 08:01 12720584 /home/sanjaya/.m2/repository/org/apache/maven/plugins/maven-compiler-plugin/2.3.2/maven-compiler-plugin-2.3.2.jar
+7f177858c000-7f1778599000 r-xs 0007f000 08:01 11535608 /home/sanjaya/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar
+7f1778599000-7f177859e000 r-xs 00034000 08:01 12721794 /home/sanjaya/.m2/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar
+7f177859e000-7f17785a0000 r-xs 00009000 08:01 5939 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-tfs/1.7/maven-scm-provider-tfs-1.7.jar
+7f17785a0000-7f17785a2000 r-xs 0000f000 08:01 5938 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-vss/1.7/maven-scm-provider-vss-1.7.jar
+7f17785a2000-7f17785a5000 r-xs 0000c000 08:01 5937 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-synergy/1.7/maven-scm-provider-synergy-1.7.jar
+7f17785a5000-7f17785a8000 r-xs 00010000 08:01 28578123 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-starteam/1.7/maven-scm-provider-starteam-1.7.jar
+7f17785a8000-7f17785aa000 r-xs 00012000 08:01 28051815 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-perforce/1.7/maven-scm-provider-perforce-1.7.jar
+7f17785aa000-7f17785ac000 r-xs 0000a000 08:01 27789221 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-local/1.7/maven-scm-provider-local-1.7.jar
+7f17785ac000-7f17785ae000 r-xs 0000e000 08:01 27003218 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-jazz/1.7/maven-scm-provider-jazz-1.7.jar
+7f17785ae000-7f17785b0000 r-xs 0000e000 08:01 26349926 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-hg/1.7/maven-scm-provider-hg-1.7.jar
+7f17785b0000-7f17785b2000 r-xs 00008000 08:01 25953896 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-git-commons/1.7/maven-scm-provider-git-commons-1.7.jar
+7f17785b2000-7f17785b5000 r-xs 0000d000 08:01 25560606 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-gitexe/1.7/maven-scm-provider-gitexe-1.7.jar
+7f17785b5000-7f17785b9000 r-xs 00038000 08:01 11313874 /home/sanjaya/.m2/repository/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar
+7f17785b9000-7f17785c1000 r-xs 00090000 08:01 11313873 /home/sanjaya/.m2/repository/org/netbeans/lib/cvsclient/20060125/cvsclient-20060125.jar
+7f17785c1000-7f17785c3000 r-xs 00009000 08:01 25431244 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-cvsjava/1.7/maven-scm-provider-cvsjava-1.7.jar
+7f17785c3000-7f17785c6000 r-xs 00011000 08:01 24774672 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.7/maven-scm-provider-cvs-commons-1.7.jar
+7f17785c6000-7f17785c8000 r-xs 00006000 08:01 24512155 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-cvsexe/1.7/maven-scm-provider-cvsexe-1.7.jar
+7f17785c8000-7f17785cb000 r-xs 0000f000 08:01 23991049 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-clearcase/1.7/maven-scm-provider-clearcase-1.7.jar
+7f17785cb000-7f17785ce000 r-xs 0000b000 08:01 23726288 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-bazaar/1.7/maven-scm-provider-bazaar-1.7.jar
+7f17785ce000-7f17785d1000 r-xs 00014000 08:01 22552244 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-accurev/1.7/maven-scm-provider-accurev-1.7.jar
+7f17785d1000-7f17785d3000 r-xs 00002000 08:01 21892026 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-client/1.7/maven-scm-client-1.7.jar
+7f17785d3000-7f17785d5000 r-xs 00008000 08:01 21497779 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-svn-commons/1.7/maven-scm-provider-svn-commons-1.7.jar
+7f17785d5000-7f17785d7000 r-xs 00008000 08:01 15862407 /home/sanjaya/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar
+7f17785d7000-7f17785de000 r-xs 00029000 08:01 15863082 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar
+7f17785de000-7f17785df000 r-xs 00002000 08:01 21236679 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-manager-plexus/1.7/maven-scm-manager-plexus-1.7.jar
+7f17785df000-7f17785e3000 r-xs 00015000 08:01 20978046 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-api/1.7/maven-scm-api-1.7.jar
+7f17785e3000-7f17785e6000 r-xs 00010000 08:01 19668747 /home/sanjaya/.m2/repository/org/apache/maven/scm/maven-scm-provider-svnexe/1.7.0-wso2v1/maven-scm-provider-svnexe-1.7.0-wso2v1.jar
+7f17785e6000-7f1778612000 r-xs 001db000 08:01 19400393 /home/sanjaya/.m2/repository/org/apache/maven/scm/wso2/maven-scm/1.7.0.wso2v1/maven-scm-1.7.0.wso2v1.jar
+7f1778612000-7f1778622000 r-xs 00119000 08:01 18483373 /home/sanjaya/.m2/repository/org/apache/juddi/wso2/juddi/3.0.3.wso2v2/juddi-3.0.3.wso2v2.jar
+7f1778622000-7f1778624000 r-xs 00002000 08:01 14814811 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.registry.server/4.2.0/org.wso2.carbon.registry.server-4.2.0.jar
+7f1778624000-7f1778626000 r-xs 00010000 08:01 5936 /home/sanjaya/.m2/repository/org/eclipse/core/org.eclipse.core.runtime/3.5.0.v20090429-1800/org.eclipse.core.runtime-3.5.0.v20090429-1800.jar
+7f1778626000-7f1778629000 r-xs 00029000 08:01 5935 /home/sanjaya/.m2/repository/uddi/uddi4j/1.0.1/uddi4j-1.0.1.jar
+7f1778629000-7f177863f000 r-xs 000fa000 08:01 15992972 /home/sanjaya/.m2/repository/com/sun/xml/bind/jaxb-impl/2.2.6/jaxb-impl-2.2.6.jar
+7f177863f000-7f1778643000 r-xs 00015000 08:01 16385735 /home/sanjaya/.m2/repository/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar
+7f1778643000-7f1778644000 r-xs 00001000 08:01 15861848 /home/sanjaya/.m2/repository/com/sun/localizer/comresrcgen/1.0/comresrcgen-1.0.jar
+7f1778644000-7f1778645000 r-xs 00001000 08:01 15861847 /home/sanjaya/.m2/repository/com/sun/localizer/localizer/1.0/localizer-1.0.jar
+7f1778645000-7f1778647000 r-xs 00002000 08:01 15992971 /home/sanjaya/.m2/repository/com/google/code/findbugs/annotations/1.3.9/annotations-1.3.9.jar
+7f1778647000-7f177864a000 r-xs 00009000 08:01 16385732 /home/sanjaya/.m2/repository/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar
+7f177864a000-7f177864e000 r-xs 00020000 08:01 15861841 /home/sanjaya/.m2/repository/com/sun/codemodel/codemodel/2.4.1/codemodel-2.4.1.jar
+7f177864e000-7f1778652000 r-xs 00035000 08:01 12978707 /home/sanjaya/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.9.9/jackson-core-asl-1.9.9.jar
+7f1778652000-7f1778661000 r-xs 000b0000 08:01 12978706 /home/sanjaya/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.9/jackson-mapper-asl-1.9.9.jar
+7f1778661000-7f1778665000 r-xs 0002e000 08:01 15861840 /home/sanjaya/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.0.0/jackson-core-2.0.0.jar
+7f1778665000-7f1778667000 r-xs 00007000 08:01 15861839 /home/sanjaya/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.0.0/jackson-annotations-2.0.0.jar
+7f1778667000-7f1778676000 r-xs 000c7000 08:01 15861837 /home/sanjaya/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.0.0/jackson-databind-2.0.0.jar
+7f1778676000-7f1778678000 r-xs 0000c000 08:01 15861838 /home/sanjaya/.m2/repository/com/googlecode/jsonschema2pojo/jsonschema2pojo-core/0.3.4/jsonschema2pojo-core-0.3.4.jar
+7f1778678000-7f17786b3000 r-xs 002bb000 08:01 15861836 /home/sanjaya/.m2/repository/com/sun/xml/bind/jaxb-xjc/2.2/jaxb-xjc-2.2.jar
+7f17786b3000-7f17786b5000 r-xs 00018000 08:01 11273015 /home/sanjaya/.m2/repository/org/jvnet/ws/wadl/wadl-core/1.1.3/wadl-core-1.1.3.jar
+7f17786b5000-7f17786e5000 r-xs 00277000 08:01 12587675 /home/sanjaya/.m2/repository/org/wso2/wadl/core/wso2/wadl-core/1.1.3.wso2v2/wadl-core-1.1.3.wso2v2.jar
+7f17786e5000-7f1778722000 r-xs 006dd000 08:01 17827638 /home/sanjaya/.m2/repository/org/wso2/wsdl/validator/wso2/wsdl-validator/1.2.0.wso2v1/wsdl-validator-1.2.0.wso2v1.jar
+7f1778722000-7f1778723000 r-xs 00001000 08:01 11314040 /home/sanjaya/.m2/repository/eclipse/validateutility/0.95/validateutility-0.95.jar
+7f1778723000-7f1778749000 r-xs 00230000 08:01 5934 /home/sanjaya/.m2/repository/org/apache/derby/derby/10.4.2.0/derby-10.4.2.0.jar
+7f1778749000-7f177874a000 r-xs 00007000 08:01 21111354 /home/sanjaya/.m2/repository/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar
+7f177874a000-7f1778750000 r-xs 00059000 08:01 17303594 /home/sanjaya/.m2/repository/javax/mail/mail/1.4/mail-1.4.jar
+7f1778750000-7f1778751000 r-xs 0000a000 08:01 5933 /home/sanjaya/.m2/repository/asm/asm/3.2/asm-3.2.jar
+7f1778751000-7f1778752000 r-xs 00003000 08:01 17172639 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar
+7f1778752000-7f1778756000 r-xs 0002f000 08:01 17041427 /home/sanjaya/.m2/repository/net/sourceforge/serp/serp/1.13.1/serp-1.13.1.jar
+7f1778756000-7f177875c000 r-xs 00017000 08:01 5931 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-jpa_2.0_spec/1.0/geronimo-jpa_2.0_spec-1.0.jar
+7f177875c000-7f177875f000 r-xs 0001d000 08:01 11587177 /home/sanjaya/.m2/repository/org/apache/juddi/juddi-client/3.1.5.wso2v1/juddi-client-3.1.5.wso2v1.jar
+7f177875f000-7f1778766000 r-xs 00049000 08:01 6432 /home/sanjaya/.m2/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar
+7f1778766000-7f177876f000 r-xs 0005e000 08:01 5930 /home/sanjaya/.m2/repository/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar
+7f177876f000-7f1778776000 r-xs 0006a000 08:01 5929 /home/sanjaya/.m2/repository/jboss/javassist/3.3.ga/javassist-3.3.ga.jar
+7f1778776000-7f1778778000 r-xs 0000d000 08:01 5928 /home/sanjaya/.m2/repository/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar
+7f1778778000-7f177877b000 r-xs 0000e000 08:01 5927 /home/sanjaya/.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar
+7f177877b000-7f177877f000 r-xs 0003d000 08:01 5926 /home/sanjaya/.m2/repository/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar
+7f177877f000-7f1778782000 r-xs 0001a000 08:01 5925 /home/sanjaya/.m2/repository/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar
+7f1778782000-7f1778788000 r-xs 00067000 08:01 7414 /home/sanjaya/.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar
+7f1778788000-7f177878a000 r-xs 00003000 08:01 5923 /home/sanjaya/.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar
+7f177878a000-7f177878c000 r-xs 00001000 08:01 5924 /home/sanjaya/.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar
+7f177878c000-7f1778790000 r-xs 0002f000 08:01 5922 /home/sanjaya/.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar
+7f1778790000-7f17787b1000 r-xs 00206000 08:01 5921 /home/sanjaya/.m2/repository/org/hibernate/hibernate/3.2.5.ga/hibernate-3.2.5.ga.jar
+7f17787b1000-7f17787b4000 r-xs 0000a000 08:01 5920 /home/sanjaya/.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar
+7f17787b4000-7f17787b8000 r-xs 0002f000 08:01 11587176 /home/sanjaya/.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar
+7f17787b8000-7f17787be000 r-xs 00043000 08:01 11314046 /home/sanjaya/.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar
+7f17787be000-7f17787c1000 r-xs 00015000 08:01 11555361 /home/sanjaya/.m2/repository/xmlunit/xmlunit/1.3/xmlunit-1.3.jar
+7f17787c1000-7f17787c4000 r-xs 0001c000 08:01 11587175 /home/sanjaya/.m2/repository/org/apache/juddi/uddi-tck-base/3.1.5.wso2v1/uddi-tck-base-3.1.5.wso2v1.jar
+7f17787c4000-7f17787cb000 r-xs 00043000 08:01 11587173 /home/sanjaya/.m2/repository/org/apache/juddi/uddi-ws/3.1.5.wso2v1/uddi-ws-3.1.5.wso2v1.jar
+7f17787cb000-7f17787d1000 r-xs 00066000 08:01 11587174 /home/sanjaya/.m2/repository/org/apache/juddi/juddi-core/3.1.5.wso2v1/juddi-core-3.1.5.wso2v1.jar
+7f17787d1000-7f17787d7000 r-xs 0002b000 08:01 14815324 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.registry.uddi/4.2.0/org.wso2.carbon.registry.uddi-4.2.0.jar
+7f17787d7000-7f17787d8000 r-xs 00001000 08:01 14815323 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.registry.servlet/4.2.0/org.wso2.carbon.registry.servlet-4.2.0.jar
+7f17787d8000-7f17787dd000 r-xs 0003d000 08:01 14815322 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.registry.extensions/4.2.0/org.wso2.carbon.registry.extensions-4.2.0.jar
+7f17787dd000-7f17787e1000 r-xs 0001c000 08:01 5048 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.p2.repository/2.1.0.v20110601/org.eclipse.equinox.p2.repository-2.1.0.v20110601.jar
+7f17787e1000-7f17787e8000 r-xs 0004c000 08:01 5051 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.p2.metadata/2.1.0.v20110510/org.eclipse.equinox.p2.metadata-2.1.0.v20110510.jar
+7f17787e8000-7f17787ec000 r-xs 0002a000 08:01 5370 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.p2.engine/2.1.0.v20110511/org.eclipse.equinox.p2.engine-2.1.0.v20110511.jar
+7f17787ec000-7f177881f000 r-xs 00246000 08:01 13117975 /home/sanjaya/.m2/repository/org/apache/qpid/wso2/qpid-client/0.12.wso2v1/qpid-client-0.12.wso2v1.jar
+7f177881f000-7f177887b000 r-xs 00501000 08:01 11313924 /home/sanjaya/.m2/repository/opensaml/wso2/opensaml2/2.4.1.wso2v1/opensaml2-2.4.1.wso2v1.jar
+7f177887b000-7f177887f000 r-xs 00028000 08:01 23728387 /home/sanjaya/.m2/repository/commons-validator/commons-validator/1.4.0/commons-validator-1.4.0.jar
+7f177887f000-7f1778882000 r-xs 00018000 08:01 5356 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.common/3.6.100.v20120522-1841/org.eclipse.equinox.common-3.6.100.v20120522-1841.jar
+7f1778882000-7f1778885000 r-xs 0000f000 08:01 5053 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.p2.core/2.1.0.v20110502-1955/org.eclipse.equinox.p2.core-2.1.0.v20110502-1955.jar
+7f1778885000-7f1778886000 r-xs 00009000 08:01 5371 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.simpleconfigurator/1.0.301.v20120828-033635/org.eclipse.equinox.simpleconfigurator-1.0.301.v20120828-033635.jar
+7f1778886000-7f1778889000 r-xs 0001a000 08:01 5062 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.p2.metadata.repository/1.2.0.v20110511-1359/org.eclipse.equinox.p2.metadata.repository-1.2.0.v20110511-1359.jar
+7f1778889000-7f177888c000 r-xs 00015000 08:01 5038 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.p2.director/2.1.0.v20110504-1715/org.eclipse.equinox.p2.director-2.1.0.v20110504-1715.jar
+7f177888c000-7f177888f000 r-xs 0001e000 08:01 5369 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.p2.artifact.repository/1.1.100.v20110519/org.eclipse.equinox.p2.artifact.repository-1.1.100.v20110519.jar
+7f177888f000-7f1778891000 r-xs 00009000 08:01 14814818 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.feature.mgt.core/4.2.0/org.wso2.carbon.feature.mgt.core-4.2.0.jar
+7f1778891000-7f1778895000 r-xs 00067000 08:01 11587172 /home/sanjaya/.m2/repository/commons-beanutils/wso2/commons-beanutils/1.8.0.wso2v1/commons-beanutils-1.8.0.wso2v1.jar
+7f1778895000-7f1778898000 r-xs 0000a000 08:01 14815307 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.registry.common/4.2.0/org.wso2.carbon.registry.common-4.2.0.jar
+7f1778898000-7f177889b000 r-xs 00003000 08:01 14815308 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.registry.admin.api/4.2.0/org.wso2.carbon.registry.admin.api-4.2.0.jar
+7f177889b000-7f177889e000 r-xs 00014000 08:01 24516924 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.registry.resource/4.2.0/org.wso2.carbon.registry.resource-4.2.0.jar
+7f177889e000-7f177889f000 r-xs 00005000 08:01 15993530 /home/sanjaya/.m2/repository/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.jar
+7f177889f000-7f17788a2000 r-xs 0000a000 08:01 15861221 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-io/1.0.1/plexus-io-1.0.1.jar
+7f17788a2000-7f17788a4000 r-xs 00009000 08:01 15860198 /home/sanjaya/.m2/repository/org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar
+7f17788a4000-7f17788a6000 r-xs 00008000 08:01 16385227 /home/sanjaya/.m2/repository/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar
+7f17788a6000-7f17788a8000 r-xs 00006000 08:01 16386203 /home/sanjaya/.m2/repository/org/apache/maven/shared/file-management/1.1/file-management-1.1.jar
+7f17788a8000-7f17788ac000 r-xs 00029000 08:01 15862493 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-archiver/1.1/plexus-archiver-1.1.jar
+7f17788ac000-7f17788b0000 r-xs 00032000 08:01 23464197 /home/sanjaya/.m2/repository/org/apache/maven/plugins/maven-assembly-plugin/2.2.1/maven-assembly-plugin-2.2.1.jar
+7f17788b0000-7f17788b2000 r-xs 00008000 08:01 14814877 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.feature.mgt.services/4.2.0/org.wso2.carbon.feature.mgt.services-4.2.0.jar
+7f17788b2000-7f17788ba000 r-xs 0004b000 08:01 15863237 /home/sanjaya/.m2/repository/backport-util-concurrent/wso2/backport-util-concurrent/3.1.0.wso2v1/backport-util-concurrent-3.1.0.wso2v1.jar
+7f17788ba000-7f17788bd000 r-xs 00110000 08:01 27267244 /home/sanjaya/.m2/repository/org/wso2/xkms/wso2/xkms/2.4.0.wso2v1/xkms-2.4.0.wso2v1.jar
+7f17788bd000-7f17788bf000 r-xs 0001f000 08:01 7618 /home/sanjaya/.m2/repository/org/apache/rampart/wso2/rampart-trust/1.6.1.wso2v10/rampart-trust-1.6.1.wso2v10.jar
+7f17788bf000-7f17788c2000 r-xs 00026000 08:01 7644 /home/sanjaya/.m2/repository/org/apache/rampart/wso2/rampart-policy/1.6.1.wso2v10/rampart-policy-1.6.1.wso2v10.jar
+7f17788c2000-7f17788c5000 r-xs 00028000 08:01 11586910 /home/sanjaya/.m2/repository/org/apache/rampart/wso2/rampart-core/1.6.1.wso2v10/rampart-core-1.6.1.wso2v10.jar
+7f17788c5000-7f17788c8000 r-xs 00023000 08:01 27267243 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.security.mgt/4.2.0/org.wso2.carbon.security.mgt-4.2.0.jar
+7f17788c8000-7f17788ca000 r-xs 0000d000 08:01 15863449 /home/sanjaya/.m2/repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar
+7f17788ca000-7f17788cc000 r-xs 0000b000 08:01 15863255 /home/sanjaya/.m2/repository/commons-codec/wso2/commons-codec/1.4.0.wso2v1/commons-codec-1.4.0.wso2v1.jar
+7f17788cc000-7f17788ce000 r-xs 0000e000 08:01 15863116 /home/sanjaya/.m2/repository/commons-lang/commons-lang/1.0/commons-lang-1.0.jar
+7f17788ce000-7f17788d2000 r-xs 0002c000 08:01 12852515 /home/sanjaya/.m2/repository/wsdl4j/wso2/wsdl4j/1.6.2.wso2v2/wsdl4j-1.6.2.wso2v2.jar
+7f17788d2000-7f17788d3000 r-xs 00006000 08:01 4981997 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.status.monitor.core/target/org.apache.stratos.status.monitor.core-4.1.0-SNAPSHOT.jar
+7f17788d3000-7f17788d5000 r-xs 0000a000 08:01 4980829 /home/sanjaya/Desktop/Stratos/stratos/service-stubs/org.apache.stratos.redirector.servlet.stub/target/org.apache.stratos.redirector.servlet.stub-4.1.0-SNAPSHOT.jar
+7f17788d5000-7f17788d7000 r-xs 00005000 08:01 19271236 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.activation/target/org.apache.stratos.activation-4.1.0-SNAPSHOT.jar
+7f17788d7000-7f17788e6000 r-xs 00194000 08:01 17959013 /home/sanjaya/.m2/repository/org/apache/ws/security/wso2/wss4j/1.5.11.wso2v1/wss4j-1.5.11.wso2v1.jar
+7f17788e6000-7f17788e8000 r-xs 00007000 08:01 28709852 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.identity.authenticator.saml2.sso.stub/4.2.0/org.wso2.carbon.identity.authenticator.saml2.sso.stub-4.2.0.jar
+7f17788e8000-7f17788ea000 r-xs 0000d000 08:01 28447116 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.identity.authenticator.saml2.sso.common/4.2.0/org.wso2.carbon.identity.authenticator.saml2.sso.common-4.2.0.jar
+7f17788ea000-7f17788f3000 r-xs 00062000 08:01 16385661 /home/sanjaya/.m2/repository/javax/servlet/jsp/jstl/wso2/jstl/1.2.1.wso2v2/jstl-1.2.1.wso2v2.jar
+7f17788f3000-7f17788f6000 r-xs 00023000 08:01 14814731 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.core.commons.stub/4.2.0/org.wso2.carbon.core.commons.stub-4.2.0.jar
+7f17788f6000-7f17788f9000 r-xs 00018000 08:01 27789182 /home/sanjaya/.m2/repository/org/eclipse/equinox/javax.servlet.jsp/2.2.0.v201112011158/javax.servlet.jsp-2.2.0.v201112011158.jar
+7f17788f9000-7f177890e000 r-xs 00231000 08:01 27003182 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.apache.jasper.glassfish/2.2.2.v201205150955/org.apache.jasper.glassfish-2.2.2.v201205150955.jar
+7f177890e000-7f1778910000 r-xs 0000a000 08:01 5362 /home/sanjaya/.m2/repository/org/eclipse/equinox/org.eclipse.equinox.http.servlet/1.1.300.v20120522-1841/org.eclipse.equinox.http.servlet-1.1.300.v20120522-1841.jar
+7f1778910000-7f1778915000 r-xs 00117000 08:01 25953863 /home/sanjaya/.m2/repository/org/apache/tiles/wso2/tiles-jsp/2.0.5.wso2v2/tiles-jsp-2.0.5.wso2v2.jar
+7f1778915000-7f177892c000 r-xs 00312000 08:01 14814849 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.ui/4.2.0/org.wso2.carbon.ui-4.2.0.jar
+7f177892c000-7f177892e000 r-xs 00005000 08:01 22156442 /home/sanjaya/.m2/repository/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar
+7f177892e000-7f1778931000 r-xs 0001c000 08:01 13117962 /home/sanjaya/.m2/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar
+7f1778931000-7f1778932000 r-xs 00004000 08:01 13117961 /home/sanjaya/.m2/repository/axis/axis-saaj/1.3/axis-saaj-1.3.jar
+7f1778932000-7f1778934000 r-xs 00006000 08:01 13117960 /home/sanjaya/.m2/repository/axis/axis-jaxrpc/1.3/axis-jaxrpc-1.3.jar
+7f1778934000-7f1778937000 r-xs 0000f000 08:01 11556027 /home/sanjaya/.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar
+7f1778937000-7f177893a000 r-xs 0001c000 08:01 22026232 /home/sanjaya/.m2/repository/wsdl4j/wsdl4j/1.5.1/wsdl4j-1.5.1.jar
+7f177893a000-7f177894e000 r-xs 0017b000 08:01 13117959 /home/sanjaya/.m2/repository/axis/axis/1.3/axis-1.3.jar
+7f177894e000-7f1778951000 r-xs 00023000 08:01 20190873 /home/sanjaya/.m2/repository/com/atlassian/jira/plugins/jira-soapclient/4.1.1-1/jira-soapclient-4.1.1-1.jar
+7f1778951000-7f1778956000 r-xs 00029000 08:01 19535565 /home/sanjaya/.m2/repository/org/wso2/carbon/atlassian-jira/1.0.0.wso2v1/atlassian-jira-1.0.0.wso2v1.jar
+7f1778956000-7f1778959000 r-xs 00028000 08:01 5898 /home/sanjaya/.m2/repository/org/apache/rampart/wso2/rampart-core/1.6.1.wso2v9/rampart-core-1.6.1.wso2v9.jar
+7f1778959000-7f1778968000 r-xs 00194000 08:01 17959010 /home/sanjaya/.m2/repository/org/apache/ws/security/wso2/wss4j/1.5.11.wso2v3/wss4j-1.5.11.wso2v3.jar
+7f1778968000-7f177896b000 r-xs 00026000 08:01 5900 /home/sanjaya/.m2/repository/org/apache/rampart/wso2/rampart-policy/1.6.1.wso2v9/rampart-policy-1.6.1.wso2v9.jar
+7f177896b000-7f177896c000 r-xs 00005000 08:01 15604256 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.admin.mgt/4.2.0/org.wso2.carbon.admin.mgt-4.2.0.jar
+7f177896c000-7f1778973000 r-xs 00065000 08:01 12982531 /home/sanjaya/.m2/repository/kaptcha/wso2/kaptcha/2.3.0.wso2v1/kaptcha-2.3.0.wso2v1.jar
+7f1778973000-7f1778975000 r-xs 00002000 08:01 15343207 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.captcha.mgt/4.2.0/org.wso2.carbon.captcha.mgt-4.2.0.jar
+7f1778975000-7f1778980000 r-xs 000ec000 08:01 14815326 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.um.ws.api.stub/4.2.0/org.wso2.carbon.um.ws.api.stub-4.2.0.jar
+7f1778980000-7f1778983000 r-xs 0001f000 08:01 28838101 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.authenticator.stub/4.2.0/org.wso2.carbon.authenticator.stub-4.2.0.jar
+7f1778983000-7f1778984000 r-xs 00001000 08:01 17041385 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.authenticator.proxy/4.2.0/org.wso2.carbon.authenticator.proxy-4.2.0.jar
+7f1778984000-7f177898f000 r-xs 000f3000 08:01 15085072 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.um.ws.api/4.2.0/org.wso2.carbon.um.ws.api-4.2.0.jar
+7f177898f000-7f1778991000 r-xs 00004000 08:01 20320966 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.tenant.mgt.core/target/org.apache.stratos.tenant.mgt.core-4.1.0-SNAPSHOT.jar
+7f1778991000-7f1778993000 r-xs 0000b000 08:01 20981880 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.tenant.mgt/target/org.apache.stratos.tenant.mgt-4.1.0-SNAPSHOT.jar
+7f1778993000-7f1778995000 r-xs 00002000 08:01 14814865 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.cluster.mgt.core/4.2.0/org.wso2.carbon.cluster.mgt.core-4.2.0.jar
+7f1778995000-7f1778996000 r-xs 00005000 08:01 17960914 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.email.sender/target/org.apache.stratos.email.sender-4.1.0-SNAPSHOT.jar
+7f1778996000-7f1778997000 r-xs 00004000 08:01 15343208 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.email.verification/4.2.0/org.wso2.carbon.email.verification-4.2.0.jar
+7f1778997000-7f177899a000 r-xs 00019000 08:01 11314214 /home/sanjaya/.m2/repository/commons-pool/commons-pool/1.6/commons-pool-1.6.jar
+7f177899a000-7f177899c000 r-xs 00004000 08:01 19535616 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.load.balancer.common/target/org.apache.stratos.load.balancer.common-4.1.0-SNAPSHOT.jar
+7f177899c000-7f17789aa000 r-xs 000fe000 08:01 14289947 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-kernel/1.6.1-wso2v9/axis2-kernel-1.6.1-wso2v9.jar
+7f17789aa000-7f17789ac000 r-xs 00001000 08:01 12590579 /home/sanjaya/.m2/repository/org/wso2/eventing/wso2eventing-api/2.1/wso2eventing-api-2.1.jar
+7f17789ac000-7f17789b0000 r-xs 00020000 08:01 12590578 /home/sanjaya/.m2/repository/org/wso2/caching/wso2caching-core/4.0.2/wso2caching-core-4.0.2.jar
+7f17789b0000-7f17789b2000 r-xs 0001d000 08:01 15861867 /home/sanjaya/.m2/repository/net/sf/saxon/saxon-xqj/8.9/saxon-xqj-8.9.jar
+7f17789b2000-7f17789b3000 r-xs 00015000 08:01 15861868 /home/sanjaya/.m2/repository/net/sf/saxon/saxon-dom/8.9/saxon-dom-8.9.jar
+7f17789b3000-7f17789c9000 r-xs 00379000 08:01 15861865 /home/sanjaya/.m2/repository/net/sf/saxon/saxon/8.9/saxon-8.9.jar
+7f17789c9000-7f17789cb000 r-xs 0000c000 08:01 11313972 /home/sanjaya/.m2/repository/JLex/JLex/0.0/JLex-0.0.jar
+7f17789cb000-7f17789cd000 r-xs 0000e000 08:01 11313971 /home/sanjaya/.m2/repository/java-cup/java-cup/0.0/java-cup-0.0.jar
+7f17789cd000-7f17789ce000 r-xs 00006000 08:01 11313871 /home/sanjaya/.m2/repository/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar
+7f17789ce000-7f17789d8000 r-xs 00079000 08:01 11586409 /home/sanjaya/.m2/repository/org/apache/bcel/bcel/5.2/bcel-5.2.jar
+7f17789d8000-7f17789da000 r-xs 0001c000 08:01 11313969 /home/sanjaya/.m2/repository/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar
+7f17789da000-7f17789e2000 r-xs 000a6000 08:01 11586905 /home/sanjaya/.m2/repository/rhino/js/1.6R5/js-1.6R5.jar
+7f17789e2000-7f17789ea000 r-xs 00028000 08:01 11313968 /home/sanjaya/.m2/repository/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar
+7f17789ea000-7f1778a01000 r-xs 00112000 08:01 11586904 /home/sanjaya/.m2/repository/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar
+7f1778a01000-7f1778a04000 r-xs 00041000 08:01 11586534 /home/sanjaya/.m2/repository/xalan/serializer/2.7.1/serializer-2.7.1.jar
+7f1778a04000-7f1778a29000 r-xs 002e3000 08:01 11586533 /home/sanjaya/.m2/repository/xalan/xalan/2.7.1/xalan-2.7.1.jar
+7f1778a29000-7f1778a2a000 r-xs 00002000 08:01 15994064 /home/sanjaya/.m2/repository/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar
+7f1778a2a000-7f1778a2f000 r-xs 0003a000 08:01 11586992 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-codegen/1.6.1-wso2v1/axis2-codegen-1.6.1-wso2v1.jar
+7f1778a2f000-7f1778a35000 r-xs 00057000 08:01 11586902 /home/sanjaya/.m2/repository/org/apache/sandesha2/sandesha2-core/1.6.1-wso2v1/sandesha2-core-1.6.1-wso2v1.jar
+7f1778a35000-7f1778a3b000 r-xs 00079000 08:01 5471 /home/sanjaya/.m2/repository/org/codehaus/woodstox/wstx-asl/3.2.4/wstx-asl-3.2.4.jar
+7f1778a3b000-7f1778a3d000 r-xs 00007000 08:01 16387094 /home/sanjaya/.m2/repository/org/apache/neethi/neethi/2.0.4-wso2v2/neethi-2.0.4-wso2v2.jar
+7f1778a3d000-7f1778a3f000 r-xs 00002000 08:01 11586901 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-mtompolicy/1.6.1-wso2v8/axis2-mtompolicy-1.6.1-wso2v8.jar
+7f1778a3f000-7f1778a41000 r-xs 00007000 08:01 11555599 /home/sanjaya/.m2/repository/org/apache/tomcat/embed/tomcat-embed-logging-juli/7.0.8/tomcat-embed-logging-juli-7.0.8.jar
+7f1778a41000-7f1778a43000 r-xs 00007000 08:01 11555600 /home/sanjaya/.m2/repository/org/apache/tomcat/tomcat-juli/7.0.8/tomcat-juli-7.0.8.jar
+7f1778a43000-7f1778a48000 r-xs 00039000 08:01 11555601 /home/sanjaya/.m2/repository/org/apache/tomcat/tomcat-tribes/7.0.8/tomcat-tribes-7.0.8.jar
+7f1778a48000-7f1778a4b000 r-xs 00019000 08:01 11586900 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-clustering/1.6.1-wso2v8/axis2-clustering-1.6.1-wso2v8.jar
+7f1778a4b000-7f1778a54000 r-xs 000a9000 08:01 11586899 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-adb/1.6.1-wso2v8/axis2-adb-1.6.1-wso2v8.jar
+7f1778a54000-7f1778a56000 r-xs 00003000 08:01 26741621 /home/sanjaya/.m2/repository/org/wso2/uri/template/wso2-uri-templates/1.6.2/wso2-uri-templates-1.6.2.jar
+7f1778a56000-7f1778a59000 r-xs 00024000 08:01 12324557 /home/sanjaya/.m2/repository/org/apache/ws/commons/axiom/axiom-dom/1.2.11-wso2v2/axiom-dom-1.2.11-wso2v2.jar
+7f1778a59000-7f1778a5b000 r-xs 00015000 08:01 11586898 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-saaj/1.6.1-wso2v8/axis2-saaj-1.6.1-wso2v8.jar
+7f1778a5b000-7f1778a5f000 r-xs 00025000 08:01 11313966 /home/sanjaya/.m2/repository/org/antlr/antlr-runtime/3.4/antlr-runtime-3.4.jar
+7f1778a5f000-7f1778a87000 r-xs 001a3000 08:01 11586897 /home/sanjaya/.m2/repository/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar
+7f1778a87000-7f1778a8a000 r-xs 00024000 08:01 11588233 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-transport-http/1.6.1-wso2v8/axis2-transport-http-1.6.1-wso2v8.jar
+7f1778a8a000-7f1778a90000 r-xs 00041000 08:01 11586893 /home/sanjaya/.m2/repository/org/apache/httpcomponents/httpcore-nio/4.2.3/httpcore-nio-4.2.3.jar
+7f1778a90000-7f1778abe000 r-xs 001ef000 08:01 26874891 /home/sanjaya/.m2/repository/org/apache/synapse/synapse-nhttp-transport/2.1.1-wso2v4/synapse-nhttp-transport-2.1.1-wso2v4.jar
+7f1778abe000-7f1778ac0000 r-xs 00007000 08:01 28971694 /home/sanjaya/.m2/repository/org/apache/synapse/synapse-tasks/2.1.1-wso2v4/synapse-tasks-2.1.1-wso2v4.jar
+7f1778ac0000-7f1778ac6000 r-xs 00063000 08:01 11313975 /home/sanjaya/.m2/repository/org/snmp4j/snmp4j/2.0.3/snmp4j-2.0.3.jar
+7f1778ac6000-7f1778ad1000 r-xs 00078000 08:01 11313976 /home/sanjaya/.m2/repository/org/snmp4j/snmp4j-agent/2.0.5/snmp4j-agent-2.0.5.jar
+7f1778ad1000-7f1778ad4000 r-xs 00015000 08:01 11586908 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-transport-base/1.1.0-wso2v4/axis2-transport-base-1.1.0-wso2v4.jar
+7f1778ad4000-7f1778ad6000 r-xs 0000e000 08:01 16385102 /home/sanjaya/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar
+7f1778ad6000-7f1778adb000 r-xs 00027000 08:01 26741622 /home/sanjaya/.m2/repository/org/apache/synapse/synapse-commons/2.1.1-wso2v4/synapse-commons-2.1.1-wso2v4.jar
+7f1778adb000-7f1778b02000 r-xs 0092f000 08:01 26874878 /home/sanjaya/.m2/repository/net/sf/saxon/Saxon-HE/9.4/Saxon-HE-9.4.jar
+7f1778b02000-7f1778b3a000 r-xs 00433000 08:01 5932 /home/sanjaya/.m2/repository/org/apache/openjpa/openjpa/2.2.0-wso2v1/openjpa-2.2.0-wso2v1.jar
+7f1778b3a000-7f1778b4c000 r-xs 00122000 08:01 26741620 /home/sanjaya/.m2/repository/org/apache/synapse/synapse-core/2.1.1-wso2v4/synapse-core-2.1.1-wso2v4.jar
+7f1778b4c000-7f1778b4d000 r-xs 00003000 08:01 27267240 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.mediator.router.impl/4.2.0/org.wso2.carbon.mediator.router.impl-4.2.0.jar
+7f1778b4d000-7f1778b4f000 r-xs 00013000 08:01 11555650 /home/sanjaya/.m2/repository/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar
+7f1778b4f000-7f1778b52000 r-xs 00023000 08:01 26874879 /home/sanjaya/.m2/repository/org/jdom/jdom/1.1/jdom-1.1.jar
+7f1778b52000-7f1778b5a000 r-xs 00048000 08:01 15863798 /home/sanjaya/.m2/repository/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar
+7f1778b5a000-7f1778b5c000 r-xs 00008000 08:01 26874880 /home/sanjaya/.m2/repository/org/wso2/throttle/wso2throttle-core/3.2.0/wso2throttle-core-3.2.0.jar
+7f1778b5c000-7f1778b7f000 r-xs 00250000 08:01 11314049 /home/sanjaya/.m2/repository/groovy/groovy-all/1.1-rc-1/groovy-all-1.1-rc-1.jar
+7f1778b7f000-7f1778b85000 r-xs 0006b000 08:01 26874877 /home/sanjaya/.m2/repository/org/apache/bsf/bsf-all/3.0/bsf-all-3.0.jar
+7f1778b85000-7f1778bc2000 r-xs 0024e000 08:01 26874876 /home/sanjaya/.m2/repository/xmlbeans/xbean/2.2.0/xbean-2.2.0.jar
+7f1778bc2000-7f1778bc7000 r-xs 00022000 08:01 26741607 /home/sanjaya/.m2/repository/org/springframework/spring-aop/1.2.8/spring-aop-1.2.8.jar
+7f1778bc7000-7f1778bca000 r-xs 00018000 08:01 26741608 /home/sanjaya/.m2/repository/org/springframework/spring-context/1.2.8/spring-context-1.2.8.jar
+7f1778bca000-7f1778bcf000 r-xs 00034000 08:01 26741609 /home/sanjaya/.m2/repository/org/springframework/spring-beans/1.2.8/spring-beans-1.2.8.jar
+7f1778bcf000-7f1778bd2000 r-xs 0001b000 08:01 11586909 /home/sanjaya/.m2/repository/org/springframework/spring-core/1.2.8/spring-core-1.2.8.jar
+7f1778bd2000-7f1778bd4000 r-xs 00012000 08:01 27267250 /home/sanjaya/.m2/repository/org/apache/synapse/synapse-extensions/2.1.1-wso2v8/synapse-extensions-2.1.1-wso2v8.jar
+7f1778bd4000-7f1778bd6000 r-xs 00009000 08:01 27267239 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.mediation.dependency.mgt/4.2.0/org.wso2.carbon.mediation.dependency.mgt-4.2.0.jar
+7f1778bd6000-7f1778bdd000 r-xs 00076000 08:01 14815421 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.event.client.stub/4.2.0/org.wso2.carbon.event.client.stub-4.2.0.jar
+7f1778bdd000-7f1778bdf000 r-xs 00015000 08:01 22154412 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.qpid.stub/4.2.0/org.wso2.carbon.qpid.stub-4.2.0.jar
+7f1778bdf000-7f1778be2000 r-xs 00012000 08:01 15340850 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.event.core/4.2.0/org.wso2.carbon.event.core-4.2.0.jar
+7f1778be2000-7f1778be5000 r-xs 00013000 08:01 11586906 /home/sanjaya/.m2/repository/xmlunit/xmlunit/1.1/xmlunit-1.1.jar
+7f1778be5000-7f1778be7000 r-xs 00006000 08:01 15472318 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-saaj_1.3_spec/1.0.0/geronimo-saaj_1.3_spec-1.0.0.jar
+7f1778be7000-7f1778beb000 r-xs 00023000 08:01 14947943 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.caching.core/4.2.0/org.wso2.carbon.caching.core-4.2.0.jar
+7f1778beb000-7f1778bec000 r-xs 00002000 08:01 14814825 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.roles.mgt/4.2.0/org.wso2.carbon.roles.mgt-4.2.0.jar
+7f1778bec000-7f1778bef000 r-xs 0000e000 08:01 14814829 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.application.deployer/4.2.0/org.wso2.carbon.application.deployer-4.2.0.jar
+7f1778bef000-7f1778bf1000 r-xs 00001000 08:01 27267238 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.task.services/4.2.0/org.wso2.carbon.task.services-4.2.0.jar
+7f1778bf1000-7f1778bf3000 r-xs 00006000 08:01 26874884 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.datasource/4.2.0/org.wso2.carbon.datasource-4.2.0.jar
+7f1778bf3000-7f1778bf5000 r-xs 00008000 08:01 26874883 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.mediation.registry/4.2.0/org.wso2.carbon.mediation.registry-4.2.0.jar
+7f1778bf5000-7f1778bf8000 r-xs 00024000 08:01 26874882 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.mediation.initializer/4.2.0/org.wso2.carbon.mediation.initializer-4.2.0.jar
+7f1778bf8000-7f1778bfb000 r-xs 00015000 08:01 11314071 /home/sanjaya/.m2/repository/commons-pool/commons-pool/1.5/commons-pool-1.5.jar
+7f1778bfb000-7f1778c01000 r-xs 00032000 08:01 11588075 /home/sanjaya/.m2/repository/org/apache/httpcomponents/httpcore/4.2.4/httpcore-4.2.4.jar
+7f1778c01000-7f1778c07000 r-xs 00033000 08:01 15861392 /home/sanjaya/.m2/repository/commons-codec/commons-codec/1.6/commons-codec-1.6.jar
+7f1778c07000-7f1778c10000 r-xs 00061000 08:01 11588074 /home/sanjaya/.m2/repository/org/apache/httpcomponents/httpclient/4.2.5/httpclient-4.2.5.jar
+7f1778c10000-7f1778c11000 r-xs 00005000 08:01 18127631 /home/sanjaya/.m2/repository/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar
+7f1778c11000-7f1778c16000 r-xs 00030000 08:01 28186562 /home/sanjaya/.m2/repository/org/apache/thrift/libthrift/0.9.1/libthrift-0.9.1.jar
+7f1778c16000-7f1778c18000 r-xs 00006000 08:01 15863378 /home/sanjaya/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar
+7f1778c18000-7f1778c1a000 r-xs 0000c000 08:01 26741574 /home/sanjaya/.m2/repository/org/apache/maven/shared/maven-dependency-tree/2.0/maven-dependency-tree-2.0.jar
+7f1778c1a000-7f1778c1b000 r-xs 0000a000 08:01 11315743 /home/sanjaya/.m2/repository/asm/asm/3.3.1/asm-3.3.1.jar
+7f1778c1b000-7f1778c1d000 r-xs 00005000 08:01 15994087 /home/sanjaya/.m2/repository/org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar
+7f1778c1d000-7f1778c20000 r-xs 0000c000 08:01 28578074 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar
+7f1778c20000-7f1778c22000 r-xs 00008000 08:01 16385226 /home/sanjaya/.m2/repository/org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar
+7f1778c22000-7f1778c26000 r-xs 00035000 08:01 13112591 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar
+7f1778c26000-7f1778c2a000 r-xs 0002a000 08:01 15863777 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar
+7f1778c2a000-7f1778c2c000 r-xs 00004000 08:01 16384991 /home/sanjaya/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar
+7f1778c2c000-7f1778c2d000 r-xs 00006000 08:01 16384988 /home/sanjaya/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar
+7f1778c2d000-7f1778c2e000 r-xs 00004000 08:01 16384987 /home/sanjaya/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar
+7f1778c2e000-7f1778c30000 r-xs 0000a000 08:01 16384971 /home/sanjaya/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar
+7f1778c30000-7f1778c31000 r-xs 0000b000 08:01 16384969 /home/sanjaya/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar
+7f1778c31000-7f1778c33000 r-xs 0000a000 08:01 16384959 /home/sanjaya/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar
+7f1778c33000-7f1778c38000 r-xs 00016000 08:01 11297056 /home/sanjaya/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
+7f1778c38000-7f1778c3c000 r-xs 00026000 08:01 11555471 /home/sanjaya/.m2/repository/commons-digester/commons-digester/1.6/commons-digester-1.6.jar
+7f1778c3c000-7f1778c3f000 r-xs 00014000 08:01 11555469 /home/sanjaya/.m2/repository/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar
+7f1778c3f000-7f1778c42000 r-xs 0000b000 08:01 16384961 /home/sanjaya/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar
+7f1778c42000-7f1778c4d000 r-xs 00085000 08:01 15343212 /home/sanjaya/.m2/repository/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar
+7f1778c4d000-7f1778c58000 r-xs 0008a000 08:01 11313974 /home/sanjaya/.m2/repository/c3p0/c3p0/0.9.1.1/c3p0-0.9.1.1.jar
+7f1778c58000-7f1778c61000 r-xs 0007f000 08:01 11313973 /home/sanjaya/.m2/repository/org/quartz-scheduler/quartz/2.1.1/quartz-2.1.1.jar
+7f1778c61000-7f1778c6a000 r-xs 00080000 08:01 11314041 /home/sanjaya/.m2/repository/org/quartz-scheduler/wso2/quartz/2.1.1.wso2v1/quartz-2.1.1.wso2v1.jar
+7f1778c6a000-7f1778c6e000 r-xs 0002b000 08:01 14815311 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.remote-tasks.stub/4.2.0/org.wso2.carbon.remote-tasks.stub-4.2.0.jar
+7f1778c6e000-7f1778c6f000 r-xs 00001000 08:01 14815310 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.ntask.common/4.2.0/org.wso2.carbon.ntask.common-4.2.0.jar
+7f1778c6f000-7f1778c72000 r-xs 00014000 08:01 14815309 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.ntask.core/4.2.0/org.wso2.carbon.ntask.core-4.2.0.jar
+7f1778c72000-7f1778c75000 r-xs 00014000 08:01 11314067 /home/sanjaya/.m2/repository/commons-pool/wso2/commons-pool/1.5.0.wso2v1/commons-pool-1.5.0.wso2v1.jar
+7f1778c75000-7f1778c7c000 r-xs 000b4000 08:01 14028095 /home/sanjaya/.m2/repository/rhino/wso2/js/1.7.0.R1-wso2v3/js-1.7.0.R1-wso2v3.jar
+7f1778c7c000-7f1778c7f000 r-xs 00023000 08:01 11535623 /home/sanjaya/.m2/repository/commons-io/wso2/commons-io/2.0.0.wso2v1/commons-io-2.0.0.wso2v1.jar
+7f1778c7f000-7f1778c80000 r-xs 0000a000 08:01 15863818 /home/sanjaya/.m2/repository/net/oauth/core/oauth/20100527/oauth-20100527.jar
+7f1778c80000-7f1778c8a000 r-xs 00067000 08:01 20851077 /home/sanjaya/.m2/repository/com/sun/jersey/jersey-core/1.12/jersey-core-1.12.jar
+7f1778c8a000-7f1778c8c000 r-xs 00007000 08:01 19010722 /home/sanjaya/.m2/repository/com/google/guice/assistedinject/wso2/guice-assistedinject/3.0.wso2v1/guice-assistedinject-3.0.wso2v1.jar
+7f1778c8c000-7f1778c8e000 r-xs 00007000 08:01 27399866 /home/sanjaya/.m2/repository/com/google/inject/extensions/guice-multibindings/3.0/guice-multibindings-3.0.jar
+7f1778c8e000-7f1778c9e000 r-xs 000a9000 08:01 16913498 /home/sanjaya/.m2/repository/com/google/guice/wso2/guice/3.0.wso2v1/guice-3.0.wso2v1.jar
+7f1778c9e000-7f1778ca3000 r-xs 0002a000 08:01 15863387 /home/sanjaya/.m2/repository/com/google/code/gson/gson/2.2/gson-2.2.jar
+7f1778ca3000-7f1778ca4000 r-xs 00004000 08:01 20582857 /home/sanjaya/.m2/repository/com/jamesmurty/utils/wso2/java-xmlbuilder/0.4.wso2v1/java-xmlbuilder-0.4.wso2v1.jar
+7f1778ca4000-7f1778cad000 r-xs 00054000 08:01 23464390 /home/sanjaya/Desktop/Stratos/stratos/dependencies/jclouds/apis/vcloud/1.8.0-stratos/target/vcloud-1.8.0-stratos.jar
+7f1778cad000-7f1778cb2000 r-xs 00026000 08:01 26741601 /home/sanjaya/.m2/repository/org/apache/jclouds/jclouds-scriptbuilder/1.8.0/jclouds-scriptbuilder-1.8.0.jar
+7f1778cb2000-7f1778cb9000 r-xs 0002b000 08:01 27267234 /home/sanjaya/.m2/repository/org/apache/jclouds/api/openstack-keystone/1.8.0/openstack-keystone-1.8.0.jar
+7f1778cb9000-7f1778cc4000 r-xs 00052000 08:01 23073339 /home/sanjaya/Desktop/Stratos/stratos/dependencies/jclouds/apis/openstack-nova/1.8.0-stratos/target/openstack-nova-1.8.0-stratos.jar
+7f1778cc4000-7f1778cc9000 r-xs 0002c000 08:01 17044184 /home/sanjaya/Desktop/Stratos/stratos/dependencies/jclouds/provider/aws-ec2/1.8.0-stratos/target/aws-ec2-1.8.0-stratos.jar
+7f1778cc9000-7f1778ccb000 r-xs 0000e000 08:01 1835377 /home/sanjaya/.m2/repository/org/apache/jclouds/api/sts/1.8.0/sts-1.8.0.jar
+7f1778ccb000-7f1778cd4000 r-xs 0005b000 08:01 20321104 /home/sanjaya/Desktop/Stratos/stratos/dependencies/jclouds/apis/ec2/1.8.0-stratos/target/ec2-1.8.0-stratos.jar
+7f1778cd4000-7f1778cea000 r-xs 000fe000 08:01 26874874 /home/sanjaya/.m2/repository/io/netty/netty/3.5.9.Final/netty-3.5.9.Final.jar
+7f1778cea000-7f1778ceb000 r-xs 00002000 08:01 26874875 /home/sanjaya/.m2/repository/org/apache/jclouds/driver/jclouds-netty/1.8.0/jclouds-netty-1.8.0.jar
+7f1778ceb000-7f1778cfb000 r-xs 0007c000 08:01 26874873 /home/sanjaya/.m2/repository/joda-time/joda-time/2.1/joda-time-2.1.jar
+7f1778cfb000-7f1778cfc000 r-xs 00002000 08:01 26874871 /home/sanjaya/.m2/repository/org/apache/jclouds/driver/jclouds-joda/1.8.0/jclouds-joda-1.8.0.jar
+7f1778cfc000-7f1778cfd000 r-xs 00002000 08:01 26874872 /home/sanjaya/.m2/repository/org/apache/jclouds/driver/jclouds-enterprise/1.8.0/jclouds-enterprise-1.8.0.jar
+7f1778cfd000-7f1778cfe000 r-xs 00002000 08:01 26874870 /home/sanjaya/.m2/repository/org/apache/jclouds/driver/jclouds-log4j/1.8.0/jclouds-log4j-1.8.0.jar
+7f1778cfe000-7f1778cff000 r-xs 00000000 08:01 26741599 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.sshj/0.0.7/jsch.agentproxy.sshj-0.0.7.jar
+7f1778cff000-7f1778d0f000 r-xs 0008a000 08:01 26741598 /home/sanjaya/.m2/repository/org/bouncycastle/bcpkix-jdk15on/1.49/bcpkix-jdk15on-1.49.jar
+7f1778d0f000-7f1778d17000 r-xs 0004e000 08:01 26741600 /home/sanjaya/.m2/repository/net/schmizz/sshj/0.8.1/sshj-0.8.1.jar
+7f1778d17000-7f1778d18000 r-xs 00002000 08:01 26741596 /home/sanjaya/.m2/repository/org/apache/jclouds/driver/jclouds-slf4j/1.8.0/jclouds-slf4j-1.8.0.jar
+7f1778d18000-7f1778d1a000 r-xs 00008000 08:01 26741597 /home/sanjaya/.m2/repository/org/apache/jclouds/driver/jclouds-sshj/1.8.0/jclouds-sshj-1.8.0.jar
+7f1778d1a000-7f1778d53000 r-xs 00237000 08:01 26741595 /home/sanjaya/.m2/repository/org/bouncycastle/bcprov-ext-jdk15on/1.49/bcprov-ext-jdk15on-1.49.jar
+7f1778d53000-7f1778d54000 r-xs 00002000 08:01 26741594 /home/sanjaya/.m2/repository/org/apache/jclouds/driver/jclouds-bouncycastle/1.8.0/jclouds-bouncycastle-1.8.0.jar
+7f1778d54000-7f1778d60000 r-xs 00071000 08:01 26741593 /home/sanjaya/.m2/repository/org/apache/jclouds/jclouds-compute/1.8.0/jclouds-compute-1.8.0.jar
+7f1778d60000-7f1778d61000 r-xs 00001000 08:01 26741592 /home/sanjaya/.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar
+7f1778d61000-7f1778d62000 r-xs 00000000 08:01 16387100 /home/sanjaya/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar
+7f1778d62000-7f1778d64000 r-xs 0000a000 08:01 26481243 /home/sanjaya/.m2/repository/org/99soft/guice/rocoto/6.2/rocoto-6.2.jar
+7f1778d64000-7f1778d66000 r-xs 00000000 08:01 11535791 /home/sanjaya/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar
+7f1778d66000-7f1778d75000 r-xs 0009f000 08:01 26481242 /home/sanjaya/.m2/repository/com/google/inject/guice/3.0/guice-3.0.jar
+7f1778d75000-7f1778d77000 r-xs 00008000 08:01 26481241 /home/sanjaya/.m2/repository/com/google/inject/extensions/guice-assistedinject/3.0/guice-assistedinject-3.0.jar
+7f1778d77000-7f1778d79000 r-xs 0000a000 08:01 16385733 /home/sanjaya/.m2/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar
+7f1778d79000-7f1778d8c000 r-xs 000aa000 08:01 26481240 /home/sanjaya/.m2/repository/org/apache/jclouds/jclouds-core/1.8.0/jclouds-core-1.8.0.jar
+7f1778d8c000-7f1778d8f000 r-xs 00022000 08:01 27925235 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.analytics.hive.stub/4.2.0/org.wso2.carbon.analytics.hive.stub-4.2.0.jar
+7f1778d8f000-7f1778d92000 r-xs 00005000 08:01 15470470 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/wso2/geronimo-jms_1.1_spec/1.1.0.wso2v1/geronimo-jms_1.1_spec-1.1.0.wso2v1.jar
+7f1778d92000-7f1778dbd000 r-xs 001e0000 08:01 18483379 /home/sanjaya/.m2/repository/org/wso2/andes/wso2/andes-client/0.13.wso2v3/andes-client-0.13.wso2v3.jar
+7f1778dbd000-7f1778dbf000 r-xs 00005000 08:01 25691935 /home/sanjaya/.m2/repository/com/ecyrd/speed4j/speed4j/0.9/speed4j-0.9.jar
+7f1778dbf000-7f1778dc1000 r-xs 00002000 08:01 24643194 /home/sanjaya/.m2/repository/com/github/stephenc/eaio-uuid/uuid/3.2.0/uuid-3.2.0.jar
+7f1778dc1000-7f1778dcb000 r-xs 000da000 08:01 19669318 /home/sanjaya/.m2/repository/org/apache/cassandra/cassandra-thrift/1.1.0/cassandra-thrift-1.1.0.jar
+7f1778dcb000-7f1778dd3000 r-xs 00040000 08:01 11587420 /home/sanjaya/.m2/repository/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar
+7f1778dd3000-7f1778dd9000 r-xs 00044000 08:01 11535841 /home/sanjaya/.m2/repository/org/apache/thrift/libthrift/0.7.0/libthrift-0.7.0.jar
+7f1778dd9000-7f1778ddc000 r-xs 00011000 08:01 17697134 /home/sanjaya/.m2/repository/com/yammer/metrics/metrics-core/2.0.3/metrics-core-2.0.3.jar
+7f1778ddc000-7f1778dde000 r-xs 0000c000 08:01 16911187 /home/sanjaya/.m2/repository/edu/stanford/ppl/snaptree/0.1/snaptree-0.1.jar
+7f1778dde000-7f1778de4000 r-xs 00033000 08:01 18222128 /home/sanjaya/.m2/repository/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar
+7f1778de4000-7f1778de7000 r-xs 00015000 08:01 15863592 /home/sanjaya/.m2/repository/com/github/stephenc/high-scale-lib/high-scale-lib/1.1.2/high-scale-lib-1.1.2.jar
+7f1778de7000-7f1778de8000 r-xs 00003000 08:01 15863589 /home/sanjaya/.m2/repository/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar
+7f1778de8000-7f1778df0000 r-xs 00057000 08:01 12979996 /home/sanjaya/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.4.0/jackson-mapper-asl-1.4.0.jar
+7f1778df0000-7f1778df3000 r-xs 00022000 08:01 12979995 /home/sanjaya/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.4.0/jackson-core-asl-1.4.0.jar
+7f1778df3000-7f1778df7000 r-xs 00028000 08:01 11587570 /home/sanjaya/.m2/repository/org/mortbay/jetty/jetty-util/6.1.22/jetty-util-6.1.22.jar
+7f1778df7000-7f1778dfe000 r-xs 0007d000 08:01 11587569 /home/sanjaya/.m2/repository/org/mortbay/jetty/jetty/6.1.22/jetty-6.1.22.jar
+7f1778dfe000-7f1778e08000 r-xs 00088000 08:01 11587409 /home/sanjaya/.m2/repository/org/apache/cassandra/deps/avro/1.4.0-cassandra-1/avro-1.4.0-cassandra-1.jar
+7f1778e08000-7f1778e0b000 r-xs 00027000 08:01 11314098 /home/sanjaya/.m2/repository/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar
+7f1778e0b000-7f1778e0f000 r-xs 00022000 08:01 11314097 /home/sanjaya/.m2/repository/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar
+7f1778e0f000-7f1778e17000 r-xs 000d3000 08:01 11314096 /home/sanjaya/.m2/repository/org/antlr/antlr/3.2/antlr-3.2.jar
+7f1778e17000-7f1778e19000 r-xs 0000b000 08:01 15863639 /home/sanjaya/.m2/repository/com/googlecode/concurrentlinkedhashmap/concurrentlinkedhashmap-lru/1.2/concurrentlinkedhashmap-lru-1.2.jar
+7f1778e19000-7f1778e1b000 r-xs 00005000 08:01 16128693 /home/sanjaya/.m2/repository/com/ning/compress-lzf/0.8.4/compress-lzf-0.8.4.jar
+7f1778e1b000-7f1778e1d000 r-xs 000f2000 08:01 11314126 /home/sanjaya/.m2/repository/org/xerial/snappy/snappy-java/1.0.4.1/snappy-java-1.0.4.1.jar
+7f1778e1d000-7f1778e3b000 r-xs 001e7000 08:01 11587514 /home/sanjaya/.m2/repository/org/apache/cassandra/cassandra-all/1.1.0/cassandra-all-1.1.0.jar
+7f1778e3b000-7f1778e3e000 r-xs 00015000 08:01 11314099 /home/sanjaya/.m2/repository/commons-pool/commons-pool/1.5.3/commons-pool-1.5.3.jar
+7f1778e3e000-7f1778e4a000 r-xs 00079000 08:01 11314100 /home/sanjaya/.m2/repository/org/hectorclient/hector-core/1.1-0/hector-core-1.1-0.jar
+7f1778e4a000-7f1778e56000 r-xs 00079000 08:01 11314196 /home/sanjaya/.m2/repository/org/hectorclient/wso2/hector-core/1.1.0.wso2v1/hector-core-1.1.0.wso2v1.jar
+7f1778e56000-7f1778e5f000 r-xs 00098000 08:01 26481239 /home/sanjaya/.m2/repository/org/javassist/javassist/3.16.1-GA/javassist-3.16.1-GA.jar
+7f1778e5f000-7f1778e62000 r-xs 0001b000 08:01 26350717 /home/sanjaya/.m2/repository/org/reflections/reflections/0.9.9-RC1/reflections-0.9.9-RC1.jar
+7f1778e62000-7f1778e63000 r-xs 00001000 08:01 26350716 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.pageant/0.0.7/jsch.agentproxy.pageant-0.0.7.jar
+7f1778e63000-7f1778e65000 r-xs 00000000 08:01 26350715 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.sshagent/0.0.7/jsch.agentproxy.sshagent-0.0.7.jar
+7f1778e65000-7f1778e66000 r-xs 00001000 08:01 24251462 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.usocket-nc/0.0.7/jsch.agentproxy.usocket-nc-0.0.7.jar
+7f1778e66000-7f1778e71000 r-xs 000d5000 08:01 5914 /home/sanjaya/.m2/repository/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar
+7f1778e71000-7f1778e75000 r-xs 000f3000 08:01 5913 /home/sanjaya/.m2/repository/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar
+7f1778e75000-7f1778e76000 r-xs 00001000 08:01 23993368 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.usocket-jna/0.0.7/jsch.agentproxy.usocket-jna-0.0.7.jar
+7f1778e76000-7f1778e77000 r-xs 00002000 08:01 23207175 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.connector-factory/0.0.7/jsch.agentproxy.connector-factory-0.0.7.jar
+7f1778e77000-7f1778e79000 r-xs 00001000 08:01 22940965 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.core/0.0.7/jsch.agentproxy.core-0.0.7.jar
+7f1778e79000-7f1778e7c000 r-xs 00035000 08:01 22682839 /home/sanjaya/.m2/repository/com/jcraft/jsch/0.1.49/jsch-0.1.49.jar
+7f1778e7c000-7f1778e7e000 r-xs 00000000 08:01 22026241 /home/sanjaya/.m2/repository/com/jcraft/jsch.agentproxy.jsch/0.0.7/jsch.agentproxy.jsch-0.0.7.jar
+7f1778e7e000-7f1778ea9000 r-xs 001f9000 08:01 21369171 /home/sanjaya/.m2/repository/com/google/guava/guava/17.0/guava-17.0.jar
+7f1778ea9000-7f1778eb4000 r-xs 00076000 08:01 12982721 /home/sanjaya/.m2/repository/org/apache/httpcomponents/wso2/httpclient/4.1.1.wso2v1/httpclient-4.1.1.wso2v1.jar
+7f1778eb4000-7f1778eb6000 r-xs 00007000 08:01 19139661 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.kubernetes.client/target/org.apache.stratos.kubernetes.client-4.1.0-SNAPSHOT.jar
+7f1778eb6000-7f1778eb9000 r-xs 0002f000 08:01 13111433 /home/sanjaya/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.jar
+7f1778eb9000-7f1778ec2000 r-xs 000a9000 08:01 11555364 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-adb/1.6.1-wso2v10/axis2-adb-1.6.1-wso2v10.jar
+7f1778ec2000-7f1778ec3000 r-xs 00004000 08:01 11555370 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-transport-local/1.6.1-wso2v10/axis2-transport-local-1.6.1-wso2v10.jar
+7f1778ec3000-7f1778ec9000 r-xs 00032000 08:01 11555383 /home/sanjaya/.m2/repository/org/apache/httpcomponents/httpcore/4.2.3/httpcore-4.2.3.jar
+7f1778ec9000-7f1778ecc000 r-xs 00025000 08:01 11555386 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-transport-http/1.6.1-wso2v10/axis2-transport-http-1.6.1-wso2v10.jar
+7f1778ecc000-7f1778ed3000 r-xs 00059000 08:01 17564747 /home/sanjaya/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar
+7f1778ed3000-7f1778ed6000 r-xs 00011000 08:01 12587702 /home/sanjaya/.m2/repository/org/wso2/securevault/org.wso2.securevault/1.0.0/org.wso2.securevault-1.0.0.jar
+7f1778ed6000-7f1778ed8000 r-xs 00009000 08:01 16384477 /home/sanjaya/.m2/repository/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0.jar
+7f1778ed8000-7f1778edc000 r-xs 0002a000 08:01 16384471 /home/sanjaya/.m2/repository/org/apache/woden/woden-impl-commons/1.0M9/woden-impl-commons-1.0M9.jar
+7f1778edc000-7f1778edd000 r-xs 0000b000 08:01 16384475 /home/sanjaya/.m2/repository/org/apache/woden/woden-impl-dom/1.0M9/woden-impl-dom-1.0M9.jar
+7f1778edd000-7f1778ee2000 r-xs 00020000 08:01 16384487 /home/sanjaya/.m2/repository/org/apache/woden/woden-api/1.0M9/woden-api-1.0M9.jar
+7f1778ee2000-7f1778ee4000 r-xs 00007000 08:01 16386057 /home/sanjaya/.m2/repository/org/apache/neethi/neethi/2.0.4/neethi-2.0.4.jar
+7f1778ee4000-7f1778ee7000 r-xs 00011000 08:01 16384497 /home/sanjaya/.m2/repository/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar
+7f1778ee7000-7f1778ee8000 r-xs 00003000 08:01 16384464 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1/geronimo-jta_1.1_spec-1.1.jar
+7f1778ee8000-7f1778ee9000 r-xs 00003000 08:01 16384492 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-ws-metadata_2.0_spec/1.1.2/geronimo-ws-metadata_2.0_spec-1.1.2.jar
+7f1778ee9000-7f1778eec000 r-xs 0001c000 08:01 16386055 /home/sanjaya/.m2/repository/org/apache/ws/commons/axiom/axiom-impl/1.2.11-wso2v4/axiom-impl-1.2.11-wso2v4.jar
+7f1778eec000-7f1778ef6000 r-xs 00062000 08:01 15340088 /home/sanjaya/.m2/repository/org/apache/ws/commons/axiom/axiom-api/1.2.11-wso2v4/axiom-api-1.2.11-wso2v4.jar
+7f1778ef6000-7f1778f03000 r-xs 000ff000 08:01 14290303 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-kernel/1.6.1-wso2v10/axis2-kernel-1.6.1-wso2v10.jar
+7f1778f03000-7f1778f04000 r-xs 00007000 08:01 11555500 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-java2wsdl/1.6.1-wso2v10/axis2-java2wsdl-1.6.1-wso2v10.jar
+7f1778f04000-7f1778f06000 r-xs 00002000 08:01 11555858 /home/sanjaya/.m2/repository/org/apache/axis2/axis2-java2wsdl-maven-plugin/1.6.1-wso2v10/axis2-java2wsdl-maven-plugin-1.6.1-wso2v10.jar
+7f1778f06000-7f1778f08000 r-xs 0000a000 08:01 15863120 /home/sanjaya/.m2/repository/commons-codec/wso2/commons-codec/1.3.0.wso2v1/commons-codec-1.3.0.wso2v1.jar
+7f1778f08000-7f1778f10000 r-xs 00050000 08:01 16387014 /home/sanjaya/.m2/repository/org/apache/woden/wso2/woden/1.0.0.M8-wso2v1/woden-1.0.0.M8-wso2v1.jar
+7f1778f10000-7f1778f12000 r-xs 0000d000 08:01 11586251 /home/sanjaya/.m2/repository/org/apache/axis2/wso2/axis2-json/1.6.1.wso2v10/axis2-json-1.6.1.wso2v10.jar
+7f1778f12000-7f1778f19000 r-xs 00081000 08:01 15470462 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/wso2/geronimo-stax-api_1.0_spec/1.0.1.wso2v1/geronimo-stax-api_1.0_spec-1.0.1.wso2v1.jar
+7f1778f19000-7f1778f5c000 r-xs 00406000 08:01 10753247 /home/sanjaya/.m2/repository/org/apache/axis2/wso2/axis2-client/1.6.1.wso2v10/axis2-client-1.6.1.wso2v10.jar
+7f1778f5c000-7f1778f5e000 r-xs 00006000 08:01 4981318 /home/sanjaya/Desktop/Stratos/stratos/service-stubs/org.apache.stratos.manager.cleanup.notification.stub/target/org.apache.stratos.manager.cleanup.notification.stub-4.1.0-SNAPSHOT.jar
+7f1778f5e000-7f1778f63000 r-xs 00020000 08:01 16384474 /home/sanjaya/.m2/repository/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar
+7f1778f63000-7f1778f65000 r-xs 00007000 08:01 16384527 /home/sanjaya/.m2/repository/org/apache/neethi/neethi/2.0.4-wso2v4/neethi-2.0.4-wso2v4.jar
+7f1778f65000-7f1778f6a000 r-xs 00061000 08:01 29757743 /home/sanjaya/Desktop/Stratos/stratos/service-stubs/org.apache.stratos.cloud.controller.service.stub/target/org.apache.stratos.cloud.controller.service.stub-4.1.0-SNAPSHOT.jar
+7f1778f6a000-7f1778f6c000 r-xs 0000f000 08:01 17960908 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.common/target/org.apache.stratos.common-4.1.0-SNAPSHOT.jar
+7f1778f6c000-7f1778f75000 r-xs 00030000 08:01 19139610 /home/sanjaya/Desktop/Stratos/stratos/components/org.apache.stratos.messaging/target/org.apache.stratos.messaging-4.1.0-SNAPSHOT.jar
+7f1778f75000-7f1778f77000 r-xs 00002000 08:01 27529257 /home/sanjaya/.m2/repository/jsr94/jsr94/1.1/jsr94-1.1.jar
+7f1778f77000-7f1778f98000 r-xs 0015a000 08:01 12324575 /home/sanjaya/.m2/repository/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar
+7f1778f98000-7f1778f9c000 r-xs 0002b000 08:01 12324576 /home/sanjaya/.m2/repository/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar
+7f1778f9c000-7f1778fa7000 r-xs 000f9000 08:01 929605 /home/sanjaya/.m2/repository/com/lowagie/itext/2.1.2/itext-2.1.2.jar
+7f1778fa7000-7f1778fa9000 r-xs 00005000 08:01 15860740 /home/sanjaya/.m2/repository/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar
+7f1778fa9000-7f1778fb7000 r-xs 0018b000 08:01 29886875 /home/sanjaya/.m2/repository/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.jar
+7f1778fb7000-7f1778fb9000 r-xs 0000c000 08:01 7641 /home/sanjaya/.m2/repository/org/drools/drools-templates/5.5.0.Final/drools-templates-5.5.0.Final.jar
+7f1778fb9000-7f1778fcc000 r-xs 000d2000 08:01 929604 /home/sanjaya/.m2/repository/com/google/guava/guava/r06/guava-r06.jar
+7f1778fcc000-7f1778fd2000 r-xs 0002e000 08:01 929603 /home/sanjaya/.m2/repository/org/drools/drools-verifier/5.5.0.Final/drools-verifier-5.5.0.Final.jar
+7f1778fd2000-7f1778fde000 r-xs 000a9000 08:01 29757670 /home/sanjaya/.m2/repository/org/mvel/mvel2/2.1.3.Final/mvel2-2.1.3.Final.jar
+7f1778fde000-7f1778fe7000 r-xs 00025000 08:01 29757672 /home/sanjaya/.m2/repository/org/drools/knowledge-api/5.5.0.Final/knowledge-api-5.5.0.Final.jar
+7f1778fe7000-7f1778fe9000 r-xs 00001000 08:01 29757671 /home/sanjaya/.m2/repository/org/drools/knowledge-internal-api/5.5.0.Final/knowledge-internal-api-5.5.0.Final.jar
+7f1778fe9000-7f1778feb000 r-xs 00006000 08:01 929606 /home/sanjaya/.m2/repository/org/drools/drools-jsr94/5.5.0.Final/drools-jsr94-5.5.0.Final.jar
+7f1778feb000-7f1778fee000 r-xs 00022000 08:01 11313967 /home/sanjaya/.m2/repository/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.jar
+7f1778fee000-7f1778ff1000 r-xs 00025000 08:01 29886874 /home/sanjaya/.m2/repository/org/antlr/antlr-runtime/3.3/antlr-runtime-3.3.jar
+7f1778ff1000-7f1778ffd000 r-xs 000aa000 08:01 929602 /home/sanjaya/.m2/repository/net/sourceforge/jexcelapi/jxl/2.6.10/jxl-2.6.10.jar
+7f1778ffd000-7f1778fff000 r-xs 0000d000 08:01 7639 /home/sanjaya/.m2/repository/org/drools/drools-decisiontables/5.5.0.Final/drools-decisiontables-5.5.0.Final.jar
+7f1778fff000-7f1779008000 r-xs 000d3000 08:01 29886872 /home/sanjaya/.m2/repository/org/antlr/antlr/3.3/antlr-3.3.jar
+7f1779008000-7f177900f000 r-xs 00051000 08:01 7640 /home/sanjaya/.m2/repository/commons-configuration/commons-configuration/1.9/commons-configuration-1.9.jar
+7f177900f000-7f177901c000 r-xs 0006d000 08:01 29886876 /home/sanjaya/.m2/repository/com/thoughtworks/xstream/xstream/1.4.1/xstream-1.4.1.jar
+7f177901c000-7f1779021000 r-xs 00068000 08:01 11555886 /home/sanjaya/.m2/repository/antlr/antlr/2.7.7/antlr-2.7.7.jar
+7f1779021000-7f1779034000 r-xs 00111000 08:01 29886873 /home/sanjaya/.m2/repository/org/drools/drools-compiler/5.5.0.Final/drools-compiler-5.5.0.Final.jar
+7f1779034000-7f1779036000 r-xs 00005000 08:01 18745841 /home/sanjaya/.m2/repository/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar
+7f1779036000-7f1779063000 r-xs 00282000 08:01 29366836 /home/sanjaya/.m2/repository/org/drools/drools-core/5.5.0.Final/drools-core-5.5.0.Final.jar
+7f1779063000-7f1779065000 r-xs 00003000 08:01 15470481 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-j2ee-management_1.1_spec/1.0.1/geronimo-j2ee-management_1.1_spec-1.0.1.jar
+7f1779065000-7f1779067000 r-xs 0000b000 08:01 17959263 /home/sanjaya/.m2/repository/org/fusesource/hawtbuf/hawtbuf/1.9/hawtbuf-1.9.jar
+7f1779067000-7f1779069000 r-xs 00005000 08:01 15863844 /home/sanjaya/.m2/repository/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar
+7f1779069000-7f177907e000 r-xs 0010a000 08:01 1835009 /home/sanjaya/.m2/repository/org/apache/activemq/activemq-client/5.9.1/activemq-client-5.9.1.jar
+7f177907e000-7f1779087000 r-xs 00048000 08:01 15863043 /home/sanjaya/.m2/repository/backport-util-concurrent/backport-util-concurrent/2.1/backport-util-concurrent-2.1.jar
+7f1779087000-7f177909a000 r-xs 000bc000 08:01 11587185 /home/sanjaya/.m2/repository/org/apache/camel/camel-core/1.5.0/camel-core-1.5.0.jar
+7f177909a000-7f17790c1000 r-xs 0020f000 08:01 11587184 /home/sanjaya/.m2/repository/org/apache/activemq/activemq-core/5.2.0/activemq-core-5.2.0.jar
+7f17790c1000-7f17790d7000 r-xp 00000000 08:01 22544476 /lib/x86_64-linux-gnu/libresolv-2.17.so
+7f17790d7000-7f17792d7000 ---p 00016000 08:01 22544476 /lib/x86_64-linux-gnu/libresolv-2.17.so
+7f17792d7000-7f17792d8000 r-xp 00016000 08:01 22544476 /lib/x86_64-linux-gnu/libresolv-2.17.so
+7f17792d8000-7f17792d9000 rwxp 00017000 08:01 22544476 /lib/x86_64-linux-gnu/libresolv-2.17.so
+7f17792d9000-7f17792db000 rwxp 00000000 00:00 0
+7f17792db000-7f17792e1000 r-xp 00000000 08:01 22544485 /lib/x86_64-linux-gnu/libnss_dns-2.17.so
+7f17792e1000-7f17794e0000 ---p 00006000 08:01 22544485 /lib/x86_64-linux-gnu/libnss_dns-2.17.so
+7f17794e0000-7f17794e1000 r-xp 00005000 08:01 22544485 /lib/x86_64-linux-gnu/libnss_dns-2.17.so
+7f17794e1000-7f17794e2000 rwxp 00006000 08:01 22544485 /lib/x86_64-linux-gnu/libnss_dns-2.17.so
+7f17794e2000-7f17794e4000 r-xp 00000000 08:01 22544421 /lib/libnss_mdns4_minimal.so.2
+7f17794e4000-7f17796e3000 ---p 00002000 08:01 22544421 /lib/libnss_mdns4_minimal.so.2
+7f17796e3000-7f17796e4000 r-xp 00001000 08:01 22544421 /lib/libnss_mdns4_minimal.so.2
+7f17796e4000-7f17796e5000 rwxp 00002000 08:01 22544421 /lib/libnss_mdns4_minimal.so.2
+7f17796e5000-7f17796e7000 r-xs 00002000 08:01 15470454 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.0/geronimo-j2ee-management_1.0_spec-1.0.jar
+7f17796e7000-7f17796ea000 r-xs 00017000 08:01 11586195 /home/sanjaya/.m2/repository/org/apache/activemq/activeio-core/3.1.0/activeio-core-3.1.0.jar
+7f17796ea000-7f17796ed000 r-xs 00021000 08:01 17828036 /home/sanjaya/.m2/repository/org/eclipse/paho/mqtt-client/0.4.0/mqtt-client-0.4.0.jar
+7f17796ed000-7f17796ef000 r-xs 00003000 08:01 18618864 /home/sanjaya/.m2/repository/net/iharder/base64/2.3.8/base64-2.3.8.jar
+7f17796ef000-7f17796f0000 r-xs 00002000 08:01 20320922 /home/sanjaya/.m2/repository/com/jamesmurty/utils/java-xmlbuilder/0.6/java-xmlbuilder-0.6.jar
+7f17796f0000-7f17796f2000 r-xs 00008000 08:01 16386119 /home/sanjaya/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar
+7f17796f2000-7f17796f7000 r-xs 0002a000 08:01 15863638 /home/sanjaya/.m2/repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar
+7f17796f7000-7f17796f9000 r-xs 00006000 08:01 15470455 /home/sanjaya/.m2/repository/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1/geronimo-jms_1.1_spec-1.1.jar
+7f17796f9000-7f17796fc000 r-xs 00013000 08:01 19669310 /usr/local/java6/jdk1.6.0_45/jre/lib/jce.jar
+7f17796fc000-7f17796ff000 r-xs 00027000 08:01 25431364 /usr/local/java6/jdk1.6.0_45/jre/lib/ext/sunjce_provider.jar
+7f17796ff000-7f1779706000 r-xs 00096000 08:01 19669193 /usr/local/java6/jdk1.6.0_45/jre/lib/jsse.jar
+7f1779706000-7f1779711000 r-xs 00076000 08:01 11587229 /home/sanjaya/.m2/repository/org/apache/httpcomponents/wso2/httpclient/4.1.1-wso2v1/httpclient-4.1.1-wso2v1.jar
+7f1779711000-7f1779712000 r-xs 00007000 08:01 21497831 /home/sanjaya/.m2/repository/slf4j/wso2/slf4j/1.5.10.wso2v1/slf4j-1.5.10.wso2v1.jar
+7f1779712000-7f1779716000 r-xs 00026000 08:01 11314066 /home/sanjaya/.m2/repository/libthrift/wso2/libthrift/0.7.wso2v1/libthrift-0.7.wso2v1.jar
+7f1779716000-7f177971c000 r-xs 00045000 08:01 14815444 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.databridge.commons.thrift/4.2.0/org.wso2.carbon.databridge.commons.thrift-4.2.0.jar
+7f177971c000-7f177971f000 r-xs 00012000 08:01 14815443 /home/sanjaya/.m2/repository/org/wso2/carbon/org.wso2.carbon.databridge.agent.thrift/4.2.0/org.wso2.carbon.databridge.a
<TRUNCATED>
[41/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
deleted file mode 100644
index a460247..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class SnapshotPolicy
- */
-public class SnapshotPolicy {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromSnapshotPolicy(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected Snapshot.Interval interval;
- protected long numberToRetain;
- protected String schedule;
- protected String timezone;
- protected String volumeId;
-
- /**
- * @see SnapshotPolicy#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see SnapshotPolicy#getInterval()
- */
- public T interval(Snapshot.Interval interval) {
- this.interval = interval;
- return self();
- }
-
- /**
- * @see SnapshotPolicy#getNumberToRetain()
- */
- public T numberToRetain(long numberToRetain) {
- this.numberToRetain = numberToRetain;
- return self();
- }
-
- /**
- * @see SnapshotPolicy#getSchedule()
- */
- public T schedule(String schedule) {
- this.schedule = schedule;
- return self();
- }
-
- /**
- * @see SnapshotPolicy#getTimezone()
- */
- public T timezone(String timezone) {
- this.timezone = timezone;
- return self();
- }
-
- /**
- * @see SnapshotPolicy#getVolumeId()
- */
- public T volumeId(String volumeId) {
- this.volumeId = volumeId;
- return self();
- }
-
- public SnapshotPolicy build() {
- return new SnapshotPolicy(id, interval, numberToRetain, schedule, timezone, volumeId);
- }
-
- public T fromSnapshotPolicy(SnapshotPolicy in) {
- return this
- .id(in.getId())
- .interval(in.getInterval())
- .numberToRetain(in.getNumberToRetain())
- .schedule(in.getSchedule())
- .timezone(in.getTimezone())
- .volumeId(in.getVolumeId());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final Snapshot.Interval interval;
- private final long numberToRetain;
- private final String schedule;
- private final String timezone;
- private final String volumeId;
-
- @ConstructorProperties({
- "id", "intervaltype", "maxsnaps", "schedule", "timezone", "volumeid"
- })
- protected SnapshotPolicy(String id, @Nullable Snapshot.Interval interval, long numberToRetain, @Nullable String schedule,
- @Nullable String timezone, @Nullable String volumeId) {
- this.id = checkNotNull(id, "id");
- this.interval = interval;
- this.numberToRetain = numberToRetain;
- this.schedule = schedule;
- this.timezone = timezone;
- this.volumeId = volumeId;
- }
-
- /**
- * @return the ID of the snapshot policy
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return valid types are hourly, daily, weekly, monthly, template, and none.
- */
- @Nullable
- public Snapshot.Interval getInterval() {
- return this.interval;
- }
-
- /**
- * @return maximum number of snapshots retained
- */
- public long getNumberToRetain() {
- return this.numberToRetain;
- }
-
- /**
- * @return time the snapshot is scheduled to be taken.
- */
- @Nullable
- public String getSchedule() {
- return this.schedule;
- }
-
- /**
- * @return the time zone of the snapshot policy
- */
- @Nullable
- public String getTimezone() {
- return this.timezone;
- }
-
- /**
- * @return ID of the disk volume
- */
- @Nullable
- public String getVolumeId() {
- return this.volumeId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, interval, numberToRetain, schedule, timezone, volumeId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- SnapshotPolicy that = SnapshotPolicy.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.interval, that.interval)
- && Objects.equal(this.numberToRetain, that.numberToRetain)
- && Objects.equal(this.schedule, that.schedule)
- && Objects.equal(this.timezone, that.timezone)
- && Objects.equal(this.volumeId, that.volumeId);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("interval", interval).add("numberToRetain", numberToRetain).add("schedule", schedule).add("timezone", timezone)
- .add("volumeId", volumeId);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
deleted file mode 100644
index 888eaf6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Describes the schedule of a snapshot policy.
- *
- * @see org.jclouds.cloudstack.util.SnapshotPolicySchedules
- */
-public class SnapshotPolicySchedule {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromSnapshotPolicySchedule(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected Snapshot.Interval interval;
- protected String time;
-
- /**
- * @see SnapshotPolicySchedule#getInterval()
- */
- public T interval(Snapshot.Interval interval) {
- this.interval = interval;
- return self();
- }
-
- /**
- * @see SnapshotPolicySchedule#getTime()
- */
- public T time(String time) {
- this.time = time;
- return self();
- }
-
- public SnapshotPolicySchedule build() {
- return new SnapshotPolicySchedule(interval, time);
- }
-
- public T fromSnapshotPolicySchedule(SnapshotPolicySchedule in) {
- return this
- .interval(in.getInterval())
- .time(in.getTime());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final Snapshot.Interval interval;
- private final String time;
-
- @ConstructorProperties({
- "interval", "time"
- })
- protected SnapshotPolicySchedule(@Nullable Snapshot.Interval interval, @Nullable String time) {
- this.interval = interval;
- this.time = time;
- }
-
- @Nullable
- public Snapshot.Interval getInterval() {
- return this.interval;
- }
-
- @Nullable
- public String getTime() {
- return this.time;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(interval, time);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- SnapshotPolicySchedule that = SnapshotPolicySchedule.class.cast(obj);
- return Objects.equal(this.interval, that.interval)
- && Objects.equal(this.time, that.time);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("interval", interval).add("time", time);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
deleted file mode 100644
index 9eaaac9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class SshKeyPair
- */
-public class SshKeyPair {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromSshKeyPair(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String fingerprint;
- protected String name;
- protected String privateKey;
-
- /**
- * @see SshKeyPair#getFingerprint()
- */
- public T fingerprint(String fingerprint) {
- this.fingerprint = fingerprint;
- return self();
- }
-
- /**
- * @see SshKeyPair#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see SshKeyPair#getPrivateKey()
- */
- public T privateKey(String privateKey) {
- this.privateKey = privateKey;
- return self();
- }
-
- public SshKeyPair build() {
- return new SshKeyPair(fingerprint, name, privateKey);
- }
-
- public T fromSshKeyPair(SshKeyPair in) {
- return this
- .fingerprint(in.getFingerprint())
- .name(in.getName())
- .privateKey(in.getPrivateKey());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String fingerprint;
- private final String name;
- private final String privateKey;
-
- @ConstructorProperties({
- "fingerprint", "name", "privatekey"
- })
- protected SshKeyPair(@Nullable String fingerprint, String name, @Nullable String privateKey) {
- this.fingerprint = fingerprint;
- this.name = checkNotNull(name, "name");
- this.privateKey = privateKey;
- }
-
- @Nullable
- public String getFingerprint() {
- return this.fingerprint;
- }
-
- public String getName() {
- return this.name;
- }
-
- @Nullable
- public String getPrivateKey() {
- return this.privateKey;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(fingerprint, name, privateKey);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- SshKeyPair that = SshKeyPair.class.cast(obj);
- return Objects.equal(this.fingerprint, that.fingerprint)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.privateKey, that.privateKey);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("fingerprint", fingerprint).add("name", name).add("privateKey", privateKey);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
deleted file mode 100644
index c134e70..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Represents a storage pool in CloudStack
- */
-public class StoragePool implements Comparable<StoragePool> {
-
- public enum State {
- UP,
- PREPARE_FOR_MAINTENANCE,
- ERROR_IN_MAINTENANCE,
- CANCEL_MAINTENANCE,
- MAINTENANCE,
- REMOVED,
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static State fromValue(String type) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- public enum Type {
- FILESYSTEM,
- NETWORK_FILESYSTEM,
- ISCSI_LUN,
- ISCSI,
- ISO,
- LVM,
- CLVM,
- SHARED_MOUNT_POINT,
- VMFS,
- PRE_SETUP,
- EXT,
- OCFS2,
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static Type fromValue(String type) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromStoragePool(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String name;
- protected String path;
- protected ImmutableSet.Builder<String> tags = ImmutableSet.<String>builder();
- protected StoragePool.State state;
- protected StoragePool.Type type;
- protected String zoneId;
- protected String zoneName;
- protected String podId;
- protected String podName;
- protected String clusterId;
- protected String clusterName;
- protected Date created;
- protected long diskSizeAllocated;
- protected long diskSizeTotal;
- protected String ipAddress;
- protected String jobId;
- protected String jobStatus;
-
- /**
- * @see StoragePool#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see StoragePool#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see StoragePool#getPath()
- */
- public T path(String path) {
- this.path = path;
- return self();
- }
-
- /**
- * @see DiskOffering#getTags()
- */
- public T tags(Iterable<String> tags) {
- this.tags = ImmutableSet.<String>builder().addAll(tags);
- return self();
- }
-
- /**
- * @see DiskOffering#getTags()
- */
- public T tag(String tag) {
- this.tags.add(tag);
- return self();
- }
-
- /**
- * @see StoragePool#getState()
- */
- public T state(StoragePool.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see StoragePool#getType()
- */
- public T type(StoragePool.Type type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see StoragePool#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see StoragePool#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- /**
- * @see StoragePool#getPodId()
- */
- public T podId(String podId) {
- this.podId = podId;
- return self();
- }
-
- /**
- * @see StoragePool#getPodName()
- */
- public T podName(String podName) {
- this.podName = podName;
- return self();
- }
-
- /**
- * @see StoragePool#getClusterId()
- */
- public T clusterId(String clusterId) {
- this.clusterId = clusterId;
- return self();
- }
-
- /**
- * @see StoragePool#getClusterName()
- */
- public T clusterName(String clusterName) {
- this.clusterName = clusterName;
- return self();
- }
-
- /**
- * @see StoragePool#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see StoragePool#getDiskSizeAllocated()
- */
- public T diskSizeAllocated(long diskSizeAllocated) {
- this.diskSizeAllocated = diskSizeAllocated;
- return self();
- }
-
- /**
- * @see StoragePool#getDiskSizeTotal()
- */
- public T diskSizeTotal(long diskSizeTotal) {
- this.diskSizeTotal = diskSizeTotal;
- return self();
- }
-
- /**
- * @see StoragePool#getIpAddress()
- */
- public T ipAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- return self();
- }
-
- /**
- * @see StoragePool#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see StoragePool#getJobStatus()
- */
- public T jobStatus(String jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- public StoragePool build() {
- return new StoragePool(id, name, path, tags.build(), state, type, zoneId, zoneName, podId, podName, clusterId, clusterName, created, diskSizeAllocated, diskSizeTotal, ipAddress, jobId, jobStatus);
- }
-
- public T fromStoragePool(StoragePool in) {
- return this
- .id(in.getId())
- .name(in.getName())
- .path(in.getPath())
- .tags(in.getTags())
- .state(in.getState())
- .type(in.getType())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName())
- .podId(in.getPodId())
- .podName(in.getPodName())
- .clusterId(in.getClusterId())
- .clusterName(in.getClusterName())
- .created(in.getCreated())
- .diskSizeAllocated(in.getDiskSizeAllocated())
- .diskSizeTotal(in.getDiskSizeTotal())
- .ipAddress(in.getIpAddress())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String name;
- private final String path;
- private final Set<String> tags;
- private final StoragePool.State state;
- private final StoragePool.Type type;
- private final String zoneId;
- private final String zoneName;
- private final String podId;
- private final String podName;
- private final String clusterId;
- private final String clusterName;
- private final Date created;
- private final long diskSizeAllocated;
- private final long diskSizeTotal;
- private final String ipAddress;
- private final String jobId;
- private final String jobStatus;
-
- @ConstructorProperties({
- "id", "name", "path", "tags", "state", "type", "zoneid", "zonename", "podid", "podname", "clusterid", "clustername", "created", "disksizeallocated", "disksizetotal", "ipaddress", "jobid", "jobstatus"
- })
- protected StoragePool(String id, @Nullable String name, @Nullable String path, @Nullable Iterable<String> tags,
- @Nullable StoragePool.State state, @Nullable StoragePool.Type type, @Nullable String zoneId,
- @Nullable String zoneName, @Nullable String podId, @Nullable String podName, @Nullable String clusterId,
- @Nullable String clusterName, @Nullable Date created, long diskSizeAllocated, long diskSizeTotal,
- @Nullable String ipAddress, @Nullable String jobId, @Nullable String jobStatus) {
- this.id = checkNotNull(id, "id");
- this.name = name;
- this.path = path;
- this.tags = tags != null ? ImmutableSet.copyOf(tags) : ImmutableSet.<String> of();
- this.state = state;
- this.type = type;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- this.podId = podId;
- this.podName = podName;
- this.clusterId = clusterId;
- this.clusterName = clusterName;
- this.created = created;
- this.diskSizeAllocated = diskSizeAllocated;
- this.diskSizeTotal = diskSizeTotal;
- this.ipAddress = ipAddress;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public String getName() {
- return this.name;
- }
-
- @Nullable
- public String getPath() {
- return this.path;
- }
-
- public Set<String> getTags() {
- return this.tags;
- }
-
- @Nullable
- public StoragePool.State getState() {
- return this.state;
- }
-
- @Nullable
- public StoragePool.Type getType() {
- return this.type;
- }
-
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Nullable
- public String getPodId() {
- return this.podId;
- }
-
- @Nullable
- public String getPodName() {
- return this.podName;
- }
-
- @Nullable
- public String getClusterId() {
- return this.clusterId;
- }
-
- @Nullable
- public String getClusterName() {
- return this.clusterName;
- }
-
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- public long getDiskSizeAllocated() {
- return this.diskSizeAllocated;
- }
-
- public long getDiskSizeTotal() {
- return this.diskSizeTotal;
- }
-
- @Nullable
- public String getIpAddress() {
- return this.ipAddress;
- }
-
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- @Nullable
- public String getJobStatus() {
- return this.jobStatus;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name, path, tags, state, type, zoneId, zoneName, podId, podName, clusterId, clusterName, created, diskSizeAllocated, diskSizeTotal, ipAddress, jobId, jobStatus);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- StoragePool that = StoragePool.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.path, that.path)
- && Objects.equal(this.tags, that.tags)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName)
- && Objects.equal(this.podId, that.podId)
- && Objects.equal(this.podName, that.podName)
- && Objects.equal(this.clusterId, that.clusterId)
- && Objects.equal(this.clusterName, that.clusterName)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.diskSizeAllocated, that.diskSizeAllocated)
- && Objects.equal(this.diskSizeTotal, that.diskSizeTotal)
- && Objects.equal(this.ipAddress, that.ipAddress)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("name", name).add("path", path).add("tags", tags).add("state", state).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName).add("podId", podId).add("podName", podName).add("clusterId", clusterId).add("clusterName", clusterName).add("created", created).add("diskSizeAllocated", diskSizeAllocated).add("diskSizeTotal", diskSizeTotal).add("ipAddress", ipAddress).add("jobId", jobId).add("jobStatus", jobStatus);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(StoragePool other) {
- return this.id.compareTo(other.id);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StorageType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StorageType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StorageType.java
deleted file mode 100644
index 5eb622b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/StorageType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * @see OfferingApi#listServiceOfferings
- */
-public enum StorageType {
- LOCAL,
-
- SHARED,
-
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name());
- }
-
- public static StorageType fromValue(String type) {
- try {
- return valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java
deleted file mode 100644
index 465e12a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-public enum SystemVmType {
- DOMAIN_ROUTER,
-
- CONSOLE_PROXY,
-
- SECONDARY_STORAGE_VM,
-
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name()).toLowerCase();
- }
-
- public static SystemVmType fromValue(String type) {
- try {
- return valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Template.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Template.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Template.java
deleted file mode 100644
index 8019579..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Template.java
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import com.google.common.base.Strings;
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-public class Template implements Comparable<Template> {
- public enum Status {
-
- /**
- * status of download is not known. Example - When the job for downloading doesn't exist
- * during progress check.
- */
- UNKNOWN,
- /**
- * the download has been cancelled/aborted.
- */
- ABANDONED,
- /**
- * the download has reached an error state. Example - there is not route to ssvm agent
- */
- DOWNLOAD_ERROR,
- /**
- * the download hasn't started.
- */
- NOT_DOWNLOADED,
- /**
- * the download is in progress
- */
- DOWNLOAD_IN_PROGRESS,
- /**
- * the resource has been downloaded on secondary storage.
- */
- DOWNLOADED,
-
- // These states are specifically used for extraction of resources out of CS(ironically shown
- // as download template in the UI, API - extractTemplate ). Some of the generic states (like
- // abandoned, unknown) above are used for the extraction tasks as well.
-
- /**
- * the resource has been uploaded
- */
- UPLOADED,
- /**
- * the resource upload work hasn't started yet
- */
- NOT_UPLOADED,
- /**
- * the resource upload has reached error.
- */
- UPLOAD_ERROR,
- /**
- * the resource upload is in progress.
- */
- UPLOAD_IN_PROGRESS, UNRECOGNIZED;
-
- public static Status fromValue(String state) {
- // Statuses are in free text form. These are the ones in CloudStack 3.0.4 source
- // https://github.com/CloudStack/CloudStack/blob/e2e76c70ec51bfb35d755371f6c33856cef8a277/server/src/com/cloud/api/ApiResponseHelper.java#L1968
- if (Strings.isNullOrEmpty(state)) { return UNKNOWN; }
- else if (state.equals("Processing")) { return DOWNLOAD_IN_PROGRESS; }
- else if (state.endsWith("% Downloaded")) { return DOWNLOAD_IN_PROGRESS; }
- else if (state.equals("Installing Template")) { return DOWNLOAD_IN_PROGRESS; }
- else if (state.equals("Installing ISO")) { return DOWNLOAD_IN_PROGRESS; }
- else if (state.equals("Download Complete")) { return DOWNLOADED; }
- try {
- return valueOf(checkNotNull(state, "state"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- public static enum Type {
-
- USER, BUILTIN, UNRECOGNIZED;
-
- //TODO do we need camel case routines (e.g. see enums in VirtualMachine) ?
- public static Type fromValue(String type) {
- try {
- return valueOf(checkNotNull(type, "type"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- public enum Format {
-
- VHD, QCOW2, OVA, UNRECOGNIZED;
-
- public static Format fromValue(String format) {
- try {
- return valueOf(checkNotNull(format, "format"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromTemplate(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String displayText;
- protected String domain;
- protected String domainId;
- protected String account;
- protected String accountId;
- protected String zone;
- protected String zoneId;
- protected String OSType;
- protected String OSTypeId;
- protected String name;
- protected Template.Type type;
- protected Template.Status status;
- protected Template.Format format;
- protected String hypervisor;
- protected Long size;
- protected Date created;
- protected Date removed;
- protected boolean crossZones;
- protected boolean bootable;
- protected boolean extractable;
- protected boolean featured;
- protected boolean isPublic;
- protected boolean ready;
- protected boolean passwordEnabled;
- protected String jobId;
- protected String jobStatus;
- protected String checksum;
- protected String hostId;
- protected String hostName;
- protected String sourceTemplateId;
- protected String templateTag;
-
- /**
- * @see Template#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Template#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see Template#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see Template#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see Template#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see Template#getAccountId()
- */
- public T accountId(String accountId) {
- this.accountId = accountId;
- return self();
- }
-
- /**
- * @see Template#getZone()
- */
- public T zone(String zone) {
- this.zone = zone;
- return self();
- }
-
- /**
- * @see Template#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see Template#getOSType()
- */
- public T OSType(String OSType) {
- this.OSType = OSType;
- return self();
- }
-
- /**
- * @see Template#getOSTypeId()
- */
- public T OSTypeId(String OSTypeId) {
- this.OSTypeId = OSTypeId;
- return self();
- }
-
- /**
- * @see Template#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Template#getType()
- */
- public T type(Template.Type type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Template#getStatus()
- */
- public T status(Template.Status status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see Template#getFormat()
- */
- public T format(Template.Format format) {
- this.format = format;
- return self();
- }
-
- /**
- * @see Template#getHypervisor()
- */
- public T hypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- return self();
- }
-
- /**
- * @see Template#getSize()
- */
- public T size(Long size) {
- this.size = size;
- return self();
- }
-
- /**
- * @see Template#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see Template#getRemoved()
- */
- public T removed(Date removed) {
- this.removed = removed;
- return self();
- }
-
- /**
- * @see Template#isCrossZones()
- */
- public T crossZones(boolean crossZones) {
- this.crossZones = crossZones;
- return self();
- }
-
- /**
- * @see Template#isBootable()
- */
- public T bootable(boolean bootable) {
- this.bootable = bootable;
- return self();
- }
-
- /**
- * @see Template#isExtractable()
- */
- public T extractable(boolean extractable) {
- this.extractable = extractable;
- return self();
- }
-
- /**
- * @see Template#isFeatured()
- */
- public T featured(boolean featured) {
- this.featured = featured;
- return self();
- }
-
- /**
- * @see Template#ispublic()
- */
- public T isPublic(boolean isPublic) {
- this.isPublic = isPublic;
- return self();
- }
-
- /**
- * @see Template#isReady()
- */
- public T ready(boolean ready) {
- this.ready = ready;
- return self();
- }
-
- /**
- * @see Template#isPasswordEnabled()
- */
- public T passwordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- return self();
- }
-
- /**
- * @see Template#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see Template#getJobStatus()
- */
- public T jobStatus(String jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- /**
- * @see Template#getChecksum()
- */
- public T checksum(String checksum) {
- this.checksum = checksum;
- return self();
- }
-
- /**
- * @see Template#getHostId()
- */
- public T hostId(String hostId) {
- this.hostId = hostId;
- return self();
- }
-
- /**
- * @see Template#getHostName()
- */
- public T hostName(String hostName) {
- this.hostName = hostName;
- return self();
- }
-
- /**
- * @see Template#getSourceTemplateId()
- */
- public T sourceTemplateId(String sourceTemplateId) {
- this.sourceTemplateId = sourceTemplateId;
- return self();
- }
-
- /**
- * @see Template#getTemplateTag()
- */
- public T templateTag(String templateTag) {
- this.templateTag = templateTag;
- return self();
- }
-
- public Template build() {
- return new Template(id, displayText, domain, domainId, account, accountId, zone, zoneId, OSType, OSTypeId, name, type, status, format, hypervisor, size, created, removed, crossZones, bootable, extractable, featured, isPublic, ready, passwordEnabled, jobId, jobStatus, checksum, hostId, hostName, sourceTemplateId, templateTag);
- }
-
- public T fromTemplate(Template in) {
- return this
- .id(in.getId())
- .displayText(in.getDisplayText())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .account(in.getAccount())
- .accountId(in.getAccountId())
- .zone(in.getZone())
- .zoneId(in.getZoneId())
- .OSType(in.getOSType())
- .OSTypeId(in.getOSTypeId())
- .name(in.getName())
- .type(in.getType())
- .status(in.getStatus())
- .format(in.getFormat())
- .hypervisor(in.getHypervisor())
- .size(in.getSize())
- .created(in.getCreated())
- .removed(in.getRemoved())
- .crossZones(in.isCrossZones())
- .bootable(in.isBootable())
- .extractable(in.isExtractable())
- .featured(in.isFeatured())
- .isPublic(in.ispublic())
- .ready(in.isReady())
- .passwordEnabled(in.isPasswordEnabled())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus())
- .checksum(in.getChecksum())
- .hostId(in.getHostId())
- .hostName(in.getHostName())
- .sourceTemplateId(in.getSourceTemplateId())
- .templateTag(in.getTemplateTag());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String displayText;
- private final String domain;
- private final String domainId;
- private final String account;
- private final String accountId;
- private final String zone;
- private final String zoneId;
- private final String OSType;
- private final String OSTypeId;
- private final String name;
- private final Template.Type type;
- private final Template.Status status;
- private final Template.Format format;
- private final String hypervisor;
- private final Long size;
- private final Date created;
- private final Date removed;
- private final boolean crossZones;
- private final boolean bootable;
- private final boolean extractable;
- private final boolean featured;
- private final boolean ispublic;
- private final boolean ready;
- private final boolean passwordEnabled;
- private final String jobId;
- private final String jobStatus;
- private final String checksum;
- private final String hostId;
- private final String hostName;
- private final String sourceTemplateId;
- private final String templateTag;
-
- @ConstructorProperties({
- "id", "displaytext", "domain", "domainid", "account", "accountid", "zonename", "zoneid", "ostypename", "ostypeid",
- "name", "templatetype", "status", "format", "hypervisor", "size", "created", "removed", "crossZones", "bootable",
- "isextractable", "isfeatured", "ispublic", "isready", "passwordenabled", "jobid", "jobstatus", "checksum", "hostId",
- "hostname", "sourcetemplateid", "templatetag"
- })
- protected Template(String id, @Nullable String displayText, @Nullable String domain, @Nullable String domainId,
- @Nullable String account, @Nullable String accountId, @Nullable String zone, @Nullable String zoneId,
- @Nullable String OSType, @Nullable String OSTypeId, @Nullable String name, @Nullable Template.Type type,
- @Nullable Template.Status status, @Nullable Template.Format format, @Nullable String hypervisor,
- @Nullable Long size, @Nullable Date created, @Nullable Date removed, boolean crossZones,
- boolean bootable, boolean extractable, boolean featured, boolean ispublic, boolean ready, boolean passwordEnabled,
- @Nullable String jobId, @Nullable String jobStatus, @Nullable String checksum, @Nullable String hostId,
- @Nullable String hostName, @Nullable String sourceTemplateId, @Nullable String templateTag) {
- this.id = checkNotNull(id, "id");
- this.displayText = displayText;
- this.domain = domain;
- this.domainId = domainId;
- this.account = account;
- this.accountId = accountId;
- this.zone = zone;
- this.zoneId = zoneId;
- this.OSType = OSType;
- this.OSTypeId = OSTypeId;
- this.name = name;
- this.type = type;
- this.status = status;
- this.format = format;
- this.hypervisor = hypervisor;
- this.size = size;
- this.created = created;
- this.removed = removed;
- this.crossZones = crossZones;
- this.bootable = bootable;
- this.extractable = extractable;
- this.featured = featured;
- this.ispublic = ispublic;
- this.ready = ready;
- this.passwordEnabled = passwordEnabled;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- this.checksum = checksum;
- this.hostId = hostId;
- this.hostName = hostName;
- this.sourceTemplateId = sourceTemplateId;
- this.templateTag = templateTag;
- }
-
- /**
- * @return Template id
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the display text of the template
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- /**
- * @return the name of the domain to which the template beLongs
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the ID of the domain to which the template beLongs
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the name of the account to which the template beLongs
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the ID of the account to which the template beLongs
- */
- @Nullable
- public String getAccountId() {
- return this.accountId;
- }
-
- /**
- * @return the name of the zone to which the template beLongs
- */
- @Nullable
- public String getZone() {
- return this.zone;
- }
-
- /**
- * @return the ID of the zone to which the template beLongs
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return the name of the OS type to which the template beLongs
- */
- @Nullable
- public String getOSType() {
- return this.OSType;
- }
-
- /**
- * @return the ID of the OS type to which the template beLongs
- */
- @Nullable
- public String getOSTypeId() {
- return this.OSTypeId;
- }
-
- /**
- * @return Template name
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the type of the template
- */
- @Nullable
- public Template.Type getType() {
- return this.type;
- }
-
- /**
- * Retrieve the status of the template.
- *
- * <p>Note that in CloudStack 2.2.x through to at least 3.0.4, the possible status values are
- * not well defined by CloudStack. CloudStack returns a plain-text English string for UI
- * display, which jclouds attempts to parse into an enumeration, but the mapping is incomplete.
- * This method should be reliable for the common cases, but it is possible (particularly for
- * error statuses) that this method will return UNRECOGNIZED.</p>
- *
- * @return status of the template
- */
- @Nullable
- public Template.Status getStatus() {
- return this.status;
- }
-
- /**
- * @return the format of the template.
- */
- @Nullable
- public Template.Format getFormat() {
- return this.format;
- }
-
- /**
- * @return the hypervisor on which the template runs
- */
- @Nullable
- public String getHypervisor() {
- return this.hypervisor;
- }
-
- /**
- * @return the size of the template in kilobytes
- */
- @Nullable
- public Long getSize() {
- return this.size;
- }
-
- /**
- * @return the date this template was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the date this template was removed
- */
- @Nullable
- public Date getRemoved() {
- return this.removed;
- }
-
- /**
- * @return true if the template is managed across all Zones, false otherwise
- */
- public boolean isCrossZones() {
- return this.crossZones;
- }
-
- /**
- * @return true if the ISO is bootable, false otherwise
- */
- public boolean isBootable() {
- return this.bootable;
- }
-
- /**
- * @return true if the template is extractable, false otherwise
- */
- public boolean isExtractable() {
- return this.extractable;
- }
-
- /**
- * @return true if this template is a featured template, false otherwise
- */
- public boolean isFeatured() {
- return this.featured;
- }
-
- public boolean ispublic() {
- return this.ispublic;
- }
-
- /**
- * @return true if the template is ready to be deployed from, false otherwise
- */
- public boolean isReady() {
- return this.ready;
- }
-
- /**
- * @return true if the reset password feature is enabled, false otherwise
- */
- public boolean isPasswordEnabled() {
- return this.passwordEnabled;
- }
-
- /**
- * @return shows the current pending asynchronous job ID, or null if current
- * pending jobs are acting on the template
- */
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- /**
- * @return shows the current pending asynchronous job status
- */
- @Nullable
- public String getJobStatus() {
- return this.jobStatus;
- }
-
- /**
- * @return checksum of the template
- */
- @Nullable
- public String getChecksum() {
- return this.checksum;
- }
-
- /**
- * @return the ID of the secondary storage host for the template
- */
- @Nullable
- public String getHostId() {
- return this.hostId;
- }
-
- /**
- * @return the name of the secondary storage host for the template
- */
- @Nullable
- public String getHostName() {
- return this.hostName;
- }
-
- /**
- * @return the template ID of the parent template if present
- */
- @Nullable
- public String getSourceTemplateId() {
- return this.sourceTemplateId;
- }
-
- /**
- * @return the tag of this template
- */
- @Nullable
- public String getTemplateTag() {
- return this.templateTag;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, displayText, domain, domainId, account, accountId, zone, zoneId, OSType, OSTypeId, name, type, status, format, hypervisor, size, created, removed, crossZones, bootable, extractable, featured, ispublic, ready, passwordEnabled, jobId, jobStatus, checksum, hostId, hostName, sourceTemplateId, templateTag);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Template that = Template.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.accountId, that.accountId)
- && Objects.equal(this.zone, that.zone)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.OSType, that.OSType)
- && Objects.equal(this.OSTypeId, that.OSTypeId)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.status, that.status)
- && Objects.equal(this.format, that.format)
- && Objects.equal(this.hypervisor, that.hypervisor)
- && Objects.equal(this.size, that.size)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.removed, that.removed)
- && Objects.equal(this.crossZones, that.crossZones)
- && Objects.equal(this.bootable, that.bootable)
- && Objects.equal(this.extractable, that.extractable)
- && Objects.equal(this.featured, that.featured)
- && Objects.equal(this.ispublic, that.ispublic)
- && Objects.equal(this.ready, that.ready)
- && Objects.equal(this.passwordEnabled, that.passwordEnabled)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus)
- && Objects.equal(this.checksum, that.checksum)
- && Objects.equal(this.hostId, that.hostId)
- && Objects.equal(this.hostName, that.hostName)
- && Objects.equal(this.sourceTemplateId, that.sourceTemplateId)
- && Objects.equal(this.templateTag, that.templateTag);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("displayText", displayText).add("domain", domain).add("domainId", domainId).add("account", account).add("accountId", accountId).add("zone", zone).add("zoneId", zoneId).add("OSType", OSType).add("OSTypeId", OSTypeId).add("name", name).add("type", type).add("status", status).add("format", format).add("hypervisor", hypervisor).add("size", size).add("created", created).add("removed", removed).add("crossZones", crossZones).add("bootable", bootable).add("extractable", extractable).add("featured", featured).add("ispublic", ispublic).add("ready", ready).add("passwordEnabled", passwordEnabled).add("jobId", jobId).add("jobStatus", jobStatus).add("checksum", checksum).add("hostId", hostId).add("hostName", hostName).add("sourceTemplateId", sourceTemplateId).add("templateTag", templateTag);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-
- @Override
- public int compareTo(Template o) {
- return id.compareTo(o.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
deleted file mode 100644
index 4a603fa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-public class TemplateExtraction implements Comparable<TemplateExtraction> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromTemplateExtraction(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String accountId;
- protected Date created;
- protected String extractId;
- protected ExtractMode extractMode;
- protected String name;
- protected String state;
- protected String status;
- protected String storageType;
- protected int uploadPercentage;
- protected String url;
- protected String zoneId;
- protected String zoneName;
-
- /**
- * @see TemplateExtraction#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getAccountId()
- */
- public T accountId(String accountId) {
- this.accountId = accountId;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getExtractId()
- */
- public T extractId(String extractId) {
- this.extractId = extractId;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getExtractMode()
- */
- public T extractMode(ExtractMode extractMode) {
- this.extractMode = extractMode;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getState()
- */
- public T state(String state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getStatus()
- */
- public T status(String status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getStorageType()
- */
- public T storageType(String storageType) {
- this.storageType = storageType;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getUploadPercentage()
- */
- public T uploadPercentage(int uploadPercentage) {
- this.uploadPercentage = uploadPercentage;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getUrl()
- */
- public T url(String url) {
- this.url = url;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see TemplateExtraction#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- public TemplateExtraction build() {
- return new TemplateExtraction(id, accountId, created, extractId, extractMode, name, state, status, storageType, uploadPercentage, url, zoneId, zoneName);
- }
-
- public T fromTemplateExtraction(TemplateExtraction in) {
- return this
- .id(in.getId())
- .accountId(in.getAccountId())
- .created(in.getCreated())
- .extractId(in.getExtractId())
- .extractMode(in.getExtractMode())
- .name(in.getName())
- .state(in.getState())
- .status(in.getStatus())
- .storageType(in.getStorageType())
- .uploadPercentage(in.getUploadPercentage())
- .url(in.getUrl())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String accountId;
- private final Date created;
- private final String extractId;
- private final ExtractMode extractMode;
- private final String name;
- private final String state;
- private final String status;
- private final String storageType;
- private final int uploadPercentage;
- private final String url;
- private final String zoneId;
- private final String zoneName;
-
- @ConstructorProperties({
- "id", "accountid", "created", "extractId", "extractMode", "name", "state", "status", "storagetype", "uploadpercentage", "url", "zoneid", "zonename"
- })
- protected TemplateExtraction(String id, @Nullable String accountId, @Nullable Date created, @Nullable String extractId,
- @Nullable ExtractMode extractMode, @Nullable String name, @Nullable String state, @Nullable String status,
- @Nullable String storageType, int uploadPercentage, @Nullable String url, @Nullable String zoneId,
- @Nullable String zoneName) {
- this.id = checkNotNull(id, "id");
- this.accountId = accountId;
- this.created = created;
- this.extractId = extractId;
- this.extractMode = extractMode;
- this.name = name;
- this.state = state;
- this.status = status;
- this.storageType = storageType;
- this.uploadPercentage = uploadPercentage;
- this.url = url;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- }
-
- /**
- * @return the id of extracted object
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account id to which the extracted object belongs
- */
- @Nullable
- public String getAccountId() {
- return this.accountId;
- }
-
- /**
- * @return the time and date the object was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the upload id of extracted object
- */
- @Nullable
- public String getExtractId() {
- return this.extractId;
- }
-
- /**
- * @return the mode of extraction - upload or download
- */
- @Nullable
- public ExtractMode getExtractMode() {
- return this.extractMode;
- }
-
- /**
- * @return the name of the extracted object
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the state of the extracted object
- */
- @Nullable
- public String getState() {
- return this.state;
- }
-
- /**
- * @return the status of the extraction
- */
- @Nullable
- public String getStatus() {
- return this.status;
- }
-
- /**
- * @return type of the storage
- */
- @Nullable
- public String getStorageType() {
- return this.storageType;
- }
-
- /**
- * @return the percentage of the entity uploaded to the specified location
- */
- public int getUploadPercentage() {
- return this.uploadPercentage;
- }
-
- /**
- * @return if mode = upload then url of the uploaded entity. if mode = download the url from which the entity can be downloaded
- */
- @Nullable
- public String getUrl() {
- return this.url;
- }
-
- /**
- * @return zone ID the object was extracted from
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return zone name the object was extracted from
- */
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, accountId, created, extractId, extractMode, name, state, status, storageType, uploadPercentage, url, zoneId, zoneName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- TemplateExtraction that = TemplateExtraction.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.accountId, that.accountId)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.extractId, that.extractId)
- && Objects.equal(this.extractMode, that.extractMode)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.status, that.status)
- && Objects.equal(this.storageType, that.storageType)
- && Objects.equal(this.uploadPercentage, that.uploadPercentage)
- && Objects.equal(this.url, that.url)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode).add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage).add("url", url).add("zoneId", zoneId).add("zoneName", zoneName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(TemplateExtraction other) {
- return id.compareTo(other.id);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java
deleted file mode 100644
index 72a95fc..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * @see TemplateApi#listTemplates
- */
-public enum TemplateFilter {
- /**
- * templates that are featured and are public
- */
- FEATURED,
- /**
- * templates that have been registered/created by the owner
- */
- SELF,
- /**
- * templates that have been registered/created by the owner that can be used
- * to deploy a new VM
- */
- SELF_EXECUTABLE,
- /**
- * templates that have been registered/created by the owner that can be used
- * to deploy a new VM - 3.x filter value.
- */
- SELFEXECUTABLE,
- /**
- * templates that have been granted to the calling user by another user
- */
- SHAREDEXECUTABLE,
- /**
- * all templates that can be used to deploy a new VM
- */
- EXECUTABLE,
- /**
- * templates that are public
- */
- COMMUNITY,
- /**
- * All templates
- */
- ALL;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, name());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
deleted file mode 100644
index 17b845c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class TemplateMetadata
- */
-public class TemplateMetadata {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromTemplateMetadata(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String name;
- protected String osTypeId;
- protected String displayText;
- protected String snapshotId;
- protected String volumeId;
- protected String virtualMachineId;
- protected Boolean passwordEnabled;
-
- /**
- * @see TemplateMetadata#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see TemplateMetadata#getOsTypeId()
- */
- public T osTypeId(String osTypeId) {
- this.osTypeId = osTypeId;
- return self();
- }
-
- /**
- * @see TemplateMetadata#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see TemplateMetadata#getSnapshotId()
- */
- public T snapshotId(String snapshotId) {
- this.snapshotId = snapshotId;
- return self();
- }
-
- /**
- * @see TemplateMetadata#getVolumeId()
- */
- public T volumeId(String volumeId) {
- this.volumeId = volumeId;
- return self();
- }
-
- /**
- * @see TemplateMetadata#getVirtualMachineId()
- */
- public T virtualMachineId(String virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- return self();
- }
-
- /**
- * @see TemplateMetadata#isPasswordEnabled()
- */
- public T passwordEnabled(Boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- return self();
- }
-
- public TemplateMetadata build() {
- return new TemplateMetadata(name, osTypeId, displayText, snapshotId, volumeId, virtualMachineId, passwordEnabled);
- }
-
- public T fromTemplateMetadata(TemplateMetadata in) {
- return this
- .name(in.getName())
- .osTypeId(in.getOsTypeId())
- .displayText(in.getDisplayText())
- .snapshotId(in.getSnapshotId())
- .volumeId(in.getVolumeId())
- .virtualMachineId(in.getVirtualMachineId())
- .passwordEnabled(in.isPasswordEnabled());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String name;
- private final String osTypeId;
- private final String displayText;
- private final String snapshotId;
- private final String volumeId;
- private final String virtualMachineId;
- private final Boolean passwordEnabled;
-
- @ConstructorProperties({
- "name", "osTypeId", "displayText", "snapshotId", "volumeId", "virtualMachineId", "passwordEnabled"
- })
- protected TemplateMetadata(String name, @Nullable String osTypeId, @Nullable String displayText, @Nullable String snapshotId,
- @Nullable String volumeId, String virtualMachineId, Boolean passwordEnabled) {
- this.name = checkNotNull(name, "name");
- this.osTypeId = osTypeId;
- this.displayText = displayText;
- this.snapshotId = snapshotId;
- this.volumeId = volumeId;
- this.virtualMachineId = virtualMachineId;
- this.passwordEnabled = passwordEnabled;
- }
-
- /**
- * @return the name of the template
- */
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the ID of the OS Type that best represents the OS of this template.
- */
- @Nullable
- public String getOsTypeId() {
- return this.osTypeId;
- }
-
- /**
- * @return the display text of the template. This is usually used for display purposes.
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- /**
- * @return the ID of the snapshot the template is being created from
- */
- @Nullable
- public String getSnapshotId() {
- return this.snapshotId;
- }
-
- /**
- * @return the ID of the disk volume the template is being created from
- */
- @Nullable
- public String getVolumeId() {
- return this.volumeId;
- }
-
- /**
- * @return Optional, VM ID
- */
- @Nullable
- public String getVirtualMachineId() {
- return this.virtualMachineId;
- }
-
- @Nullable
- public Boolean isPasswordEnabled() {
- return this.passwordEnabled;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name, osTypeId, displayText, snapshotId, volumeId, virtualMachineId, passwordEnabled);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- TemplateMetadata that = TemplateMetadata.class.cast(obj);
- return Objects.equal(this.name, that.name)
- && Objects.equal(this.osTypeId, that.osTypeId)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.snapshotId, that.snapshotId)
- && Objects.equal(this.volumeId, that.volumeId)
- && Objects.equal(this.virtualMachineId, that.virtualMachineId)
- && Objects.equal(this.passwordEnabled, that.passwordEnabled);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("name", name).add("osTypeId", osTypeId).add("displayText", displayText).add("snapshotId", snapshotId)
- .add("volumeId", volumeId).add("virtualMachineId", virtualMachineId).add("passwordEnabled", passwordEnabled);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
[10/51] [abbrv] stratos git commit: adding sample
Posted by im...@apache.org.
adding sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/febc8966
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/febc8966
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/febc8966
Branch: refs/heads/master
Commit: febc8966d670ec4988ccbb850653aacd1669384d
Parents: 2aca061
Author: asankasa <as...@wso2.com>
Authored: Tue Oct 28 13:01:13 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:30 2014 +0530
----------------------------------------------------------------------
.../src/main/resources/conf/cloud-controller.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/febc8966/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index 07202f6..18d67d5 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -49,6 +49,24 @@
is not necessary [0..1]. But you can use this section to avoid specifying
same property over and over again. -->
<iaasProviders>
+
+ <!--<iaasProvider type="cloudstack" name="cloudstack specific details">
+ <className>org.apache.stratos.cloud.controller.iaases.CloudstackIaas</className>
+ <provider>cloudstack</provider>
+ <identity svns:secretAlias="cloud.controller.cloudstack.identity">api-key</identity>
+ <credential svns:secretAlias="cloud.controller.cloudstack.credential">secret-key</credential>
+ <property name="jclouds.endpoint" value="ip:port" />
+ <property name="availabilityZone" value="zone_Id"/>
+ <property name="instanceType" value="instance_type_Id"/>
+ <property name="securityGroupIds" value="security_group_Id1,security_group_id2"/>
+ <property name="networkIds" value="network_Id1,network_Id2"/>
+ <property name="diskOffering" value="disk_offering_Id"/>
+ <property name="userName" value="username"/>
+ <property name="domainId" value="domainId"/>
+ <property name="keyPair" value="asanka-key"/>
+ <property name="tags" value="tag1,tag2,tag3" />
+ <property name="autoAssignIp" value="false" />
+ </iaasProvider>-->
<!--iaasProvider type="ec2" name="ec2 specific details">
<className>org.apache.stratos.cloud.controller.iaases.AWSEC2Iaas</className>
<provider>aws-ec2</provider>
[09/51] [abbrv] stratos git commit: reformated code again
Posted by im...@apache.org.
reformated code again
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2aca0617
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2aca0617
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2aca0617
Branch: refs/heads/master
Commit: 2aca06170aa7cf01b3e7fe5f27a97463e847aab9
Parents: 38630df
Author: asankasa <as...@wso2.com>
Authored: Tue Oct 28 11:37:11 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:29 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/CloudstackIaas.java | 41 ++++++++++----------
.../util/CloudControllerConstants.java | 1 -
2 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2aca0617/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index 3048f4d..4919b48 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -95,7 +95,7 @@ public class CloudstackIaas extends Iaas {
/**
* PROPERTY-3
* if user has specified an instance type in cloud-controller.xml, set the instance type into templateBuilder
- * object.
+ * object.(service offering)
*Important:Specify the Service Offering type ID. Not the name. Because the name is not unique in cloudstack.
*/
if (iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE) != null) {
@@ -105,11 +105,11 @@ public class CloudstackIaas extends Iaas {
//build the template
Template template = templateBuilder.build();
-
- // if you wish to auto assign IPs, instance spawning call should be
- // blocking, but if you
- // wish to assign IPs manually, it can be non-blocking.
- // is auto-assign-ip mode or manual-assign-ip mode?
+ /**if you wish to auto assign IPs, instance spawning call should be
+ * blocking, but if you
+ * wish to assign IPs manually, it can be non-blocking.
+ * is auto-assign-ip mode or manual-assign-ip mode?
+ */
boolean blockUntilRunning = Boolean.parseBoolean(iaasInfo
.getProperty(CloudControllerConstants.AUTO_ASSIGN_IP));
template.getOptions().as(TemplateOptions.class)
@@ -123,7 +123,7 @@ public class CloudstackIaas extends Iaas {
//**SET CLOUDSTACK SPECIFIC PROPERTIES TO TEMPLATE OBJECT**//
- //set security group- If you are using basic zone
+ //set security group - If you are using basic zone
if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS) != null) {
template.getOptions()
.as(CloudStackTemplateOptions.class)
@@ -189,7 +189,6 @@ public class CloudstackIaas extends Iaas {
if (iaasInfo.getTemplate() != null && iaasInfo.getPayload() != null) {
iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class)
.userMetadata(convertByteArrayToHashMap(iaasInfo.getPayload()));
-
}
}
@@ -215,7 +214,8 @@ public class CloudstackIaas extends Iaas {
ListPublicIPAddressesOptions listPublicIPAddressesOptions = new ListPublicIPAddressesOptions();
listPublicIPAddressesOptions.zoneId(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE));
- Set<PublicIPAddress> publicIPAddresses = cloudStackApi.getAddressApi().listPublicIPAddresses(listPublicIPAddressesOptions);
+ Set<PublicIPAddress> publicIPAddresses = cloudStackApi.getAddressApi()
+ .listPublicIPAddresses(listPublicIPAddressesOptions);
String id = node.getProviderId(); //vm ID
@@ -247,13 +247,10 @@ public class CloudstackIaas extends Iaas {
@Override
public void releaseAddress(String ip) {
-
IaasProvider iaasInfo = getIaasProvider();
ComputeServiceContext context = iaasInfo.getComputeService().getContext();
CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
cloudStackApi.getAddressApi().disassociateIPAddress(ip);
-
-
}
@Override
@@ -331,7 +328,8 @@ public class CloudstackIaas extends Iaas {
.getContext();
String zone = ComputeServiceBuilderUtil.extractZone(iaasInfo);
- String diskOfferingID = iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class).getDiskOfferingId();
+ String diskOfferingID = iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class)
+ .getDiskOfferingId();
if (zone == null && diskOfferingID == null) {
log.fatal("Cannot create a new volume in the , [zone] : " + zone + " of Iaas : " + iaasInfo);
return null;
@@ -351,7 +349,7 @@ public class CloudstackIaas extends Iaas {
// volume = blockStoreApi.createVolumeInAvailabilityZone(zone, sizeGB);
} else {
if (log.isDebugEnabled()) {
- log.info("Creating a volume in the zone " + zone + " from the shanpshot " + snapshotId);
+ log.info("Creating a volume in the zone " + zone + " from the snapshot " + snapshotId);
}
volumeApi.createVolumeFromSnapshotInZone(null, diskOfferingID, zone);
}
@@ -380,13 +378,16 @@ public class CloudstackIaas extends Iaas {
//volume state ALLOCATED means that volume has not been attached to any instance.
//TODO there is an error with logic.
- if (!(volumeState == Volume.State.ALLOCATED || volumeState == Volume.State.CREATING || volumeState == Volume.State.READY)) {
+ if (!(volumeState == Volume.State.ALLOCATED || volumeState == Volume.State.CREATING
+ || volumeState == Volume.State.READY)) {
log.error(String.format("Volume %s can not be attached. Volume status is %s", volumeId, volumeState));
}
//check whether the account of volume and instance is same
- if (!volume.getAccount().equals(cloudStackApi.getVirtualMachineApi().getVirtualMachine(instanceId).getAccount())) {
- log.error(String.format("Volume %s can not be attached. Instance account and Volume account are not the same ", volumeId));
+ if (!volume.getAccount().equals(cloudStackApi.getVirtualMachineApi()
+ .getVirtualMachine(instanceId).getAccount())) {
+ log.error(String.format("Volume %s can not be attached. Instance account and Volume account " +
+ "are not the same ", volumeId));
}
boolean volumeBecameAvailable = false, volumeBecameAttached = false;
@@ -429,8 +430,8 @@ public class CloudstackIaas extends Iaas {
log.error(String.format("[Volume ID] %s attachment is called, but not yet became attached", volumeId));
}
- log.info(String.format("Volume [id]: %s attachment for instance [id]: %s was successful [status]: Attaching. of Iaas : %s", volumeId, instanceId, iaasInfo));
-
+ log.info(String.format("Volume [id]: %s attachment for instance [id]: %s was successful [status]: Attaching." +
+ " of Iaas : %s", volumeId, instanceId, iaasInfo));
return "Attaching";
@@ -456,7 +457,7 @@ public class CloudstackIaas extends Iaas {
try {
//TODO this is true only for newly created volumes
if (waitForStatus(volumeId, Volume.State.ALLOCATED, 5)) {
- log.info(String.format("Detachment of Volume [id]: %s from instance [id]: %s was successful. [region] : %s of Iaas : %s", volumeId, instanceId, iaasInfo));
+ log.info(String.format("Detachment of Volume [id]: %s from instance [id]: %s was successful of Iaas : %s", volumeId, instanceId, iaasInfo));
}
} catch (TimeoutException e) {
log.error(String.format("Detachment of Volume [id]: %s from instance [id]: %s was unsuccessful. [volume Status] : %s", volumeId, instanceId, iaasInfo));
http://git-wip-us.apache.org/repos/asf/stratos/blob/2aca0617/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 88e3e86..5509b46 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -98,7 +98,6 @@ public final class CloudControllerConstants {
.replaceAll("[/.]", "_");
//cloudstack specific
-
public static final String USER_NAME = "userName";
public static final String DOMAIN_ID = "domainId";
public static final String DISK_OFFERING = "diskOffering";
[19/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java
deleted file mode 100644
index 04de926..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.handlers;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.reportMatcher;
-import static org.easymock.EasyMock.verify;
-
-import java.net.URI;
-
-import org.easymock.IArgumentMatcher;
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.InsufficientResourcesException;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-
-@Test(groups = {"unit"})
-public class CloudStackErrorHandlerTest {
-
- @Test
- public void test400MakesIllegalArgumentException() {
- assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 400, "", "Bad Request",
- IllegalArgumentException.class);
- }
-
- @Test
- public void test401MakesAuthorizationException() {
- assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 401, "", "Unauthorized",
- AuthorizationException.class);
- }
-
- @Test
- public void test404MakesResourceNotFoundException() {
- assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 404, "", "Not Found",
- ResourceNotFoundException.class);
- }
-
- @Test
- public void test405MakesIllegalArgumentException() {
- assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 405, "", "Method Not Allowed",
- IllegalArgumentException.class);
- }
-
- @Test
- public void test431MakesIllegalStateException() {
- assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 431, "", "Method Not Allowed",
- IllegalStateException.class);
- }
-
- @Test
- public void test431MakesResourceNotFoundExceptionOnDelete() {
- assertCodeMakes(
- "GET",
- URI.create("https://api.ninefold.com/compute/v1.0/?response=json&command=deleteSSHKeyPair"),
- 431,
- "",
- "{ \"deletekeypairresponse\" : {\"errorcode\" : 431, \"errortext\" : \"A key pair with name 'adriancole-adapter-test-keypair' does not exist for account jclouds in domain id=457\"} }",
- ResourceNotFoundException.class);
- }
-
- @Test
- public void test409MakesIllegalStateException() {
- assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 409, "", "Conflict", IllegalStateException.class);
- }
-
- @Test
- public void test531MakesAuthorizationException() {
- assertCodeMakes("GET", URI.create("https://cloudstack.com/foo"), 531, "", "Unauthorized",
- AuthorizationException.class);
- }
-
- @Test
- void test534WithMaximumResourcesMakesInsufficientResourcesException() {
- assertCodeMakes(
- "GET",
- URI.create("http://10.26.26.155:8080/client/api?response=json&command=deployVirtualMachine&zoneid=7dbc4787-ec2f-498d-95f0-848c8c81e5da&templateid=240937c8-d695-419c-9908-5c7b2a07e6f1&serviceofferingid=c376102e-b683-4d43-b583-4eeab4627e65&displayname=bousa-4&name=bousa-4"),
- 534,
- "",
- "{ \"createipforwardingruleresponse\" : {\"errorcode\" : 534, \"errortext\" : \"Maximum number of resources of type 'volume' for account name=jarcec in domain id=1 has been exceeded.\"} }",
- InsufficientResourcesException.class);
- }
-
- @Test
- void test537MakesIllegalStateException() {
- assertCodeMakes(
- "GET",
- URI.create("http://10.26.26.155:8080/client/api?response=json&command=createIpForwardingRule&ipaddressid=37&startport=22&protocol=tcp"),
- 537,
- "",
- "{ \"createipforwardingruleresponse\" : {\"errorcode\" : 537, \"errortext\" : \"There is already firewall rule specified for the ip address id=37\"} }",
- IllegalStateException.class);
- }
-
- private void assertCodeMakes(String method, URI uri, int statusCode, String message, String content,
- Class<? extends Exception> expected) {
- assertCodeMakes(method, uri, statusCode, message, "text/xml", content, expected);
- }
-
- private void assertCodeMakes(String method, URI uri, int statusCode, String message, String contentType,
- String content, Class<? extends Exception> expected) {
-
- CloudStackErrorHandler function = Guice.createInjector().getInstance(CloudStackErrorHandler.class);
-
- HttpCommand command = createMock(HttpCommand.class);
- HttpRequest request = HttpRequest.builder().method(method).endpoint(uri).build();
- HttpResponse response = HttpResponse.builder().statusCode(statusCode).message(message).payload(content).build();
- response.getPayload().getContentMetadata().setContentType(contentType);
-
- expect(command.getCurrentRequest()).andReturn(request).atLeastOnce();
- command.setException(classEq(expected));
-
- replay(command);
-
- function.handleError(command, response);
-
- verify(command);
- }
-
- public static Exception classEq(final Class<? extends Exception> in) {
- reportMatcher(new IArgumentMatcher() {
-
- @Override
- public void appendTo(StringBuffer buffer) {
- buffer.append("classEq(");
- buffer.append(in);
- buffer.append(")");
- }
-
- @Override
- public boolean matches(Object arg) {
- return arg.getClass() == in;
- }
-
- });
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java
deleted file mode 100644
index 6c82b07..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.handlers;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.easymock.IAnswer;
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.features.SessionApi;
-import org.jclouds.domain.Credentials;
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.io.Payloads;
-import org.testng.annotations.Test;
-
-import com.google.common.cache.LoadingCache;
-
-/**
- * Tests behavior of {@code InvalidateSessionAndRetryOn401AndLogoutOnClose} handler
- */
-@Test(groups = "unit", testName = "InvalidateSessionAndRetryOn401AndLogoutOnCloseTest")
-public class InvalidateSessionAndRetryOn401AndLogoutOnCloseTest {
-
- @SuppressWarnings("unchecked")
- @Test
- public void test401ShouldRetryAndFailAfterFiveAttempts() {
- HttpCommand command = createMock(HttpCommand.class);
- SessionApi sessionClient = createMock(SessionApi.class);
- LoadingCache<Credentials, LoginResponse> cache = createMock(LoadingCache.class);
-
- cache.invalidateAll();
- expectLastCall().anyTimes();
-
- final AtomicInteger counter = new AtomicInteger();
- expect(command.incrementFailureCount()).andAnswer(new IAnswer<Integer>() {
- @Override
- public Integer answer() throws Throwable {
- return counter.incrementAndGet();
- }
- }).anyTimes();
- expect(command.isReplayable()).andReturn(true).anyTimes();
- expect(command.getFailureCount()).andAnswer(new IAnswer<Integer>() {
- @Override
- public Integer answer() throws Throwable {
- return counter.get();
- }
- }).anyTimes();
-
- replay(cache, command);
-
- HttpResponse response = HttpResponse.builder().payload(
- Payloads.newStringPayload("Not relevant")).statusCode(401).build();
-
- InvalidateSessionAndRetryOn401AndLogoutOnClose retry =
- new InvalidateSessionAndRetryOn401AndLogoutOnClose(cache, sessionClient);
-
- for (int i = 0; i < 5; i++) {
- assertTrue(retry.shouldRetryRequest(command, response));
- }
- assertFalse(retry.shouldRetryRequest(command, response));
-
- verify(cache, command);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiLiveTest.java
deleted file mode 100644
index b995ca8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiLiveTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.internal;
-
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.get;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jclouds.cloudstack.domain.Account.Type.ADMIN;
-import static org.jclouds.cloudstack.domain.Account.Type.DOMAIN_ADMIN;
-import static org.jclouds.cloudstack.domain.Account.Type.USER;
-import static org.jclouds.reflect.Reflection2.typeToken;
-import static org.jclouds.util.Predicates2.retry;
-import static org.testng.Assert.assertEquals;
-
-import java.util.NoSuchElementException;
-import java.util.Properties;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.CloudStackDomainApi;
-import org.jclouds.cloudstack.CloudStackGlobalApi;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.features.AccountApi;
-import org.jclouds.cloudstack.functions.ReuseOrAssociateNewPublicIPAddress;
-import org.jclouds.cloudstack.options.ListTemplatesOptions;
-import org.jclouds.cloudstack.predicates.CorrectHypervisorForZone;
-import org.jclouds.cloudstack.predicates.JobComplete;
-import org.jclouds.cloudstack.predicates.OSCategoryIn;
-import org.jclouds.cloudstack.predicates.TemplatePredicates;
-import org.jclouds.cloudstack.predicates.UserPredicates;
-import org.jclouds.cloudstack.predicates.VirtualMachineDestroyed;
-import org.jclouds.cloudstack.predicates.VirtualMachineRunning;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.domain.ExecResponse;
-import org.jclouds.compute.internal.BaseGenericComputeServiceContextLiveTest;
-import org.jclouds.predicates.SocketOpen;
-import org.jclouds.ssh.SshClient;
-import org.jclouds.sshj.config.SshjSshClientModule;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeGroups;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.net.HostAndPort;
-import com.google.common.reflect.TypeToken;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-public class BaseCloudStackApiLiveTest extends BaseGenericComputeServiceContextLiveTest<CloudStackContext> {
- protected String domainAdminIdentity;
- protected String domainAdminCredential;
- protected String globalAdminIdentity;
- protected String globalAdminCredential;
-
- public BaseCloudStackApiLiveTest() {
- provider = "cloudstack";
- }
-
- @Override
- protected TypeToken<CloudStackContext> viewType() {
- return typeToken(CloudStackContext.class);
- }
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = super.setupProperties();
- domainAdminIdentity = setIfTestSystemPropertyPresent(overrides, provider + ".domainAdminIdentity");
- domainAdminCredential = setIfTestSystemPropertyPresent(overrides, provider + ".domainAdminCredential");
- globalAdminIdentity = setIfTestSystemPropertyPresent(overrides, provider + ".globalAdminIdentity");
- globalAdminCredential = setIfTestSystemPropertyPresent(overrides, provider + ".globalAdminCredential");
- return overrides;
- }
-
- protected Properties setupDomainAdminProperties() {
- if (domainAdminIdentity != null && domainAdminCredential != null) {
- Properties overrides = setupProperties();
- overrides.setProperty(provider + ".identity", domainAdminIdentity);
- overrides.setProperty(provider + ".credential", domainAdminCredential);
- return overrides;
- } else {
- return null;
- }
- }
-
- protected Properties setupGlobalAdminProperties() {
- if (globalAdminIdentity != null && globalAdminCredential != null) {
- Properties overrides = setupProperties();
- overrides.setProperty(provider + ".identity", globalAdminIdentity);
- overrides.setProperty(provider + ".credential", globalAdminCredential);
- return overrides;
- } else {
- return null;
- }
- }
-
- public static String defaultTemplateOrPreferredInZone(String defaultTemplate, CloudStackApi client, String zoneId) {
- String templateId = defaultTemplate != null ? defaultTemplate : getTemplateForZone(client, zoneId);
- return templateId;
- }
-
- public static String getTemplateForZone(CloudStackApi client, String zoneId) {
- // TODO enum, as this is way too easy to mess up.
- Set<String> acceptableCategories = ImmutableSet.of("Ubuntu", "CentOS");
-
- final Predicate<Template> hypervisorPredicate = new CorrectHypervisorForZone(client).apply(zoneId);
- final Predicate<Template> osTypePredicate = new OSCategoryIn(client).apply(acceptableCategories);
-
- @SuppressWarnings("unchecked")
- Predicate<Template> templatePredicate = Predicates.<Template> and(TemplatePredicates.isReady(),
- hypervisorPredicate, osTypePredicate);
- Iterable<Template> templates = filter(
- client.getTemplateApi().listTemplates(ListTemplatesOptions.Builder.zoneId(zoneId)), templatePredicate);
- if (Iterables.any(templates, TemplatePredicates.isPasswordEnabled())) {
- templates = filter(templates, TemplatePredicates.isPasswordEnabled());
- }
- if (Iterables.size(templates) == 0) {
- throw new NoSuchElementException(templatePredicate.toString());
- }
- String templateId = get(templates, 0).getId();
- return templateId;
- }
-
- protected String prefix = System.getProperty("user.name");
-
- protected ComputeService computeClient;
- protected CloudStackContext cloudStackContext;
- protected CloudStackApi client;
- protected CloudStackApi adminClient;
- protected User user;
-
- protected Predicate<HostAndPort> socketTester;
- protected Predicate<String> jobComplete;
- protected Predicate<String> adminJobComplete;
- protected Predicate<VirtualMachine> virtualMachineRunning;
- protected Predicate<VirtualMachine> adminVirtualMachineRunning;
- protected Predicate<VirtualMachine> virtualMachineDestroyed;
- protected Predicate<VirtualMachine> adminVirtualMachineDestroyed;
- protected SshClient.Factory sshFactory;
-
- protected Injector injector;
-
- protected ReuseOrAssociateNewPublicIPAddress reuseOrAssociate;
-
- protected boolean domainAdminEnabled;
- protected CloudStackContext domainAdminComputeContext;
- protected CloudStackDomainApi domainAdminClient;
- protected User domainAdminUser;
-
- protected boolean globalAdminEnabled;
- protected CloudStackContext globalAdminComputeContext;
- protected CloudStackGlobalApi globalAdminClient;
- protected User globalAdminUser;
-
- protected void checkSSH(HostAndPort socket) {
- socketTester.apply(socket);
- SshClient client = sshFactory.create(socket, loginCredentials);
- try {
- client.connect();
- ExecResponse exec = client.exec("echo hello");
- System.out.println(exec);
- assertEquals(exec.getOutput().trim(), "hello");
- } finally {
- if (client != null)
- client.disconnect();
- }
- }
-
- @BeforeGroups(groups = { "integration", "live" })
- @Override
- public void setupContext() {
- super.setupContext();
- computeClient = view.getComputeService();
- cloudStackContext = CloudStackContext.class.cast(view);
- client = cloudStackContext.getApi();
- user = verifyCurrentUserIsOfType(identity, client.getAccountApi(), USER);
-
- domainAdminEnabled = setupDomainAdminProperties() != null;
- if (domainAdminEnabled) {
- domainAdminComputeContext = createView(setupDomainAdminProperties(), setupModules());
- domainAdminClient = domainAdminComputeContext.getDomainApi();
- domainAdminUser = verifyCurrentUserIsOfType(domainAdminIdentity, domainAdminClient.getAccountApi(),
- DOMAIN_ADMIN);
- adminClient = domainAdminClient;
- }
-
- globalAdminEnabled = setupGlobalAdminProperties() != null;
- if (globalAdminEnabled) {
- globalAdminComputeContext = createView(setupGlobalAdminProperties(), setupModules());
- globalAdminClient = globalAdminComputeContext.getGlobalApi();
- globalAdminUser = verifyCurrentUserIsOfType(globalAdminIdentity, globalAdminClient.getAccountApi(), ADMIN);
- adminClient = globalAdminClient;
- }
-
- injector = cloudStackContext.utils().injector();
- sshFactory = injector.getInstance(SshClient.Factory.class);
- SocketOpen socketOpen = context.utils().injector().getInstance(SocketOpen.class);
- socketTester = retry(socketOpen, 180, 1, 1, SECONDS);
- injector.injectMembers(socketTester);
-
- jobComplete = retry(new JobComplete(client), 1200, 1, 5, SECONDS);
- injector.injectMembers(jobComplete);
- adminJobComplete = retry(new JobComplete(adminClient), 1200, 1, 5, SECONDS);
- injector.injectMembers(adminJobComplete);
- virtualMachineRunning = retry(new VirtualMachineRunning(client), 600, 5, 5, SECONDS);
- injector.injectMembers(virtualMachineRunning);
- adminVirtualMachineRunning = retry(new VirtualMachineRunning(adminClient), 600, 5, 5, SECONDS);
- injector.injectMembers(adminVirtualMachineRunning);
- virtualMachineDestroyed = retry(new VirtualMachineDestroyed(client), 600, 5, 5, SECONDS);
- injector.injectMembers(virtualMachineDestroyed);
- adminVirtualMachineDestroyed = retry(new VirtualMachineDestroyed(adminClient), 600, 5, 5, SECONDS);
- injector.injectMembers(adminVirtualMachineDestroyed);
- reuseOrAssociate = new ReuseOrAssociateNewPublicIPAddress(client, new BlockUntilJobCompletesAndReturnResult(
- client, jobComplete));
- injector.injectMembers(reuseOrAssociate);
- }
-
- @Override
- protected Module getSshModule() {
- return new SshjSshClientModule();
- }
-
- private static User verifyCurrentUserIsOfType(String identity, AccountApi accountClient, Account.Type type) {
- Iterable<User> users = Iterables.concat(accountClient.listAccounts());
- Predicate<User> apiKeyMatches = UserPredicates.apiKeyEquals(identity);
- User currentUser;
- try {
- currentUser = Iterables.find(users, apiKeyMatches);
- } catch (NoSuchElementException e) {
- throw new NoSuchElementException(String.format("none of the following users match %s: %s", apiKeyMatches,
- users));
- }
-
- if (currentUser.getAccountType() != type) {
- Logger.getAnonymousLogger().warning(
- String.format("Expecting an user with type %s. Got: %s", type.toString(), currentUser.toString()));
- }
- return currentUser;
- }
-
- protected void skipIfNotDomainAdmin() {
- if (!domainAdminEnabled) {
- throw new SkipException("Test cannot run without domain admin identity and credentials");
- }
- }
-
- protected void skipIfNotGlobalAdmin() {
- if (!globalAdminEnabled) {
- throw new SkipException("Test cannot run without global admin identity and credentials");
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java
deleted file mode 100644
index 664758d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackApiTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.internal;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.CloudStackApiMetadata;
-import org.jclouds.cloudstack.config.CloudStackHttpApiModule;
-import org.jclouds.cloudstack.filters.QuerySigner;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.providers.AnonymousProviderMetadata;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.rest.ConfiguresHttpApi;
-import org.jclouds.rest.internal.BaseAsyncApiTest;
-
-import com.google.inject.Module;
-
-public abstract class BaseCloudStackApiTest<T> extends BaseAsyncApiTest<T> {
-
- @ConfiguresHttpApi
- public static class CloudStackHttpApiModuleExtension extends CloudStackHttpApiModule {
-
- }
-
- @Override
- protected void checkFilters(HttpRequest request) {
- assertEquals(request.getFilters().size(), 1);
- assertEquals(request.getFilters().get(0).getClass(), QuerySigner.class);
- }
-
- @Override
- protected Module createModule() {
- return new CloudStackHttpApiModuleExtension();
- }
-
- @Override
- protected ProviderMetadata createProviderMetadata() {
- return AnonymousProviderMetadata.forApiWithEndpoint(new CloudStackApiMetadata(),
- "http://localhost:8080/client/api");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackComputeServiceContextExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackComputeServiceContextExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackComputeServiceContextExpectTest.java
deleted file mode 100644
index 4a971b2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackComputeServiceContextExpectTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.internal;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-
-
-/**
- * Base class for writing CloudStack Expect tests with the ComputeService
- * abstraction
- */
-public abstract class BaseCloudStackComputeServiceContextExpectTest<T> extends BaseCloudStackExpectTest<T> {
-
- public BaseCloudStackComputeServiceContextExpectTest() {
- // to match the api key name in listaccountsresponse.json
- identity = "APIKEY";
- }
-
- protected final HttpRequest listTemplates = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listTemplates")
- .addQueryParam("listAll", "true")
- .addQueryParam("templatefilter", "executable")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "Xk6lF/v3SbhrxTKqaC2IWoBPKHo%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- //TODO: update or add new resource files to have more recent data, ex. ubuntu template
- protected final HttpResponse listTemplatesResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listtemplatesresponse.json"))
- .build();
-
- protected final HttpRequest listProjects = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listProjects")
- .addQueryParam("listAll", "true")
- .addQueryParam("account", "jclouds")
- .addQueryParam("domainid", "457")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "yAx1XbtjeEhdBQCNP0OLyWWAFCw%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse listProjectsResponse = HttpResponse.builder().statusCode(200)
- .build();
-
- protected final HttpRequest listOsTypes = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listOsTypes")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "8BsE8MsOAhUzo1Q4Y3UD/e96u84%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse listOsTypesResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listostypesresponse.json"))
- .build();
-
- protected final HttpRequest listOsCategories = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listOsCategories")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "OojW4ssh/RQ3CubAzXue4svlofM%3D")
-// .addHeader("Accept", "application/json") //TODO: why are we not passing this?
- .build();
-
- protected final HttpResponse listOsCategoriesResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listoscategoriesresponse.json"))
- .build();
-
- protected final HttpRequest listZones = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listZones")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "GTUgn/LHDioJRq48kurOdCAYueo%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse listZonesResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listzonesresponse.json"))
- .build();
-
- protected final HttpRequest listServiceOfferings = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listServiceOfferings")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "jUien8oeEan7bjKKQbBlzvFuMjw%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse listServiceOfferingsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listserviceofferingsresponse.json"))
- .build();
-
- protected final HttpRequest listAccounts = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listAccounts")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "E4wuKXCkioaNIiL8hL8FD9K5K2c%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse listAccountsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listaccountsresponse.json"))
- .build();
-
- protected final HttpRequest listNetworks = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listNetworks")
- .addQueryParam("listAll", "true")
- .addQueryParam("account", "jclouds") // account and domain came from above
- .addQueryParam("domainid", "457")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "FDiGGBiG/sVj0k6DmZIgMNU8SqI%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse listNetworksResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listnetworksresponse.json"))
- .build();
-
- protected final HttpResponse listNetworksWithSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listnetworksresponse-2.json"))
- .build();
-
- protected final HttpRequest getZone = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listZones")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "1")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "q5GMO9iUYIFs5S58DdAuYAy8yu0%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse getZoneResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getzoneresponse.json"))
- .build();
-
- protected final HttpRequest getZoneWithSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listZones")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "2")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "FnYX25207fVLLRz5GhOfRrWuUek%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse getZoneWithSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getzoneresponse-2.json"))
- .build();
-
- protected final HttpRequest listCapabilities = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("listAll", "true")
- .addQueryParam("command", "listCapabilities")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "vVdhtet/zG59FXgkYkAzEQQ4q1o%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse listCapabilitiesResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listcapabilitiesresponse.json"))
- .build();
-
- protected final HttpRequest getSecurityGroup = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("securitygroupname", "jclouds-test")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "zGp2rfHY6fBIGkgODRxyNzFfPFI%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse getSecurityGroupResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse.json"))
- .build();
-
- protected final HttpRequest createSecurityGroup = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createSecurityGroup")
- .addQueryParam("name", "jclouds-test")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "BdgmqGsvjPmP4PxsEKEpq6buwuA%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse createSecurityGroupResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/createsecuritygroupresponse.json"))
- .build();
-
- protected final HttpRequest authorizeIngress = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("securitygroupid", "30")
- .addQueryParam("protocol", "TCP")
- .addQueryParam("startport", "22")
- .addQueryParam("endport", "22")
- .addQueryParam("cidrlist", "0.0.0.0/0")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "GVtXzAl/Q7z4wnvKEHtdV0lxv2o%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse authorizeIngressResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/authorizesecuritygroupingressresponse.json"))
- .build();
-
- protected final HttpRequest createSSHKeyPair = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createSSHKeyPair")
- .addQueryParam("name", "jclouds-test")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "er6YjvUjPFwxy/x/aAVNW9Z8yo8%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse createSSHKeyPairResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/createsshkeypairresponse-2.json"))
- .build();
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java
deleted file mode 100644
index 5237efc..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.internal;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.hash.Hashing.md5;
-import static com.google.common.io.BaseEncoding.base16;
-import static org.jclouds.util.Strings2.urlEncode;
-
-import java.util.Properties;
-
-import org.jclouds.apis.ApiMetadata;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.internal.BaseRestClientExpectTest;
-
-import com.google.common.base.Function;
-import com.google.inject.Module;
-
-/**
- * Base class for writing CloudStack Rest Client Expect tests
- */
-public abstract class BaseCloudStackExpectTest<S> extends BaseRestClientExpectTest<S> {
-
- public BaseCloudStackExpectTest() {
- provider = "cloudstack";
- }
-
- @Override
- protected ApiMetadata createApiMetadata() {
- return new CloudStackApiMetadata();
- }
-
- @Override
- public S createClient(Function<HttpRequest, HttpResponse> fn, Module module, Properties props) {
- return clientFrom(createInjector(fn, module, props).getInstance(CloudStackContext.class));
- }
-
- protected abstract S clientFrom(CloudStackContext context);
-
- protected final HttpRequest login = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "login")
- .addQueryParam("username", "identity")
- .addQueryParam("domain", "")
- .addQueryParam("password", base16().lowerCase().encode(md5().hashString("credential", UTF_8).asBytes()))
- .addHeader("Accept", "application/json")
- .build();
-
- protected final String jSessionId = "90DD65D13AEAA590ECCA312D150B9F6D";
- protected final String sessionKey = "uYT4/MNiglgAKiZRQkvV8QP8gn0=";
-
- protected final HttpResponse loginResponse = HttpResponse.builder().statusCode(200)
- .addHeader("Set-Cookie", "JSESSIONID=" + jSessionId + "; Path=/client")
- .payload(payloadFromResource("/loginresponse.json"))
- .build();
-
- protected final HttpRequest logout = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "logout")
- .addQueryParam("sessionkey", urlEncode(sessionKey))
- .build();
-
- protected final HttpResponse logoutResponse = HttpResponse.builder().statusCode(200).build();
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentialsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentialsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentialsTest.java
deleted file mode 100644
index 8b13170..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentialsTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.loaders;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.features.SessionApi;
-import org.jclouds.domain.Credentials;
-import org.testng.annotations.Test;
-
-public class LoginWithPasswordCredentialsTest {
-
- /**
- * This test is different from the single domainname test as it included testing on how the
- * domainname is rebuild. It is here to prove that this particular test fails on systems
- * with a different path separator.
- */
- @Test
- public void testWithDoubleDomainname() {
- LoginResponse response = createMock(LoginResponse.class);
- SessionApi client = createMock(SessionApi.class);
-
- expect(client.loginUserInDomainWithHashOfPassword(eq("User"), eq("Test/Domain"), (String) anyObject())).andReturn(response);
- replay(client);
-
- LoginWithPasswordCredentials obj = new LoginWithPasswordCredentials(client);
- Credentials cred = new Credentials("Test/Domain/User", "koffiedik");
-
- obj.load(cred);
- }
-
- @Test
- public void testWithSingleDomainname() {
- LoginResponse response = createMock(LoginResponse.class);
- SessionApi client = createMock(SessionApi.class);
-
- expect(client.loginUserInDomainWithHashOfPassword(eq("User"), eq("Domain"), (String) anyObject())).andReturn(response);
- replay(client);
-
- LoginWithPasswordCredentials obj = new LoginWithPasswordCredentials(client);
- Credentials cred = new Credentials("Domain/User", "koffiedik");
-
- obj.load(cred);
- }
-
- @Test
- public void testWithNoDomainname() {
- LoginResponse response = createMock(LoginResponse.class);
- SessionApi client = createMock(SessionApi.class);
-
- expect(client.loginUserInDomainWithHashOfPassword(eq("User"), eq(""), (String) anyObject())).andReturn(response);
- replay(client);
-
- LoginWithPasswordCredentials obj = new LoginWithPasswordCredentials(client);
- Credentials cred = new Credentials("User", "koffiedik");
-
- obj.load(cred);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java
deleted file mode 100644
index 39aef2f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.allocationState;
-import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.password;
-import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.url;
-import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.username;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code AddClusterOptions}
- */
-@Test(groups = "unit")
-public class AddClusterOptionsTest {
-
- public void testAllocationState() {
- AddClusterOptions options = new AddClusterOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- AddClusterOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testPassword() {
- AddClusterOptions options = new AddClusterOptions().password("sekrit");
- assertEquals(ImmutableList.of("sekrit"), options.buildQueryParameters().get("password"));
- }
-
- public void testPasswordStatic() {
- AddClusterOptions options = password("sekrit");
- assertEquals(ImmutableList.of("sekrit"), options.buildQueryParameters().get("password"));
- }
-
- public void testPodId() {
- AddClusterOptions options = new AddClusterOptions().podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- AddClusterOptions options = podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
- public void testUrl() {
- AddClusterOptions options = new AddClusterOptions().url("http://example.com");
- assertEquals(ImmutableList.of("http://example.com"), options.buildQueryParameters().get("url"));
- }
-
- public void testUrlStatic() {
- AddClusterOptions options = url("http://example.com");
- assertEquals(ImmutableList.of("http://example.com"), options.buildQueryParameters().get("url"));
- }
-
- public void testUsername() {
- AddClusterOptions options = new AddClusterOptions().username("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("username"));
- }
-
- public void testUsernameStatic() {
- AddClusterOptions options = username("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("username"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java
deleted file mode 100644
index 97f1537..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.AddHostOptions.Builder.allocationState;
-import static org.jclouds.cloudstack.options.AddHostOptions.Builder.clusterId;
-import static org.jclouds.cloudstack.options.AddHostOptions.Builder.clusterName;
-import static org.jclouds.cloudstack.options.AddHostOptions.Builder.hostTags;
-import static org.jclouds.cloudstack.options.AddHostOptions.Builder.podId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code AddHostOptions}
- */
-@Test(groups = "unit")
-public class AddHostOptionsTest {
-
- public void testAllocationState() {
- AddHostOptions options = new AddHostOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- AddHostOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testClusterId() {
- AddHostOptions options = new AddHostOptions().clusterId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("clusterid"));
- }
-
- public void testClusterIdStatic() {
- AddHostOptions options = clusterId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("clusterid"));
- }
-
- public void testClusterName() {
- AddHostOptions options = new AddHostOptions().clusterName("Cluster Name");
- assertEquals(ImmutableList.of("Cluster Name"), options.buildQueryParameters().get("clustername"));
- }
-
- public void testClusterNameStatic() {
- AddHostOptions options = clusterName("Cluster Name");
- assertEquals(ImmutableList.of("Cluster Name"), options.buildQueryParameters().get("clustername"));
- }
-
- public void testHostTags() {
- AddHostOptions options = new AddHostOptions().hostTags(ImmutableSet.<String>of("foo", "bar", "baz"));
- assertEquals(ImmutableList.of("foo,bar,baz"), options.buildQueryParameters().get("hosttags"));
- }
-
- public void testHostTagsStatic() {
- AddHostOptions options = hostTags(ImmutableSet.<String>of("foo", "bar", "baz"));
- assertEquals(ImmutableList.of("foo,bar,baz"), options.buildQueryParameters().get("hosttags"));
- }
-
- public void testPodId() {
- AddHostOptions options = new AddHostOptions().podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- AddHostOptions options = podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java
deleted file mode 100644
index 4f63aff..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.AddSecondaryStorageOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code AddSecondaryStorageOptions}
- */
-@Test(groups = "unit")
-public class AddSecondaryStorageOptionsTest {
-
- public void testZoneId() {
- AddSecondaryStorageOptions options = new AddSecondaryStorageOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- AddSecondaryStorageOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java
deleted file mode 100644
index 397e94f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.AssociateIPAddressOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.AssociateIPAddressOptions.Builder.networkId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code AssociateIPAddressOptions}
- */
-@Test(groups = "unit")
-public class AssociateIPAddressOptionsTest {
-
- public void testAccountInDomainId() {
- AssociateIPAddressOptions options = new AssociateIPAddressOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- AssociateIPAddressOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testNetworkId() {
- AssociateIPAddressOptions options = new AssociateIPAddressOptions().networkId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testNetworkIdStatic() {
- AssociateIPAddressOptions options = networkId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("networkid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java
deleted file mode 100644
index c669b3d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreateAccountOptions.Builder.account;
-import static org.jclouds.cloudstack.options.CreateAccountOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.CreateAccountOptions.Builder.networkDomain;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code CreateAccountOptions}
- */
-@Test(groups = "unit")
-public class CreateAccountOptionsTest {
-
- public void testNetworkDomain() {
- CreateAccountOptions options = new CreateAccountOptions().networkDomain("net");
- assertEquals(ImmutableSet.of("net"), options.buildQueryParameters().get("networkdomain"));
- }
-
- public void testNetworkDomainStatic() {
- CreateAccountOptions options = networkDomain("net");
- assertEquals(ImmutableSet.of("net"), options.buildQueryParameters().get("networkdomain"));
- }
-
- public void testAccount() {
- CreateAccountOptions options = new CreateAccountOptions().account("accountName");
- assertEquals(ImmutableSet.of("accountName"), options.buildQueryParameters().get("account"));
- }
-
- public void testAccountStatic() {
- CreateAccountOptions options = account("accountName");
- assertEquals(ImmutableSet.of("accountName"), options.buildQueryParameters().get("account"));
- }
-
- public void testAccountDomain() {
- CreateAccountOptions options = new CreateAccountOptions().domainId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- CreateAccountOptions options = domainId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java
deleted file mode 100644
index e82238e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.customized;
-import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.diskSizeInGB;
-import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.tags;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code CreateDiskOfferingOptions}
- */
-@Test(groups = "unit")
-public class CreateDiskOfferingOptionsTest {
-
- public void testTags() {
- CreateDiskOfferingOptions options =
- new CreateDiskOfferingOptions().tags(ImmutableSet.<String>of("tag1", "tag2"));
- assertEquals(ImmutableSet.of("tag1", "tag2"), options.buildQueryParameters().get("tags"));
- }
-
- public void testTagsStatic() {
- CreateDiskOfferingOptions options = tags(ImmutableSet.<String>of("tag1", "tag2"));
- assertEquals(ImmutableSet.of("tag1", "tag2"), options.buildQueryParameters().get("tags"));
- }
-
- public void testCustomized() {
- CreateDiskOfferingOptions options =
- new CreateDiskOfferingOptions().customized(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("customized"));
- }
-
- public void testCustomizedStatic() {
- CreateDiskOfferingOptions options = customized(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("customized"));
- }
-
- public void testDiskSizeInGB() {
- CreateDiskOfferingOptions options =
- new CreateDiskOfferingOptions().diskSizeInGB(100);
- assertEquals(ImmutableSet.of("100"), options.buildQueryParameters().get("disksize"));
- }
-
- public void testDiskSizeInGBStatic() {
- CreateDiskOfferingOptions options = diskSizeInGB(100);
- assertEquals(ImmutableSet.of("100"), options.buildQueryParameters().get("disksize"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java
deleted file mode 100644
index df813f2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreateIPForwardingRuleOptions.Builder.endPort;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code CreateIPForwardingRuleOptions}
- */
-@Test(groups = "unit")
-public class CreateIPForwardingRuleOptionsTest {
-
- public void testNetworkId() {
- CreateIPForwardingRuleOptions options = new CreateIPForwardingRuleOptions().endPort(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("endport"));
- }
-
- public void testNetworkIdStatic() {
- CreateIPForwardingRuleOptions options = endPort(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("endport"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java
deleted file mode 100644
index 76bbef4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.endIP;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.gateway;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.isDefault;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.isShared;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.netmask;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.networkDomain;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.startIP;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code CreateNetworkOptions}
- */
-@Test(groups = "unit")
-public class CreateNetworkOptionsTest {
-
- public void testAccountInDomainId() {
- CreateNetworkOptions options = new CreateNetworkOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- CreateNetworkOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testIsDefault() {
- CreateNetworkOptions options = new CreateNetworkOptions().isDefault(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
- }
-
- public void testIsDefaultStatic() {
- CreateNetworkOptions options = isDefault(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
- }
-
- public void testIsShared() {
- CreateNetworkOptions options = new CreateNetworkOptions().isShared(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
- }
-
- public void testIsSharedStatic() {
- CreateNetworkOptions options = isShared(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
- }
-
- public void testStartIP() {
- CreateNetworkOptions options = new CreateNetworkOptions().startIP("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("startip"));
- }
-
- public void testStartIPStatic() {
- CreateNetworkOptions options = startIP("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("startip"));
- }
-
- public void testEndIP() {
- CreateNetworkOptions options = new CreateNetworkOptions().endIP("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("endip"));
- }
-
- public void testEndIPStatic() {
- CreateNetworkOptions options = endIP("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("endip"));
- }
-
- public void testGateway() {
- CreateNetworkOptions options = new CreateNetworkOptions().gateway("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("gateway"));
- }
-
- public void testGatewayStatic() {
- CreateNetworkOptions options = gateway("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("gateway"));
- }
-
- public void testNetmask() {
- CreateNetworkOptions options = new CreateNetworkOptions().netmask("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("netmask"));
- }
-
- public void testNetmaskStatic() {
- CreateNetworkOptions options = netmask("1.1.1.1");
- assertEquals(ImmutableList.of("1.1.1.1"), options.buildQueryParameters().get("netmask"));
- }
-
- public void testNetworkDomain() {
- CreateNetworkOptions options = new CreateNetworkOptions().networkDomain("network.com");
- assertEquals(ImmutableList.of("network.com"), options.buildQueryParameters().get("networkdomain"));
- }
-
- public void testNetworkDomainStatic() {
- CreateNetworkOptions options = networkDomain("network.com");
- assertEquals(ImmutableList.of("network.com"), options.buildQueryParameters().get("networkdomain"));
- }
-
- public void testVlan() {
- CreateNetworkOptions options = new CreateNetworkOptions().vlan("tag");
- assertEquals(ImmutableList.of("tag"), options.buildQueryParameters().get("vlan"));
- }
-
- public void testVlanStatic() {
- CreateNetworkOptions options = vlan("tag");
- assertEquals(ImmutableList.of("tag"), options.buildQueryParameters().get("vlan"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java
deleted file mode 100644
index cae2b06..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreatePodOptions.Builder.allocationState;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code CreatePodOptions}
- */
-@Test(groups = "unit")
-public class CreatePodOptionsTest {
-
- public void testAllocationState() {
- CreatePodOptions options = new CreatePodOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- CreatePodOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java
deleted file mode 100644
index 3e7ec4b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.highlyAvailable;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.hostTags;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.isSystem;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.limitCpuUse;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.networkRateInMb;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.storageType;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.systemVmType;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.tags;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.StorageType;
-import org.jclouds.cloudstack.domain.SystemVmType;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code CreateServiceOfferingOptions}
- */
-@Test(groups = "unit")
-public class CreateServiceOfferingOptionsTest {
-
- public void testHostTags() {
- CreateServiceOfferingOptions options =
- new CreateServiceOfferingOptions().hostTags(ImmutableSet.of("tag1", "tag2"));
- assertEquals(ImmutableSet.of("tag1", "tag2"), options.buildQueryParameters().get("hosttags"));
- }
-
- public void testHostTagsStatic() {
- CreateServiceOfferingOptions options = hostTags(ImmutableSet.of("tag1", "tag2"));
- assertEquals(ImmutableSet.of("tag1", "tag2"), options.buildQueryParameters().get("hosttags"));
- }
-
- public void testIsSystem() {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions().isSystem(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("issystem"));
- }
-
- public void testIsSystemStatic() {
- CreateServiceOfferingOptions options = isSystem(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("issystem"));
- }
-
- public void testLimitCpuUse() {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions().limitCpuUse(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("limitcpuuse"));
- }
-
- public void testLimitCpuUseStatic() {
- CreateServiceOfferingOptions options = limitCpuUse(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("limitcpuuse"));
- }
-
- public void testNetworkRate() {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions().networkRateInMb(200);
- assertEquals(ImmutableSet.of("200"), options.buildQueryParameters().get("networkrate"));
- }
-
- public void testNetworkRateStatic() {
- CreateServiceOfferingOptions options = networkRateInMb(200);
- assertEquals(ImmutableSet.of("200"), options.buildQueryParameters().get("networkrate"));
- }
-
- public void testHighlyAvailable() {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions().highlyAvailable(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("offerha"));
- }
-
- public void testHighlyAvailableStatic() {
- CreateServiceOfferingOptions options = highlyAvailable(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("offerha"));
- }
-
- public void testStorageType() {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions().storageType(StorageType.LOCAL);
- assertEquals(ImmutableSet.of("local"), options.buildQueryParameters().get("storagetype"));
- }
-
- public void testStorageTypeStatic() {
- CreateServiceOfferingOptions options = storageType(StorageType.LOCAL);
- assertEquals(ImmutableSet.of("local"), options.buildQueryParameters().get("storagetype"));
- }
-
- public void testSystemVmType() {
- CreateServiceOfferingOptions options =
- new CreateServiceOfferingOptions().systemVmType(SystemVmType.DOMAIN_ROUTER);
- assertEquals(ImmutableSet.of("domainrouter"), options.buildQueryParameters().get("systemvmtype"));
- }
-
- public void testSystemVmTypeStatic() {
- CreateServiceOfferingOptions options = systemVmType(SystemVmType.DOMAIN_ROUTER);
- assertEquals(ImmutableSet.of("domainrouter"), options.buildQueryParameters().get("systemvmtype"));
- }
-
- public void testTags() {
- CreateServiceOfferingOptions options =
- new CreateServiceOfferingOptions().tags(ImmutableSet.<String>of("tag1", "tag2"));
- assertEquals(ImmutableSet.of("tag1", "tag2"), options.buildQueryParameters().get("tags"));
- }
-
- public void testTagsStatic() {
- CreateServiceOfferingOptions options = tags(ImmutableSet.<String>of("tag1", "tag2"));
- assertEquals(ImmutableSet.of("tag1", "tag2"), options.buildQueryParameters().get("tags"));
- }
-}
[30/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java
deleted file mode 100644
index 77097ac..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control updates to VMGroups
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api/user/updateInstanceGroup.html"
- * />
- */
-public class UpdateVMGroupOptions extends BaseHttpRequestOptions {
-
- public static final UpdateVMGroupOptions NONE = new UpdateVMGroupOptions();
-
- /**
- * @param name new name of the VMGroup
- */
- public UpdateVMGroupOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public static class Builder {
- /**
- * @see org.jclouds.cloudstack.options.UpdateVMGroupOptions#name
- */
- public static UpdateVMGroupOptions name(String name) {
- UpdateVMGroupOptions options = new UpdateVMGroupOptions();
- return options.name(name);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java
deleted file mode 100644
index ab22e96..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.util.List;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a zone is updated
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/updateZone.html"
- * />
- */
-public class UpdateZoneOptions extends BaseHttpRequestOptions {
-
- public static final UpdateZoneOptions NONE = new UpdateZoneOptions();
-
- /**
- * @param allocationState
- * allocation state of this Zone for allocation of new resources
- */
- public UpdateZoneOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- /**
- * @param details
- * the details for the Zone
- */
- public UpdateZoneOptions details(String details) {
- this.queryParameters.replaceValues("details", ImmutableSet.of(details));
- return this;
- }
-
- /**
- * @param dhcpProvider
- * the dhcp Provider for the Zone
- */
- public UpdateZoneOptions dhcpProvider(String dhcpProvider) {
- this.queryParameters.replaceValues("dhcpprovider", ImmutableSet.of(dhcpProvider));
- return this;
- }
-
- /**
- * @param externalDnsServers
- * the list of external DNS servers
- */
- public UpdateZoneOptions externalDns(List<String> externalDnsServers) {
- checkArgument(externalDnsServers.size() == 1 || externalDnsServers.size() == 2,
- "The list of DNS servers should have 1 or 2 elements");
- this.queryParameters.replaceValues("dns1",
- ImmutableSet.of(externalDnsServers.get(0)));
- if (externalDnsServers.size() == 2) {
- this.queryParameters.replaceValues("dns2",
- ImmutableSet.of(externalDnsServers.get(1)));
- }
- return this;
- }
-
- /**
- * @param internalDnsServers
- * the list of internal DNS for the Zone
- */
- public UpdateZoneOptions internalDns(List<String> internalDnsServers) {
- checkArgument(internalDnsServers.size() == 1 || internalDnsServers.size() == 2,
- "The list of internal DNS servers should have 1 or 2 elements");
- this.queryParameters.replaceValues("internaldns1",
- ImmutableSet.of(internalDnsServers.get(0)));
- if (internalDnsServers.size() == 2) {
- this.queryParameters.replaceValues("internaldns2",
- ImmutableSet.of(internalDnsServers.get(1)));
- }
- return this;
- }
-
- /**
- * @param dnsSearchOrder
- * the dns search order list
- */
- public UpdateZoneOptions dnsSearchOrder(String dnsSearchOrder) {
- this.queryParameters.replaceValues("dnssearchorder", ImmutableSet.of(dnsSearchOrder));
- return this;
- }
-
- /**
- * @param domainName
- * network domain name for the networks in zone
- */
- public UpdateZoneOptions domainName(String domainName) {
- this.queryParameters.replaceValues("domain", ImmutableSet.of(domainName));
- return this;
- }
-
- /**
- * @param guestCIDRAddress
- * the guest CIDR address for the Zone
- */
- public UpdateZoneOptions guestCIDRAddress(String guestCIDRAddress) {
- this.queryParameters.replaceValues("guestcidraddress", ImmutableSet.of(guestCIDRAddress));
- return this;
- }
-
- /**
- * @param securityGroupEnabled
- * true if network is security group enabled, false otherwise
- */
- public UpdateZoneOptions securityGroupEnabled(boolean securityGroupEnabled) {
- this.queryParameters.replaceValues("securitygroupenabled", ImmutableSet.of(securityGroupEnabled + ""));
- return this;
- }
-
- /**
- * You can only make a private Zone public, not the other way around
- */
- public UpdateZoneOptions makePublic() {
- this.queryParameters.replaceValues("ispublic", ImmutableSet.of("true"));
- return this;
- }
-
- /**
- * @param name
- * the name of the Zone
- */
- public UpdateZoneOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param vlan
- * the VLAN for the Zone
- */
- public UpdateZoneOptions vlan(String vlan) {
- this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see UpdateZoneOptions#allocationState
- */
- public static UpdateZoneOptions allocationState(AllocationState allocationState) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.allocationState(allocationState);
- }
-
- /**
- * @see UpdateZoneOptions#details
- */
- public static UpdateZoneOptions details(String details) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.details(details);
- }
-
- /**
- * @see UpdateZoneOptions#dhcpProvider
- */
- public static UpdateZoneOptions dhcpProvider(String dhcpProvider) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.dhcpProvider(dhcpProvider);
- }
-
- /**
- * @see UpdateZoneOptions#externalDns
- */
- public static UpdateZoneOptions externalDns(List<String> externalDnsServers) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.externalDns(externalDnsServers);
- }
-
- /**
- * @see UpdateZoneOptions#internalDns
- */
- public static UpdateZoneOptions internalDns(List<String> internalDnsServers) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.internalDns(internalDnsServers);
- }
-
- /**
- * @see UpdateZoneOptions#dnsSearchOrder
- */
- public static UpdateZoneOptions dnsSearchOrder(String dnsSearchOrder) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.dnsSearchOrder(dnsSearchOrder);
- }
-
- /**
- * @see UpdateZoneOptions#domainName
- */
- public static UpdateZoneOptions domainName(String domainName) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.domainName(domainName);
- }
-
- /**
- * @see UpdateZoneOptions#guestCIDRAddress
- */
- public static UpdateZoneOptions guestCIDRAddress(String guestCIDRAddress) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.guestCIDRAddress(guestCIDRAddress);
- }
-
- /**
- * @see UpdateZoneOptions#securityGroupEnabled
- */
- public static UpdateZoneOptions securityGroupEnabled(boolean securityGroupEnabled) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.securityGroupEnabled(securityGroupEnabled);
- }
-
- /**
- * @see UpdateZoneOptions#makePublic
- */
- public static UpdateZoneOptions makePublic() {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.makePublic();
- }
-
- /**
- * @see UpdateZoneOptions#name
- */
- public static UpdateZoneOptions name(String name) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.name(name);
- }
-
- /**
- * @see UpdateZoneOptions#vlan
- */
- public static UpdateZoneOptions vlan(String vlan) {
- UpdateZoneOptions options = new UpdateZoneOptions();
- return options.vlan(vlan);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java
deleted file mode 100644
index e518763..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.Zone;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-
-/**
- * Templates can be present in a zone, and available, but not valid for launch
- * as their hypervisor isn't installed.
- */
-@Singleton
-public class CorrectHypervisorForZone implements Function<String, Predicate<Template>> {
- private final Supplier<Map<String, Set<String>>> hypervisorsSupplier;
-
- @Inject
- public CorrectHypervisorForZone(CloudStackApi client) {
- this(Suppliers.ofInstance(new CloudStackApiToZoneToHypervisors().apply(checkNotNull(client, "client"))));
- }
-
- public CorrectHypervisorForZone(Supplier<Map<String, Set<String>>> hypervisorsSupplier) {
- this.hypervisorsSupplier = checkNotNull(hypervisorsSupplier, "hypervisorsSupplier");
- }
-
- private static class CloudStackApiToZoneToHypervisors implements
- Function<CloudStackApi, Map<String, Set<String>>> {
-
- @Override
- public Map<String, Set<String>> apply(CloudStackApi client) {
- checkNotNull(client, "client");
- Builder<String, Set<String>> builder = ImmutableMap.builder();
- for (Zone zone : client.getZoneApi().listZones()) {
- builder.put(zone.getId(), client.getHypervisorApi().listHypervisorsInZone(zone.getId()));
- }
- return builder.build();
- }
- }
-
- @Override
- public Predicate<Template> apply(final String zoneId) {
-
- final Set<String> acceptableHypervisorsInZone;
- try {
- acceptableHypervisorsInZone = this.hypervisorsSupplier.get().get(zoneId);
- } catch (NullPointerException e) {
- throw new IllegalArgumentException("unknown zone: " + zoneId);
- }
- if (acceptableHypervisorsInZone.isEmpty())
- return Predicates.alwaysFalse();
- return new Predicate<Template>() {
-
- @Override
- public boolean apply(Template input) {
- return Predicates.in(acceptableHypervisorsInZone).apply(input.getHypervisor());
- }
-
- @Override
- public String toString() {
- return "hypervisorsInZone(" + zoneId + ", " + acceptableHypervisorsInZone + ")";
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java
deleted file mode 100644
index 3e45521..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.AsyncJobException;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.inject.Inject;
-
-/**
- *
- * Tests to see if a job is in progress.
- */
-@Singleton
-public class JobComplete implements Predicate<String> {
-
- private final CloudStackApi client;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public JobComplete(CloudStackApi client) {
- this.client = client;
- }
-
- public boolean apply(String jobId) {
- logger.trace(">> looking for status on job %s", checkNotNull(jobId, "jobId"));
- AsyncJob<?> job = refresh(jobId);
- if (job == null) {
- return false;
- }
- logger.trace("%s: looking for job status %s: currently: %s", job.getId(), 1, job.getStatus());
- if (job.hasFailed()) {
-
- throw new AsyncJobException(String.format("job %s failed with exception %s",
- job.toString(), job.getError().toString()));
- }
- return job.hasSucceed();
- }
-
- private AsyncJob<?> refresh(String jobId) {
- return client.getAsyncJobApi().getAsyncJob(jobId);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java
deleted file mode 100644
index 7d7abc9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.LoadBalancerRule;
-import org.jclouds.cloudstack.domain.LoadBalancerRule.State;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-
-/**
- *
- * Tests to see if a LoadBalancerRule is active
- */
-@Singleton
-public class LoadBalancerRuleActive implements Predicate<LoadBalancerRule> {
-
- private final CloudStackApi client;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public LoadBalancerRuleActive(CloudStackApi client) {
- this.client = client;
- }
-
- public boolean apply(LoadBalancerRule rule) {
- logger.trace("looking for state on rule %s", checkNotNull(rule, "rule"));
- rule = refresh(rule);
- if (rule == null)
- return false;
- logger.trace("%s: looking for rule state %s: currently: %s", rule.getId(), State.ACTIVE, rule.getState());
- return rule.getState() == State.ACTIVE;
- }
-
- private LoadBalancerRule refresh(LoadBalancerRule rule) {
- return client.getLoadBalancerApi().getLoadBalancerRule(rule.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java
deleted file mode 100644
index 680afbd..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Predicates.alwaysTrue;
-
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.TrafficType;
-
-import com.google.common.base.Predicate;
-
-public class NetworkOfferingPredicates {
-
- /**
- *
- * @return true, if the offering supports creation of GuestVirtual Networks
- */
- public static Predicate<NetworkOffering> supportsGuestVirtualNetworks() {
- return new Predicate<NetworkOffering>() {
-
- @Override
- public boolean apply(NetworkOffering arg0) {
- return arg0.getTrafficType() == TrafficType.GUEST && arg0.getGuestIPType() == GuestIPType.VIRTUAL;
- }
-
- @Override
- public String toString() {
- return "supportsGuestVirtualNetworks()";
- }
- };
- }
-
- /**
- *
- * @return always returns true.
- */
- public static Predicate<NetworkOffering> any() {
- return alwaysTrue();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java
deleted file mode 100644
index 0b89bc4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkService;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-
-public class NetworkPredicates {
-
- public static enum HasFirewallServiceWhichSupportsStaticNAT implements Predicate<Network> {
- INSTANCE;
-
- @Override
- public boolean apply(Network arg0) {
- return Iterables.any(checkNotNull(arg0, "network").getServices(), supportsStaticNAT);
- }
-
- @Override
- public String toString() {
- return supportsStaticNAT.toString();
- }
- }
-
- public static enum HasFirewallServiceWhichSupportsPortForwarding implements Predicate<Network> {
- INSTANCE;
-
- @Override
- public boolean apply(Network arg0) {
- return Iterables.any(checkNotNull(arg0, "network").getServices(), supportsPortForwarding);
- }
-
- @Override
- public String toString() {
- return supportsPortForwarding.toString();
- }
- }
-
- public static enum HasLoadBalancerService implements Predicate<Network> {
- INSTANCE;
-
- @Override
- public boolean apply(Network arg0) {
- return Iterables.any(checkNotNull(arg0, "network").getServices(), isLoadBalancerService);
- }
-
- @Override
- public String toString() {
- return isLoadBalancerService.toString();
- }
- }
-
- public static enum IsVirtualNetwork implements Predicate<Network> {
- INSTANCE;
-
- @Override
- public boolean apply(Network arg0) {
- boolean network = isVirtualNetwork.apply(checkNotNull(arg0, "network").getGuestIPType());
- return network;
- }
-
- @Override
- public String toString() {
- return isVirtualNetwork.toString();
- }
- }
-
- public static enum IsSharedNetwork implements Predicate<Network> {
- INSTANCE;
-
- @Override
- public boolean apply(Network arg0) {
- boolean network = isSharedNetwork.apply(checkNotNull(arg0, "network").getGuestIPType());
- return network;
- }
-
- @Override
- public String toString() {
- return isSharedNetwork.toString();
- }
- }
-
- public static enum IsIsolatedNetwork implements Predicate<Network> {
- INSTANCE;
-
- @Override
- public boolean apply(Network arg0) {
- boolean network = isIsolatedNetwork.apply(checkNotNull(arg0, "network").getGuestIPType());
- return network;
- }
-
- @Override
- public String toString() {
- return isIsolatedNetwork.toString();
- }
- }
-
-
- private static class DefaultNetworkInZone implements Predicate<Network> {
- private final String zoneId;
-
- public DefaultNetworkInZone(String zoneId) {
- this.zoneId = zoneId;
- }
-
- @Override
- public boolean apply(Network network) {
- return network.getZoneId().equals(zoneId) && network.isDefault();
- }
- }
-
- public static class NetworkServiceNamed implements Predicate<NetworkService> {
- private final String name;
-
- public NetworkServiceNamed(String name) {
- this.name = checkNotNull(name, "name");
- }
-
- @Override
- public boolean apply(NetworkService input) {
- return name.equals(checkNotNull(input, "networkService").getName());
- }
-
- @Override
- public String toString() {
- return "networkServiceNamed(" + name + ")";
- }
- }
-
- public static class GuestIPTypeIs implements Predicate<GuestIPType> {
- private final GuestIPType guestIPType;
-
- public GuestIPTypeIs(GuestIPType guestIPType) {
- this.guestIPType = guestIPType;
- }
-
- @Override
- public boolean apply(GuestIPType guestIPType) {
- return guestIPType == this.guestIPType;
- }
-
- @Override
- public String toString() {
- return "guestIPTypeIs(" + guestIPType + ')';
- }
- }
-
- public static class CapabilitiesInclude implements Predicate<NetworkService> {
- private final String capability;
-
- public CapabilitiesInclude(String capability) {
- this.capability = checkNotNull(capability, "capability");
- }
-
- @Override
- public boolean apply(NetworkService input) {
- return "true".equals(input.getCapabilities().get(capability));
- }
-
- @Override
- public String toString() {
- return "capabilitiesInclude(" + capability + ")";
- }
- }
-
- public static final Predicate<NetworkService> supportsStaticNAT = Predicates.and(new NetworkServiceNamed("Firewall"),
- new CapabilitiesInclude("StaticNat"));
-
- public static final Predicate<NetworkService> supportsPortForwarding = Predicates.and(new NetworkServiceNamed("Firewall"),
- new CapabilitiesInclude("PortForwarding"));
-
- public static final Predicate<NetworkService> isLoadBalancerService = new NetworkServiceNamed("Lb");
-
- public static final Predicate<GuestIPType> isVirtualNetwork = new GuestIPTypeIs(GuestIPType.VIRTUAL);
-
- public static final Predicate<GuestIPType> isIsolatedNetwork = new GuestIPTypeIs(GuestIPType.ISOLATED);
-
- public static final Predicate<GuestIPType> isSharedNetwork = new GuestIPTypeIs(GuestIPType.SHARED);
-
- /**
- *
- * @return true, if the network supports static NAT.
- */
- public static Predicate<Network> supportsStaticNAT() {
- return HasFirewallServiceWhichSupportsStaticNAT.INSTANCE;
- }
-
- /**
- *
- * @return true, if the network supports port forwarding.
- */
- public static Predicate<Network> supportsPortForwarding() {
- return HasFirewallServiceWhichSupportsPortForwarding.INSTANCE;
- }
-
- /**
- *
- * @return true, if the network supports load balancing.
- */
- public static Predicate<Network> hasLoadBalancerService() {
- return HasLoadBalancerService.INSTANCE;
- }
-
- /**
- *
- * @return true, if the network is a virtual network.
- */
- public static Predicate<Network> isVirtualNetwork() {
- return IsVirtualNetwork.INSTANCE;
- }
-
- /**
- *
- * @return true, if the network is an isolated network.
- */
- public static Predicate<Network> isIsolatedNetwork() {
- return IsIsolatedNetwork.INSTANCE;
- }
-
- /**
- *
- * @return true, if the network is a shared network.
- */
- public static Predicate<Network> isSharedNetwork() {
- return IsSharedNetwork.INSTANCE;
- }
-
- /**
- * Filters for default networks in a specific zone.
- *
- * @param zoneId the ID of the required zone.
- * @return networks in the zone that have the default flag set.
- */
- public static Predicate<Network> defaultNetworkInZone(final String zoneId) {
- return new DefaultNetworkInZone(zoneId);
- }
-
- /**
- *
- * @return always returns true.
- */
- public static Predicate<Network> any() {
- return Predicates.alwaysTrue();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java
deleted file mode 100644
index 48397d8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Template;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.Maps;
-
-@Singleton
-public class OSCategoryIn implements Function<Set<String>, Predicate<Template>> {
- private final Supplier<Map<String, String>> categoriesSupplier;
- private final Supplier<Set<OSType>> osTypesSupplier;
-
- @Inject
- public OSCategoryIn(CloudStackApi client) {
- this(Suppliers.ofInstance(checkNotNull(client, "client").getGuestOSApi().listOSCategories()), Suppliers
- .ofInstance(client.getGuestOSApi().listOSTypes()));
- }
-
- public OSCategoryIn(Supplier<Map<String, String>> categoriesSupplier, Supplier<Set<OSType>> osTypesSupplier) {
- this.categoriesSupplier = checkNotNull(categoriesSupplier, "categoriesSupplier");
- this.osTypesSupplier = checkNotNull(osTypesSupplier, "osTypesSupplier");
- }
-
- @Override
- public Predicate<Template> apply(final Set<String> acceptableCategories) {
- final Map<String, String> categories = categoriesSupplier.get();
- final Set<String> acceptableOSTypeIds = Maps.filterValues(
- Maps.transformValues(Maps.uniqueIndex(osTypesSupplier.get(), new Function<OSType, String>() {
-
- @Override
- public String apply(OSType input) {
- return input.getId();
- }
-
- }), new Function<OSType, String>() {
-
- @Override
- public String apply(OSType input) {
- return categories.get(input.getOSCategoryId());
- }
-
- }), Predicates.in(acceptableCategories)).keySet();
- return new Predicate<Template>() {
-
- @Override
- public boolean apply(Template input) {
- return Predicates.in(acceptableOSTypeIds).apply(input.getOSTypeId());
- }
-
- @Override
- public String toString() {
- return "OSCategoryIn(" + acceptableCategories + ")";
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java
deleted file mode 100644
index a58ba47..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
-public class PublicIPAddressPredicates {
-
- public static final class AssociatedWithNetwork implements Predicate<PublicIPAddress> {
- private final String networkId;
-
- public AssociatedWithNetwork(String networkId) {
- this.networkId = checkNotNull(networkId, "networkId");
- }
-
- @Override
- public boolean apply(PublicIPAddress input) {
- return networkId.equals(checkNotNull(input, "ipaddress").getAssociatedNetworkId());
- }
-
- @Override
- public String toString() {
- return "associatedWithNetwork(" + networkId + ")";
- }
- }
-
- public static enum Available implements Predicate<PublicIPAddress> {
- INSTANCE;
-
- @Override
- public boolean apply(PublicIPAddress arg0) {
- return !checkNotNull(arg0, "ipaddress").isSourceNAT() && !arg0.isStaticNAT()
- && arg0.getVirtualMachineId() == null && arg0.getState() == PublicIPAddress.State.ALLOCATED;
- }
-
- @Override
- public String toString() {
- return "available()";
- }
- }
-
- /**
- *
- * @return true, if the public ip address is not assigned to a VM or NAT rule
- */
- public static Predicate<PublicIPAddress> available() {
- return Available.INSTANCE;
- }
-
- /**
- *
- * @return true, if the public ip address is associated with the specified
- * network
- */
- public static Predicate<PublicIPAddress> associatedWithNetwork(final String networkId) {
- return new AssociatedWithNetwork(networkId);
- }
-
- /**
- *
- * @return always returns true.
- */
- public static Predicate<PublicIPAddress> any() {
- return Predicates.alwaysTrue();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
deleted file mode 100644
index 4796d01..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.alwaysTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Multimap;
-
-public class SecurityGroupPredicates {
- /**
- *
- * @return true, if the security group contains an ingress rule with the given port in the port range
- */
- public static Predicate<SecurityGroup> portInRange(final int port) {
- return new Predicate<SecurityGroup>() {
-
- @Override
- public boolean apply(SecurityGroup group) {
- return Iterables.any(group.getIngressRules(), new Predicate<IngressRule>() {
- @Override
- public boolean apply(IngressRule rule) {
- return rule.getStartPort() <= port && rule.getEndPort() >= port;
- }
- });
- }
-
- @Override
- public String toString() {
- return "portInRange(" + port + ")";
- }
- };
- }
-
- /**
- *
- * @return true, if the security group contains an ingress rule with the given cidr
- */
- public static Predicate<SecurityGroup> hasCidr(final String cidr) {
- return new Predicate<SecurityGroup>() {
-
- @Override
- public boolean apply(SecurityGroup group) {
- return Iterables.any(group.getIngressRules(), new Predicate<IngressRule>() {
- @Override
- public boolean apply(IngressRule rule) {
- return rule.getCIDR() != null
- && rule.getCIDR().equals(cidr);
- }
- });
- }
-
- @Override
- public String toString() {
- return "hasCidr(" + cidr + ")";
- }
- };
- }
-
- /**
- *
- * @return true, if the security group contains an ingress rule with the given cidr and the given port in range
- */
- public static Predicate<SecurityGroup> portInRangeForCidr(final int port, final String cidr) {
- return new Predicate<SecurityGroup>() {
-
- @Override
- public boolean apply(SecurityGroup group) {
- return Iterables.any(group.getIngressRules(), new Predicate<IngressRule>() {
- @Override
- public boolean apply(IngressRule rule) {
- return rule.getCIDR() != null
- && rule.getCIDR().equals(cidr)
- && rule.getStartPort() <= port
- && rule.getEndPort() >= port;
- }
- });
- }
-
- @Override
- public String toString() {
- return "portInRangeForCidr(" + port + ", " + cidr + ")";
- }
- };
- }
-
- /**
- *
- * @return always returns true.
- */
- public static Predicate<SecurityGroup> any() {
- return alwaysTrue();
- }
-
- /**
- * matches name of the given security group
- *
- * @param name
- * @return predicate that matches name
- */
- public static Predicate<SecurityGroup> nameEquals(final String name) {
- checkNotNull(name, "name must be defined");
-
- return new Predicate<SecurityGroup>() {
- @Override
- public boolean apply(SecurityGroup ext) {
- return name.equals(ext.getName());
- }
-
- @Override
- public String toString() {
- return "nameEquals(" + name + ")";
- }
- };
- }
-
-
- /**
- * matches name of the given security group
- *
- * @param name
- * @return predicate that matches name
- */
- public static Predicate<SecurityGroup> nameMatches(final Predicate<String> name) {
- checkNotNull(name, "name must be defined");
-
- return new Predicate<SecurityGroup>() {
- @Override
- public boolean apply(SecurityGroup ext) {
- return name.apply(ext.getName());
- }
-
- @Override
- public String toString() {
- return "nameMatches(" + name + ")";
- }
- };
- }
-
- /**
- * matches IngressRules with the given protocol, start and end port, and
- * any of the given CIDRs.
- *
- * @param protocol
- * @param startPort
- * @param endPort
- * @param cidrs
- *
- * @return predicate that matches as described
- */
- public static Predicate<IngressRule> ruleCidrMatches(final String protocol,
- final int startPort,
- final int endPort,
- final Set<String> cidrs) {
- checkNotNull(protocol, "protocol");
- checkNotNull(cidrs, "cidrs");
-
- return new Predicate<IngressRule>() {
- @Override
- public boolean apply(IngressRule rule) {
- return protocol.equals(rule.getProtocol())
- && startPort == rule.getStartPort()
- && endPort == rule.getEndPort()
- && cidrs.contains(rule.getCIDR());
- }
-
- @Override
- public String toString() {
- return "ruleCidrMatches(protocol:" + protocol
- + ",startPort:" + startPort
- + ",endPort:" + endPort
- + ",cidrs:[" + cidrs
- + "])";
- }
- };
- }
-
- /**
- * matches IngressRules with the given protocol, start and end port, and
- * any of the given account/security group name pairs.
- *
- * @param protocol
- * @param startPort
- * @param endPort
- * @param accountGroupNames
- *
- * @return predicate that matches as described
- */
- public static Predicate<IngressRule> ruleGroupMatches(final String protocol,
- final int startPort,
- final int endPort,
- final Multimap<String, String> accountGroupNames) {
- checkNotNull(protocol, "protocol");
- checkNotNull(accountGroupNames, "accountGroupNames");
-
- return new Predicate<IngressRule>() {
- @Override
- public boolean apply(IngressRule rule) {
- return protocol.equals(rule.getProtocol())
- && startPort == rule.getStartPort()
- && endPort == rule.getEndPort()
- && accountGroupNames.containsEntry(rule.getAccount(), rule.getSecurityGroupName());
- }
-
- @Override
- public String toString() {
- return "ruleGroupMatches(protocol:" + protocol
- + ",startPort:" + startPort
- + ",endPort:" + endPort
- + ",accountGroupNames:[" + accountGroupNames
- + "])";
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SshKeyPairPredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SshKeyPairPredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SshKeyPairPredicates.java
deleted file mode 100644
index 72f34b0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/SshKeyPairPredicates.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.cloudstack.domain.SshKeyPair;
-
-import com.google.common.base.Predicate;
-
-/**
- * Predicates handy when working with SshKeyPairs
- */
-
-public class SshKeyPairPredicates {
-
-
- /**
- * matches name of the given key pair
- *
- * @param name
- * @return predicate that matches name
- */
- public static Predicate<SshKeyPair> nameMatches(final Predicate<String> name) {
- checkNotNull(name, "name must be defined");
-
- return new Predicate<SshKeyPair>() {
- @Override
- public boolean apply(SshKeyPair ext) {
- return name.apply(ext.getName());
- }
-
- @Override
- public String toString() {
- return "nameMatches(" + name + ")";
- }
- };
- }
-
- /**
- * matches name of the given keypair starts with the specified prefix
- *
- * @param name the prefix you are looking for
- * @return the predicate
- */
- public static Predicate<SshKeyPair> nameEquals(final String name) {
- checkNotNull(name, "name must be defined");
-
- return new Predicate<SshKeyPair>() {
- @Override
- public boolean apply(SshKeyPair ext) {
- return ext.getName() != null && ext.getName().equals(name);
- }
-
- @Override
- public String toString() {
- return "nameEquals(" + name + ")";
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java
deleted file mode 100644
index 341356c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.Template;
-
-import com.google.common.base.Predicate;
-
-@Singleton
-public class TemplatePredicates {
- public static Predicate<Template> isReady() {
- return Ready.INSTANCE;
- }
-
- public enum Ready implements Predicate<Template> {
- INSTANCE;
- @Override
- public boolean apply(Template arg0) {
- return arg0.isReady();
- }
-
- @Override
- public String toString() {
- return "isReady()";
- }
- }
-
- public static enum PasswordEnabled implements Predicate<Template> {
- INSTANCE;
-
- @Override
- public boolean apply(Template arg0) {
- return arg0.isPasswordEnabled();
- }
-
- @Override
- public String toString() {
- return "isPasswordEnabled()";
- }
- }
-
- public static Predicate<Template> isPasswordEnabled() {
- return PasswordEnabled.INSTANCE;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java
deleted file mode 100644
index b278cde..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.domain.Account.Type;
-
-import com.google.common.base.Predicate;
-
-public class UserPredicates {
-
- public static class ApiKeyEquals implements Predicate<User> {
- private final String apiKey;
-
- public ApiKeyEquals(String apiKey) {
- this.apiKey = checkNotNull(apiKey, "apiKey");
- }
-
- @Override
- public boolean apply(User input) {
- return apiKey.equals(checkNotNull(input, "user").getApiKey());
- }
-
- @Override
- public String toString() {
- return "apiKeyEquals(" + apiKey + ")";
- }
- }
-
- /**
- *
- * @return true, if the user's apiKey is the following
- */
- public static Predicate<User> apiKeyEquals(String apiKey) {
- return new ApiKeyEquals(apiKey);
- }
-
- /**
- *
- * @return true, if the user's account type is the following
- */
- public static Predicate<User> accountTypeEquals(Account.Type type) {
- return new AccountTypeEquals(type);
- }
-
- public static class AccountTypeEquals implements Predicate<User> {
- public AccountTypeEquals(Type type) {
- this.type = checkNotNull(type, "type");
- }
-
- private final Account.Type type;
-
- @Override
- public boolean apply(User input) {
- return checkNotNull(input, "user").getAccountType() == type;
- }
-
- @Override
- public String toString() {
- return "accountTypeEquals(" + type + ")";
- }
- }
-
- /**
- *
- * @return true, if the account has user privileges
- */
- public static Predicate<User> isUserAccount() {
- return accountTypeEquals(Account.Type.USER);
- }
-
- /**
- * @return true, is the user is a domain admin
- */
- public static Predicate<User> isDomainAdminAccount() {
- return accountTypeEquals(Type.DOMAIN_ADMIN);
- }
-
- /**
- *
- * @return true, if the user is a global admin
- */
- public static Predicate<User> isAdminAccount() {
- return accountTypeEquals(Account.Type.ADMIN);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java
deleted file mode 100644
index 7548e15..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.VirtualMachine.State;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.inject.Inject;
-
-/**
- *
- * Tests to see if a virtualMachine is running
- */
-@Singleton
-public class VirtualMachineDestroyed implements Predicate<VirtualMachine> {
-
- private final CloudStackApi client;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public VirtualMachineDestroyed(CloudStackApi client) {
- this.client = client;
- }
-
- public boolean apply(VirtualMachine virtualMachine) {
- logger.trace("looking for state on virtualMachine %s", checkNotNull(virtualMachine, "virtualMachine"));
- virtualMachine = refresh(virtualMachine);
- if (virtualMachine == null)
- return true;
- logger.trace("%s: looking for virtualMachine state %s: currently: %s", virtualMachine.getId(), State.DESTROYED,
- virtualMachine.getState());
- return virtualMachine.getState() == State.DESTROYED;
- }
-
- private VirtualMachine refresh(VirtualMachine virtualMachine) {
- return client.getVirtualMachineApi().getVirtualMachine(virtualMachine.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java
deleted file mode 100644
index daf3943..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.inject.Inject;
-
-/**
- *
- * Tests to see if a virtualMachine is expunged from the system
- */
-@Singleton
-public class VirtualMachineExpunged implements Predicate<VirtualMachine> {
-
- private final CloudStackApi client;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public VirtualMachineExpunged(CloudStackApi client) {
- this.client = client;
- }
-
- public boolean apply(VirtualMachine virtualMachine) {
- logger.trace("looking for state on virtualMachine %s", checkNotNull(virtualMachine, "virtualMachine"));
- return refresh(virtualMachine) == null;
- }
-
- private VirtualMachine refresh(VirtualMachine virtualMachine) {
- return client.getVirtualMachineApi().getVirtualMachine(virtualMachine.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java
deleted file mode 100644
index fe2c37e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.VirtualMachine.State;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.inject.Inject;
-
-/**
- *
- * Tests to see if a virtualMachine is running
- */
-@Singleton
-public class VirtualMachineRunning implements Predicate<VirtualMachine> {
-
- private final CloudStackApi client;
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject
- public VirtualMachineRunning(CloudStackApi client) {
- this.client = client;
- }
-
- public boolean apply(VirtualMachine virtualMachine) {
- logger.trace("looking for state on virtualMachine %s", checkNotNull(virtualMachine, "virtualMachine"));
- virtualMachine = refresh(virtualMachine);
- if (virtualMachine == null)
- return false;
- logger.trace("%s: looking for virtualMachine state %s: currently: %s", virtualMachine.getId(), State.RUNNING,
- virtualMachine.getState());
- if (virtualMachine.getState() == State.ERROR)
- throw new IllegalStateException("virtualMachine in error state: " + virtualMachine);
- return virtualMachine.getState() == State.RUNNING;
- }
-
- private VirtualMachine refresh(VirtualMachine virtualMachine) {
- return client.getVirtualMachineApi().getVirtualMachine(virtualMachine.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java
deleted file mode 100644
index ee44f69..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.alwaysTrue;
-
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-
-import com.google.common.base.Predicate;
-
-public class ZonePredicates {
- /**
- *
- * @return true, if the zone supports {@link NetworkType.ADVANCED}
- */
- public static Predicate<Zone> supportsAdvancedNetworks() {
- return new Predicate<Zone>() {
-
- @Override
- public boolean apply(Zone zone) {
- return NetworkType.ADVANCED.equals(checkNotNull(zone, "zone").getNetworkType());
- }
-
- @Override
- public String toString() {
- return "supportsAdvancedNetworks()";
- }
- };
- }
-
- /**
- *
- * @return true, if the zone supports security groups
- */
- public static Predicate<Zone> supportsSecurityGroups() {
- return new Predicate<Zone>() {
-
- @Override
- public boolean apply(Zone input) {
- return input.isSecurityGroupsEnabled();
- }
-
- @Override
- public String toString() {
- return "supportsSecurityGroups()";
- }
- };
- }
-
- /**
- *
- * @return always returns true.
- */
- public static Predicate<Zone> any() {
- return alwaysTrue();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java
deleted file mode 100644
index 83008b8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.strategy;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-
-@Singleton
-public class BlockUntilJobCompletesAndReturnResult {
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final CloudStackApi client;
- private final Predicate<String> jobComplete;
-
- @Inject
- public BlockUntilJobCompletesAndReturnResult(CloudStackApi client, Predicate<String> jobComplete) {
- this.client = checkNotNull(client, "client");
- this.jobComplete = checkNotNull(jobComplete, "jobComplete");
- }
-
- /**
- *
- * @param job
- * @return result of the job's execution
- * @throws ExecutionException
- * if the job contained an error
- */
- public <T> T apply(AsyncCreateResponse job) {
- boolean completed = jobComplete.apply(job.getJobId());
- logger.trace("<< job(%s) complete(%s)", job, completed);
- AsyncJob<T> jobWithResult = client.getAsyncJobApi().<T> getAsyncJob(job.getJobId());
- checkState(completed, "job %s failed to complete in time %s", job.getJobId(), jobWithResult);
- if (jobWithResult.getError() != null)
- throw new UncheckedExecutionException(String.format("job %s failed with exception %s", job.getJobId(),
- jobWithResult.getError().toString())) {
- };
- return jobWithResult.getResult();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java
deleted file mode 100644
index 8f65ab1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.suppliers;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.NoSuchElementException;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.predicates.UserPredicates;
-import org.jclouds.domain.Credentials;
-import org.jclouds.location.Provider;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.collect.Iterables;
-
-public class GetCurrentUser implements Supplier<User> {
-
- @Resource
- protected Logger logger = Logger.NULL;
-
- private final CloudStackApi client;
- private final Supplier<Credentials> creds;
-
- @Inject
- public GetCurrentUser(CloudStackApi client, @Provider Supplier<Credentials> creds) {
- this.client = checkNotNull(client, "client");
- this.creds = checkNotNull(creds, "creds");
- }
-
- @Override
- public User get() {
- Iterable<User> users = Iterables.concat(client.getAccountApi().listAccounts());
- Predicate<User> apiKeyMatches = UserPredicates.apiKeyEquals(creds.get().identity);
- User currentUser = null;
- try {
- currentUser = Iterables.find(users, apiKeyMatches);
- } catch (NoSuchElementException e) {
- throw new NoSuchElementException(String.format("none of the following users match %s: %s", apiKeyMatches,
- users));
- }
-
- return currentUser;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java
deleted file mode 100644
index 8ed3d50..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.suppliers;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.accountInDomain;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.features.NetworkApi;
-import org.jclouds.collect.Memoized;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-import com.google.common.collect.Maps;
-
-public class NetworksForCurrentUser implements Supplier<Map<String, Network>> {
- private final CloudStackApi client;
- private final Supplier<User> currentUserSupplier;
-
- @Inject
- public NetworksForCurrentUser(CloudStackApi client, @Memoized Supplier<User> currentUserSupplier) {
- this.client = checkNotNull(client, "client");
- this.currentUserSupplier = checkNotNull(currentUserSupplier, "currentUserSupplier");
- }
-
- @Override
- public Map<String, Network> get() {
- User currentUser = currentUserSupplier.get();
- NetworkApi networkClient = client.getNetworkApi();
- return Maps.uniqueIndex(
- networkClient.listNetworks(accountInDomain(currentUser.getAccount(), currentUser.getDomainId())),
- new Function<Network, String>() {
-
- @Override
- public String apply(Network arg0) {
- return arg0.getId();
- }
- });
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java
deleted file mode 100644
index ecfebf3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ProjectsForCurrentUser.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.suppliers;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.cloudstack.options.ListProjectsOptions.Builder.accountInDomain;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.Project;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.features.ProjectApi;
-import org.jclouds.collect.Memoized;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-import com.google.common.collect.Maps;
-
-public class ProjectsForCurrentUser implements Supplier<Map<String, Project>> {
- private final CloudStackApi api;
- private final Supplier<User> currentUserSupplier;
-
- @Inject
- public ProjectsForCurrentUser(CloudStackApi api, @Memoized Supplier<User> currentUserSupplier) {
- this.api = checkNotNull(api, "api");
- this.currentUserSupplier = checkNotNull(currentUserSupplier, "currentUserSupplier");
- }
-
- @Override
- public Map<String, Project> get() {
- User currentUser = currentUserSupplier.get();
- ProjectApi projectApi = api.getProjectApi();
- return Maps.uniqueIndex(
- projectApi.listProjects(accountInDomain(currentUser.getAccount(), currentUser.getDomainId())),
- new Function<Project, String>() {
-
- @Override
- public String apply(Project arg0) {
- return arg0.getId();
- }
- });
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java
deleted file mode 100644
index 4485d01..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.suppliers;
-
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-
-import java.util.concurrent.TimeUnit;
-
-import javax.inject.Named;
-
-import org.jclouds.cloudstack.domain.Zone;
-
-import com.google.common.base.Supplier;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.inject.Inject;
-
-/**
- * Supplies a cache that maps from zone IDs to zones.
- */
-public class ZoneIdToZoneSupplier implements Supplier<LoadingCache<String, Zone>> {
- private final LoadingCache<String, Zone> cache;
-
- @Inject
- public ZoneIdToZoneSupplier(CacheLoader<String, Zone> zoneIdToZone, @Named(PROPERTY_SESSION_INTERVAL) long expirationSecs) {
- cache = CacheBuilder.newBuilder().expireAfterWrite(expirationSecs, TimeUnit.SECONDS).build(zoneIdToZone);
- }
-
- @Override
- public LoadingCache<String, Zone> get() {
- return cache;
- }
-}
[35/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java
deleted file mode 100644
index c26c394..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.io.BaseEncoding.base64;
-
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.spec.KeySpec;
-import java.util.regex.Pattern;
-
-import javax.crypto.Cipher;
-
-import org.jclouds.cloudstack.domain.EncryptedPasswordAndPrivateKey;
-import org.jclouds.crypto.Crypto;
-import org.jclouds.crypto.Pems;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.Function;
-import com.google.common.base.Throwables;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-/**
- * Given an encrypted Windows Administrator password and the decryption key, return a LoginCredentials instance.
- */
-@Singleton
-public class WindowsLoginCredentialsFromEncryptedData implements Function<EncryptedPasswordAndPrivateKey, LoginCredentials> {
-
- private final Crypto crypto;
-
- @Inject
- public WindowsLoginCredentialsFromEncryptedData(Crypto crypto) {
- this.crypto = crypto;
- }
-
- private static final Pattern whitespace = Pattern.compile("\\s");
-
- @Override
- public LoginCredentials apply(@Nullable EncryptedPasswordAndPrivateKey dataAndKey) {
- if (dataAndKey == null)
- return null;
- try {
- KeySpec keySpec = Pems.privateKeySpec(dataAndKey.getPrivateKey());
- KeyFactory kf = crypto.rsaKeyFactory();
- PrivateKey privKey = kf.generatePrivate(keySpec);
-
- Cipher cipher = crypto.cipher("RSA");
- cipher.init(Cipher.DECRYPT_MODE, privKey);
- byte[] cipherText = base64().decode(whitespace.matcher(dataAndKey.getEncryptedPassword()).replaceAll(""));
- byte[] plainText = cipher.doFinal(cipherText);
- String password = new String(plainText, UTF_8);
-
- return LoginCredentials.builder()
- .user("Administrator")
- .password(password)
- .noPrivateKey()
- .build();
-
- } catch (Exception e) {
- throw Throwables.propagate(e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java
deleted file mode 100644
index 6e18605..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.features.ZoneApi;
-
-import com.google.common.cache.CacheLoader;
-import com.google.inject.Inject;
-
-/**
- * Defines a cache that allows a zone to be looked up by its ID.
- */
-public class ZoneIdToZone extends CacheLoader<String, Zone> {
-
- private final ZoneApi zoneClient;
-
- @Inject
- public ZoneIdToZone(CloudStackApi client) {
- checkNotNull(client, "client");
- this.zoneClient = client.getZoneApi();
- }
-
- @Override
- public Zone load(String zoneId) throws Exception {
- checkNotNull(zoneId, "zoneId");
- return zoneClient.getZone(zoneId);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java
deleted file mode 100644
index 6c6f886..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.handlers;
-
-import java.io.IOException;
-
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpErrorHandler;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpResponseException;
-import org.jclouds.logging.Logger;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.InsufficientResourcesException;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.util.Closeables2;
-import org.jclouds.util.Strings2;
-
-import com.google.common.base.Throwables;
-
-@Singleton
-public class CloudStackErrorHandler implements HttpErrorHandler {
- @Resource
- protected Logger logger = Logger.NULL;
-
- public void handleError(HttpCommand command, HttpResponse response) {
- // it is important to always read fully and close streams
- String message = parseMessage(response);
- Exception exception = message != null ? new HttpResponseException(command, response, message)
- : new HttpResponseException(command, response);
- try {
- message = message != null ? message : String.format("%s -> %s", command.getCurrentRequest().getRequestLine(),
- response.getStatusLine());
- switch (response.getStatusCode()) {
- case 400:
- exception = new IllegalArgumentException(message, exception);
- break;
- case 531:
- case 401:
- exception = new AuthorizationException(message, exception);
- break;
- case 404:
- if (!command.getCurrentRequest().getMethod().equals("DELETE")) {
- exception = new ResourceNotFoundException(message, exception);
- }
- break;
- case 405:
- exception = new IllegalArgumentException(message, exception);
- break;
- case 409:
- case 431:
- if (message.contains("does not exist")) {
- exception = new ResourceNotFoundException(message, exception);
- } else {
- exception = new IllegalStateException(message, exception);
- }
- break;
- case 534:
- if (message.contains("Maximum number of resources of type")) {
- exception = new InsufficientResourcesException(message, exception);
- }
- break;
- case 537:
- exception = new IllegalStateException(message, exception);
- break;
- }
- } finally {
- Closeables2.closeQuietly(response.getPayload());
- command.setException(exception);
- }
- }
-
- public String parseMessage(HttpResponse response) {
- if (response.getPayload() == null)
- return null;
- try {
- return Strings2.toStringAndClose(response.getPayload().openStream());
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- try {
- response.getPayload().getInput().close();
- } catch (IOException e) {
- Throwables.propagate(e);
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java
deleted file mode 100644
index 119e6b5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.handlers;
-
-import static org.jclouds.http.HttpUtils.releasePayload;
-
-import javax.annotation.PreDestroy;
-
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.features.SessionApi;
-import org.jclouds.domain.Credentials;
-import org.jclouds.http.HttpCommand;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
-
-import com.google.common.cache.LoadingCache;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-/**
- * This will parse and set an appropriate exception on the command object.
- */
-@Singleton
-public class InvalidateSessionAndRetryOn401AndLogoutOnClose extends BackoffLimitedRetryHandler {
- private final LoadingCache<Credentials, LoginResponse> authenticationResponseCache;
- private final SessionApi sessionClient;
-
- @Inject
- protected InvalidateSessionAndRetryOn401AndLogoutOnClose(LoadingCache<Credentials, LoginResponse> authenticationResponseCache,
- SessionApi sessionClient) {
- this.authenticationResponseCache = authenticationResponseCache;
- this.sessionClient = sessionClient;
- }
-
- @Override
- public boolean shouldRetryRequest(HttpCommand command, HttpResponse response) {
- try {
- switch (response.getStatusCode()) {
- case 401:
- authenticationResponseCache.invalidateAll();
- return super.shouldRetryRequest(command, response);
- }
- return false;
-
- } finally {
- releasePayload(response);
- }
- }
-
- /**
- * it is important that we close any sessions on close to help the server not become overloaded.
- */
- @PreDestroy
- public void logoutOnClose() {
- for (LoginResponse s : authenticationResponseCache.asMap().values()) {
- try {
- sessionClient.logoutUser(s.getSessionKey());
- } catch (Exception e) {
- logger.error(e, "error logging out session %s", s.getSessionKey());
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java
deleted file mode 100644
index 962b751..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/internal/CloudStackContextImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.internal;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.Context;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.CloudStackDomainApi;
-import org.jclouds.cloudstack.CloudStackGlobalApi;
-import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.Utils;
-import org.jclouds.compute.internal.ComputeServiceContextImpl;
-import org.jclouds.location.Provider;
-import org.jclouds.rest.ApiContext;
-
-import com.google.common.reflect.TypeToken;
-
-@Singleton
-public class CloudStackContextImpl extends ComputeServiceContextImpl implements CloudStackContext {
- private final CloudStackApi client;
- private final ApiContext<CloudStackDomainApi> domainContext;
- private final ApiContext<CloudStackGlobalApi> globalContext;
-
- @Inject
- CloudStackContextImpl(@Provider Context backend, @Provider TypeToken<? extends Context> backendType,
- ComputeService computeService, Utils utils, CloudStackApi client,
- ApiContext<CloudStackDomainApi> domainContext,
- ApiContext<CloudStackGlobalApi> globalContext) {
- super(backend, backendType, computeService, utils);
- this.client = client;
- this.domainContext = domainContext;
- this.globalContext = globalContext;
- }
-
- @Override
- public CloudStackApi getApi() {
- return client;
- }
-
- @Override
- public CloudStackDomainApi getDomainApi() {
- return domainContext.getApi();
- }
-
- @Override
- public CloudStackGlobalApi getGlobalApi() {
- return globalContext.getApi();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java
deleted file mode 100644
index 9d6ca1b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/loaders/LoginWithPasswordCredentials.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.loaders;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.hash.Hashing.md5;
-import static com.google.common.io.BaseEncoding.base16;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.features.SessionApi;
-import org.jclouds.domain.Credentials;
-
-import com.google.common.cache.CacheLoader;
-
-@Singleton
-public class LoginWithPasswordCredentials extends CacheLoader<Credentials, LoginResponse> {
- private final SessionApi client;
-
- @Inject
- public LoginWithPasswordCredentials(SessionApi client) {
- this.client = client;
- }
-
- @Override
- public LoginResponse load(Credentials input) {
- String username = input.identity;
- String domain = ""; // empty = ROOT domain
-
- // domain may be present
- if (username.indexOf('/') != -1) {
- // username may not end with slash!
- domain = username.substring(0, username.lastIndexOf('/'));
- username = username.substring(username.lastIndexOf('/') + 1, username.length());
- }
- String hashedPassword = base16().lowerCase().encode(md5().hashString(input.credential, UTF_8).asBytes());
- return client.loginUserInDomainWithHashOfPassword(username, domain, hashedPassword);
- }
-
- @Override
- public String toString() {
- return "loginWithPasswordCredentials()";
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java
deleted file mode 100644
index 9d990da..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for services that apply to accounts in domains
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-public class AccountInDomainOptions extends BaseHttpRequestOptions {
-
- public static final AccountInDomainOptions NONE = new AccountInDomainOptions();
-
- /**
- *
- * @param account
- * an optional account for the resource
- * @param domain
- * domain id
- */
- public AccountInDomainOptions accountInDomain(String account, String domain) {
- this.queryParameters.replaceValues("account", ImmutableSet.of(account));
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domain + ""));
- return this;
- }
-
- /**
- * @param domainId
- * The domain for the resource
- */
- public AccountInDomainOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
-
- }
-
- public static class Builder {
- /**
- * @see AccountInDomainOptions#accountInDomain
- */
- public static AccountInDomainOptions accountInDomain(String account, String domain) {
- AccountInDomainOptions options = new AccountInDomainOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see AccountInDomainOptions#domainId
- */
- public static AccountInDomainOptions domainId(String domainId) {
- AccountInDomainOptions options = new AccountInDomainOptions();
- return options.domainId(domainId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java
deleted file mode 100644
index ff24415..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalHostApi.addHost() API call
- */
-public class AddClusterOptions extends BaseHttpRequestOptions {
-
- public static final AddClusterOptions NONE = new AddClusterOptions();
-
- /**
- * @param allocationState Allocation state of this Host for allocation of new resources
- */
- public AddClusterOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- /**
- * @param password the password for the host
- */
- public AddClusterOptions password(String password) {
- this.queryParameters.replaceValues("password", ImmutableSet.of(password));
- return this;
- }
-
- /**
- * @param podId the Pod ID for the host
- */
- public AddClusterOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- /**
- * @param url the URL
- */
- public AddClusterOptions url(String url) {
- this.queryParameters.replaceValues("url", ImmutableSet.of(url));
- return this;
- }
-
- /**
- * @param username the username for the cluster
- */
- public AddClusterOptions username(String username) {
- this.queryParameters.replaceValues("username", ImmutableSet.of(username));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param allocationState Allocation state of this Host for allocation of new resources
- */
- public static AddClusterOptions allocationState(AllocationState allocationState) {
- return new AddClusterOptions().allocationState(allocationState);
- }
-
- /**
- * @param password the password for the host
- */
- public static AddClusterOptions password(String password) {
- return new AddClusterOptions().password(password);
- }
-
- /**
- * @param podId the Pod ID for the host
- */
- public static AddClusterOptions podId(String podId) {
- return new AddClusterOptions().podId(podId);
- }
-
- /**
- * @param url the URL
- */
- public static AddClusterOptions url(String url) {
- return new AddClusterOptions().url(url);
- }
-
- /**
- * @param username the username for the cluster
- */
- public static AddClusterOptions username(String username) {
- return new AddClusterOptions().username(username);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java
deleted file mode 100644
index 49037ad..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalHostApi.addHost() API call
- */
-public class AddHostOptions extends BaseHttpRequestOptions {
-
- public static final AddHostOptions NONE = new AddHostOptions();
-
- /**
- * @param allocationState Allocation state of this Host for allocation of new resources
- */
- public AddHostOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- /**
- * @param clusterId the cluster ID for the host
- */
- public AddHostOptions clusterId(String clusterId) {
- this.queryParameters.replaceValues("clusterid", ImmutableSet.of(clusterId + ""));
- return this;
- }
-
- /**
- * @param clusterName the cluster name for the host
- */
- public AddHostOptions clusterName(String clusterName) {
- this.queryParameters.replaceValues("clustername", ImmutableSet.of(clusterName));
- return this;
- }
-
- /**
- * @param hostTags list of tags to be added to the host
- */
- public AddHostOptions hostTags(Set<String> hostTags) {
- this.queryParameters.replaceValues("hosttags", ImmutableSet.of(Joiner.on(',').join(hostTags)));
- return this;
- }
-
- /**
- * @param podId the Pod ID for the host
- */
- public AddHostOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param allocationState Allocation state of this Host for allocation of new resources
- */
- public static AddHostOptions allocationState(AllocationState allocationState) {
- return new AddHostOptions().allocationState(allocationState);
- }
-
- /**
- * @param clusterId the cluster ID for the host
- */
- public static AddHostOptions clusterId(String clusterId) {
- return new AddHostOptions().clusterId(clusterId);
- }
-
- /**
- * @param clusterName the cluster name for the host
- */
- public static AddHostOptions clusterName(String clusterName) {
- return new AddHostOptions().clusterName(clusterName);
- }
-
- /**
- * @param hostTags list of tags to be added to the host
- */
- public static AddHostOptions hostTags(Set<String> hostTags) {
- return new AddHostOptions().hostTags(hostTags);
- }
-
- /**
- * @param podId the Pod ID for the host
- */
- public static AddHostOptions podId(String podId) {
- return new AddHostOptions().podId(podId);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java
deleted file mode 100644
index 4e5b718..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the GlobalHostApi.addSecondaryStorage() API call
- */
-public class AddSecondaryStorageOptions extends BaseHttpRequestOptions {
-
- public static final AddSecondaryStorageOptions NONE = new AddSecondaryStorageOptions();
-
- /**
- * @param zoneId
- * the ID of the zone
- */
- public AddSecondaryStorageOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param zoneId
- * the ID of the zone
- */
- public static AddSecondaryStorageOptions zoneId(String zoneId) {
- return new AddSecondaryStorageOptions().zoneId(zoneId);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssignVirtualMachineOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssignVirtualMachineOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssignVirtualMachineOptions.java
deleted file mode 100644
index 26c5e64..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssignVirtualMachineOptions.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Options used to control what disk offerings are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/3.0.3/api_3.0.3/root_admin/assignVirtualMachine.html"
- * />
- */
-public class AssignVirtualMachineOptions extends AccountInDomainOptions {
-
- public static final AssignVirtualMachineOptions NONE = new AssignVirtualMachineOptions();
-
- /**
- * @param networkId
- * network id used by virtual machine
- */
- public AssignVirtualMachineOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkids", ImmutableSet.of(networkId + ""));
- return this;
- }
-
- /**
- * @param networkIds
- * network ids used by virtual machine
- */
- public AssignVirtualMachineOptions networkIds(Iterable<String> networkIds) {
- this.queryParameters.replaceValues("networkids", ImmutableSet.of(Joiner.on(',').join(networkIds)));
- return this;
- }
-
- public Iterable<String> getNetworkIds() {
- if (queryParameters.get("networkids").size() == 1) {
- return Iterables.transform(
- Splitter.on(",").split(Iterables.getOnlyElement(queryParameters.get("networkids"))),
- new Function<String, String>() {
-
- @Override
- public String apply(String arg0) {
- return arg0;
- }
-
- });
- } else {
- return ImmutableSet.<String> of();
- }
- }
-
- /**
- * @param securityGroupId
- * security group applied to the virtual machine. Should be passed
- * only when vm is created from a zone with Basic Network support
- */
- public AssignVirtualMachineOptions securityGroupId(String securityGroupId) {
- this.queryParameters.replaceValues("securitygroupids", ImmutableSet.of(securityGroupId + ""));
- return this;
- }
-
- /**
- * @param securityGroupIds
- * security groups applied to the virtual machine. Should be passed
- * only when vm is created from a zone with Basic Network support
- */
- public AssignVirtualMachineOptions securityGroupIds(Iterable<String> securityGroupIds) {
- this.queryParameters.replaceValues("securitygroupids", ImmutableSet.of(Joiner.on(',').join(securityGroupIds)));
- return this;
- }
-
- public static class Builder {
- /**
- * @see AssignVirtualMachineOptions#networkId
- */
- public static AssignVirtualMachineOptions networkId(String id) {
- AssignVirtualMachineOptions options = new AssignVirtualMachineOptions();
- return options.networkId(id);
- }
-
- /**
- * @see AssignVirtualMachineOptions#networkIds
- */
- public static AssignVirtualMachineOptions networkIds(Iterable<String> networkIds) {
- AssignVirtualMachineOptions options = new AssignVirtualMachineOptions();
- return options.networkIds(networkIds);
- }
-
- /**
- * @see AssignVirtualMachineOptions#securityGroupId
- */
- public static AssignVirtualMachineOptions securityGroupId(String id) {
- AssignVirtualMachineOptions options = new AssignVirtualMachineOptions();
- return options.securityGroupId(id);
- }
-
- /**
- * @see AssignVirtualMachineOptions#securityGroupIds
- */
- public static AssignVirtualMachineOptions securityGroupIds(Iterable<String> securityGroupIds) {
- AssignVirtualMachineOptions options = new AssignVirtualMachineOptions();
- return options.securityGroupIds(securityGroupIds);
- }
-
- /**
- * @see AssignVirtualMachineOptions#accountInDomain
- */
- public static AssignVirtualMachineOptions accountInDomain(String account, String domain) {
- AssignVirtualMachineOptions options = new AssignVirtualMachineOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see AssignVirtualMachineOptions#domainId
- */
- public static AssignVirtualMachineOptions domainId(String domainId) {
- AssignVirtualMachineOptions options = new AssignVirtualMachineOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public AssignVirtualMachineOptions accountInDomain(String account, String domain) {
- return AssignVirtualMachineOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public AssignVirtualMachineOptions domainId(String domainId) {
- return AssignVirtualMachineOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java
deleted file mode 100644
index a4d507c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to acquire and associate a public IP to an account.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/associateIpAddress.html"
- * />
- */
-public class AssociateIPAddressOptions extends AccountInDomainOptions {
-
- public static final AssociateIPAddressOptions NONE = new AssociateIPAddressOptions();
-
- /**
- * @param networkId
- * The network this ip address should be associated to.
- */
- public AssociateIPAddressOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkid", ImmutableSet.of(networkId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * Project for the IP
- */
- public AssociateIPAddressOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see AssociateIPAddressOptions#networkId
- */
- public static AssociateIPAddressOptions networkId(String networkId) {
- AssociateIPAddressOptions options = new AssociateIPAddressOptions();
- return options.networkId(networkId);
- }
-
- /**
- * @see AssociateIPAddressOptions#accountInDomain
- */
- public static AssociateIPAddressOptions accountInDomain(String account, String domain) {
- AssociateIPAddressOptions options = new AssociateIPAddressOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see AssociateIPAddressOptions#domainId
- */
- public static AssociateIPAddressOptions domainId(String domainId) {
- AssociateIPAddressOptions options = new AssociateIPAddressOptions();
- return options.domainId(domainId);
- }
-
- /**
- * @see AssociateIPAddressOptions#projectId(String)
- */
- public static AssociateIPAddressOptions projectId(String projectId) {
- AssociateIPAddressOptions options = new AssociateIPAddressOptions();
- return options.projectId(projectId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public AssociateIPAddressOptions accountInDomain(String account, String domain) {
- return AssociateIPAddressOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public AssociateIPAddressOptions domainId(String domainId) {
- return AssociateIPAddressOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java
deleted file mode 100644
index b82e9ff..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Optional fields for account creation
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createAccount.html"
- * />
- */
-public class CreateAccountOptions extends BaseHttpRequestOptions {
-
- public static final CreateAccountOptions NONE = new CreateAccountOptions();
-
- /**
- * @param networkDomain network domain
- */
- public CreateAccountOptions networkDomain(String networkDomain) {
- this.queryParameters.replaceValues("networkdomain", ImmutableSet.of(networkDomain));
- return this;
- }
-
- /**
- * @param account an optional account for the resource
- */
- public CreateAccountOptions account(String account) {
- this.queryParameters.replaceValues("account", ImmutableSet.of(account));
- return this;
- }
-
- /**
- * @param domainId The domain for the resource
- */
- public CreateAccountOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
-
- }
-
- public static class Builder {
-
- /**
- * @see CreateAccountOptions#networkDomain
- */
- public static CreateAccountOptions networkDomain(String networkDomain) {
- CreateAccountOptions options = new CreateAccountOptions();
- return options.networkDomain(networkDomain);
- }
-
- /**
- * @see CreateAccountOptions#account
- */
- public static CreateAccountOptions account(String account) {
- CreateAccountOptions options = new CreateAccountOptions();
- return options.account(account);
- }
-
- /**
- * @see CreateAccountOptions#domainId
- */
- public static CreateAccountOptions domainId(String domainId) {
- CreateAccountOptions options = new CreateAccountOptions();
- return options.domainId(domainId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java
deleted file mode 100644
index 18c17c9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to control how disk offerings are created
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createDiskOffering.html"
- * />
- */
-public class CreateDiskOfferingOptions extends AccountInDomainOptions {
-
- public static final CreateDiskOfferingOptions NONE = new CreateDiskOfferingOptions();
-
- /**
- * @param customized
- * whether disk offering is custom or not
- */
- public CreateDiskOfferingOptions customized(boolean customized) {
- this.queryParameters.replaceValues("customized", ImmutableSet.<String>of(customized + ""));
- return this;
- }
-
- /**
- * @param diskSizeInGB
- * size of the disk offering in GB
- */
- public CreateDiskOfferingOptions diskSizeInGB(int diskSizeInGB) {
- this.queryParameters.replaceValues("disksize", ImmutableSet.<String>of(diskSizeInGB + ""));
- return this;
- }
-
- /**
- * @param tags
- * the tags for this service offering
- */
- public CreateDiskOfferingOptions tags(Set<String> tags) {
- this.queryParameters.replaceValues("tags", ImmutableSet.copyOf(tags));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see CreateDiskOfferingOptions#customized
- */
- public static CreateDiskOfferingOptions customized(boolean customized) {
- CreateDiskOfferingOptions options = new CreateDiskOfferingOptions();
- return options.customized(customized);
- }
-
- /**
- * @see CreateDiskOfferingOptions#diskSizeInGB
- */
- public static CreateDiskOfferingOptions diskSizeInGB(int diskSizeInGB) {
- CreateDiskOfferingOptions options = new CreateDiskOfferingOptions();
- return options.diskSizeInGB(diskSizeInGB);
- }
-
- /**
- * @see CreateDiskOfferingOptions#tags
- */
- public static CreateDiskOfferingOptions tags(Set<String> tags) {
- CreateDiskOfferingOptions options = new CreateDiskOfferingOptions();
- return options.tags(tags);
- }
-
- /**
- * @see CreateDiskOfferingOptions#accountInDomain
- */
- public static CreateDiskOfferingOptions accountInDomain(String account, String domain) {
- CreateDiskOfferingOptions options = new CreateDiskOfferingOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see CreateDiskOfferingOptions#domainId
- */
- public static CreateDiskOfferingOptions domainId(String domainId) {
- CreateDiskOfferingOptions options = new CreateDiskOfferingOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CreateDiskOfferingOptions accountInDomain(String account, String domain) {
- return CreateDiskOfferingOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CreateDiskOfferingOptions domainId(String domainId) {
- return CreateDiskOfferingOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java
deleted file mode 100644
index 17c65bb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a domain is created
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createDomain.html"
- * />
- */
-public class CreateDomainOptions extends BaseHttpRequestOptions {
-
- public static final CreateDomainOptions NONE = new CreateDomainOptions();
-
- /**
- * @param networkDomain
- * network domain for networks in the domain
- */
- public CreateDomainOptions networkDomain(String networkDomain) {
- this.queryParameters.replaceValues("networkdomain", ImmutableSet.of(networkDomain));
- return this;
- }
-
- /**
- * @param parentDomainId
- * the ID of the parent domain
- */
- public CreateDomainOptions parentDomainId(String parentDomainId) {
- this.queryParameters.replaceValues("parentdomainid", ImmutableSet.of(parentDomainId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see CreateDomainOptions#networkDomain
- */
- public static CreateDomainOptions networkDomain(String networkDomain) {
- CreateDomainOptions options = new CreateDomainOptions();
- return options.networkDomain(networkDomain);
- }
-
- /**
- * @see CreateDomainOptions#parentDomainId
- */
- public static CreateDomainOptions parentDomainId(String parentDomainId) {
- CreateDomainOptions options = new CreateDomainOptions();
- return options.parentDomainId(parentDomainId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java
deleted file mode 100644
index 5804be6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Set;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a firewall rule is created
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createFirewallRule.html"
- * />
- */
-public class CreateFirewallRuleOptions extends BaseHttpRequestOptions {
-
- public static final CreateFirewallRuleOptions NONE = new CreateFirewallRuleOptions();
-
- /**
- * @param CIDRs
- * the list of CIDRs to forward traffic from
- */
- public CreateFirewallRuleOptions CIDRs(Set<String> CIDRs) {
- this.queryParameters.replaceValues("cidrlist", ImmutableSet.of(Joiner.on(",").join(CIDRs)));
- return this;
- }
-
- /**
- * @param startPort
- * the starting port of firewall rule
- */
- public CreateFirewallRuleOptions startPort(int startPort) {
- this.queryParameters.replaceValues("startport", ImmutableSet.of(startPort + ""));
- return this;
- }
-
- /**
- * @param endPort
- * the ending port of firewall rule
- */
- public CreateFirewallRuleOptions endPort(int endPort) {
- this.queryParameters.replaceValues("endport", ImmutableSet.of(endPort + ""));
- return this;
- }
-
- /**
- * @param icmpCode
- * error code for this icmp message
- */
- public CreateFirewallRuleOptions icmpCode(String icmpCode) {
- this.queryParameters.replaceValues("icmpcode", ImmutableSet.of(icmpCode));
- return this;
- }
-
- /**
- * @param icmpType
- * type of the icmp message being sent
- */
- public CreateFirewallRuleOptions icmpType(String icmpType) {
- this.queryParameters.replaceValues("icmptype", ImmutableSet.of(icmpType));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see CreateFirewallRuleOptions#CIDRs
- */
- public static CreateFirewallRuleOptions CIDRs(Set<String> CIDRs) {
- CreateFirewallRuleOptions options = new CreateFirewallRuleOptions();
- return options.CIDRs(CIDRs);
- }
-
- /**
- * @see CreateFirewallRuleOptions#startPort
- */
- public static CreateFirewallRuleOptions startPort(int startPort) {
- CreateFirewallRuleOptions options = new CreateFirewallRuleOptions();
- return options.startPort(startPort);
- }
-
- /**
- * @see CreateFirewallRuleOptions#endPort
- */
- public static CreateFirewallRuleOptions endPort(int endPort) {
- CreateFirewallRuleOptions options = new CreateFirewallRuleOptions();
- return options.endPort(endPort);
- }
-
- /**
- * @see CreateFirewallRuleOptions#icmpCode
- */
- public static CreateFirewallRuleOptions icmpCode(String icmpCode) {
- CreateFirewallRuleOptions options = new CreateFirewallRuleOptions();
- return options.icmpCode(icmpCode);
- }
-
- /**
- * @see CreateFirewallRuleOptions#icmpType
- */
- public static CreateFirewallRuleOptions icmpType(String icmpType) {
- CreateFirewallRuleOptions options = new CreateFirewallRuleOptions();
- return options.icmpType(icmpType);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java
deleted file mode 100644
index 4229efa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to create an ip forwarding rule
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/createIpForwardingRule.html"
- * />
- */
-public class CreateIPForwardingRuleOptions extends BaseHttpRequestOptions {
-
- public static final CreateIPForwardingRuleOptions NONE = new CreateIPForwardingRuleOptions();
-
- /**
- * @param endPort
- * the end port for the rule
- */
- public CreateIPForwardingRuleOptions endPort(int endPort) {
- this.queryParameters.replaceValues("endport", ImmutableSet.of(endPort + ""));
- return this;
-
- }
-
- public static class Builder {
-
- /**
- * @see CreatePortForwardingRuleOptions#endPort
- */
- public static CreateIPForwardingRuleOptions endPort(int endPort) {
- CreateIPForwardingRuleOptions options = new CreateIPForwardingRuleOptions();
- return options.endPort(endPort);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java
deleted file mode 100644
index 1f826a0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Set;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what load balancer rules are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/user/createLoadBalancerRule.html"
- * />
- */
-public class CreateLoadBalancerRuleOptions extends AccountInDomainOptions {
-
- public static final CreateLoadBalancerRuleOptions NONE = new CreateLoadBalancerRuleOptions();
-
- /**
- * @param allowedSourceCIRDs the cidr list to forward traffic from
- */
- public CreateLoadBalancerRuleOptions allowedSourceCIDRs(Set<String> allowedSourceCIRDs) {
- this.queryParameters.replaceValues("cidrlist",
- ImmutableSet.of(Joiner.on(",").join(allowedSourceCIRDs)));
- return this;
- }
-
- /**
- * @param description the description of the load balancer rule
- */
- public CreateLoadBalancerRuleOptions description(String description) {
- this.queryParameters.replaceValues("description", ImmutableSet.of(description));
- return this;
- }
-
- /**
- * @param openFirewall if true, firewall rule for source/end pubic port is automatically
- * created; if false - firewall rule has to be created explicitly. Has value true by default
- */
- public CreateLoadBalancerRuleOptions openFirewall(boolean openFirewall) {
- this.queryParameters.replaceValues("openfirewall", ImmutableSet.of(openFirewall + ""));
- return this;
- }
-
- /**
- * @param zoneId the availability zone ID
- */
- public CreateLoadBalancerRuleOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see CreateLoadBalancerRuleOptions#allowedSourceCIDRs
- */
- public static CreateLoadBalancerRuleOptions allowedSourceCIDRs(Set<String> allowedSourceCIDRs) {
- CreateLoadBalancerRuleOptions options = new CreateLoadBalancerRuleOptions();
- return options.allowedSourceCIDRs(allowedSourceCIDRs);
- }
-
- /**
- * @see CreateLoadBalancerRuleOptions#description
- */
- public static CreateLoadBalancerRuleOptions description(String description) {
- CreateLoadBalancerRuleOptions options = new CreateLoadBalancerRuleOptions();
- return options.description(description);
- }
-
- /**
- * @see CreateLoadBalancerRuleOptions#openFirewall
- */
- public static CreateLoadBalancerRuleOptions openFirewall(boolean openFirewall) {
- CreateLoadBalancerRuleOptions options = new CreateLoadBalancerRuleOptions();
- return options.openFirewall(openFirewall);
- }
-
- /**
- * @see CreateLoadBalancerRuleOptions#zoneId
- */
- public static CreateLoadBalancerRuleOptions zoneId(String zoneId) {
- CreateLoadBalancerRuleOptions options = new CreateLoadBalancerRuleOptions();
- return options.zoneId(zoneId);
- }
-
- /**
- * @see CreateLoadBalancerRuleOptions#accountInDomain
- */
- public static CreateLoadBalancerRuleOptions accountInDomain(String account, String domain) {
- CreateLoadBalancerRuleOptions options = new CreateLoadBalancerRuleOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see CreateLoadBalancerRuleOptions#domainId
- */
- public static CreateLoadBalancerRuleOptions domainId(String id) {
- CreateLoadBalancerRuleOptions options = new CreateLoadBalancerRuleOptions();
- return options.domainId(id);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CreateLoadBalancerRuleOptions accountInDomain(String account, String domain) {
- return CreateLoadBalancerRuleOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CreateLoadBalancerRuleOptions domainId(String domainId) {
- return CreateLoadBalancerRuleOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java
deleted file mode 100644
index 2b75825..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Optional fields for network creation
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/user/createNetwork.html"
- * />
- */
-public class CreateNetworkOptions extends AccountInDomainOptions {
-
- public static final CreateNetworkOptions NONE = new CreateNetworkOptions();
-
- /**
- * @param isDefault
- * true if network is default, false otherwise
- */
- public CreateNetworkOptions isDefault(boolean isDefault) {
- this.queryParameters.replaceValues("isdefault", ImmutableSet.of(isDefault + ""));
- return this;
- }
-
- /**
- * @param isShared
- * true if network is shared across accounts in the Zone
- */
- public CreateNetworkOptions isShared(boolean isShared) {
- this.queryParameters.replaceValues("isshared", ImmutableSet.of(isShared + ""));
- return this;
- }
-
- /**
- * @param startIP
- * the beginning IP address in the VLAN IP range
- */
- public CreateNetworkOptions startIP(String startIP) {
- this.queryParameters.replaceValues("startip", ImmutableSet.of(startIP));
- return this;
- }
-
- /**
- * @param endIP
- * the ending IP address in the network IP range. If not specified, will be defaulted to startIP
- */
- public CreateNetworkOptions endIP(String endIP) {
- this.queryParameters.replaceValues("endip", ImmutableSet.of(endIP));
- return this;
- }
-
- /**
- * @param gateway
- * the gateway of the VLAN IP range
- */
- public CreateNetworkOptions gateway(String gateway) {
- this.queryParameters.replaceValues("gateway", ImmutableSet.of(gateway));
- return this;
- }
-
- /**
- * @param netmask
- * the netmask of the VLAN IP range
- */
- public CreateNetworkOptions netmask(String netmask) {
- this.queryParameters.replaceValues("netmask", ImmutableSet.of(netmask));
- return this;
- }
-
- /**
- * @param networkDomain
- * network domain
- */
- public CreateNetworkOptions networkDomain(String networkDomain) {
- this.queryParameters.replaceValues("networkdomain", ImmutableSet.of(networkDomain));
- return this;
- }
-
- /**
- * @param vlan
- * the ID or VID of the VLAN. Default is an "untagged" VLAN.
- */
- public CreateNetworkOptions vlan(String vlan) {
- this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan));
- return this;
- }
-
- /**
- * @param projectId
- * the project this network will be in.
- */
- public CreateNetworkOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public static class Builder {
- /**
- * @see CreateNetworkOptions#isDefault
- */
- public static CreateNetworkOptions isDefault(boolean isDefault) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.isDefault(isDefault);
- }
-
- /**
- * @see CreateNetworkOptions#isShared
- */
- public static CreateNetworkOptions isShared(boolean isShared) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.isShared(isShared);
- }
-
- /**
- * @see CreateNetworkOptions#startIP(String)
- */
- public static CreateNetworkOptions startIP(String startIP) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.startIP(startIP);
- }
-
- /**
- * @see CreateNetworkOptions#endIP(String)
- */
- public static CreateNetworkOptions endIP(String endIP) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.endIP(endIP);
- }
-
- /**
- * @see CreateNetworkOptions#gateway(String)
- */
- public static CreateNetworkOptions gateway(String gateway) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.gateway(gateway);
- }
-
- /**
- * @see CreateNetworkOptions#netmask(String)
- */
- public static CreateNetworkOptions netmask(String netmask) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.netmask(netmask);
- }
-
- /**
- * @see CreateNetworkOptions#networkDomain(String)
- */
- public static CreateNetworkOptions networkDomain(String networkDomain) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.networkDomain(networkDomain);
- }
-
- /**
- * @see CreateNetworkOptions#vlan(String)
- */
- public static CreateNetworkOptions vlan(String vlan) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.vlan(vlan);
- }
-
- /**
- * @see CreateNetworkOptions#accountInDomain
- */
- public static CreateNetworkOptions accountInDomain(String account, String domain) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see CreateNetworkOptions#domainId
- */
- public static CreateNetworkOptions domainId(String domainId) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.domainId(domainId);
- }
-
- /**
- * @see CreateNetworkOptions#projectId(String)
- */
- public static CreateNetworkOptions projectId(String projectId) {
- CreateNetworkOptions options = new CreateNetworkOptions();
- return options.projectId(projectId);
- }
- }
-
- /**
- * Specify the account that will own the network. This can be run by a privileged user to be
- * able to set advanced network properties, such as the VLAN tag, and then to immediately pass
- * ownership of the network to an unprivileged user.
- *
- * Note that the unprivileged user will be able to delete the network later, since they are it's owner.
- *
- * @param account
- * account name
- * @param domain
- * domain ID
- */
- @Override
- public CreateNetworkOptions accountInDomain(String account, String domain) {
- return CreateNetworkOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * Specify the domain that will own the network. Any user in the domain can then use this
- * network.
- *
- * CloudStack requires that when using this option, you also specify isShared(true).
- *
- * Changes or deletions to this network must be done by a domain admin in the same domain, or a
- * global admin.
- *
- * @param domainId
- * domain ID
- */
- @Override
- public CreateNetworkOptions domainId(String domainId) {
- return CreateNetworkOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.java
deleted file mode 100644
index 712271d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalPodApi.createPod API call.
- */
-public class CreatePodOptions extends BaseHttpRequestOptions {
-
- public static final CreatePodOptions NONE = new CreatePodOptions();
-
- public static class Builder {
-
- public static CreatePodOptions allocationState(AllocationState allocationState) {
- return new CreatePodOptions().allocationState(allocationState);
- }
-
- }
-
- public CreatePodOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
-}
[29/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java
deleted file mode 100644
index 4b702b0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.util;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.net.URI;
-import java.util.NoSuchElementException;
-import java.util.Properties;
-import java.util.Set;
-
-import org.jclouds.Constants;
-import org.jclouds.ContextBuilder;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.ApiKeyPair;
-import org.jclouds.cloudstack.domain.User;
-
-public class ApiKeyPairs {
-
- /**
- * Retrieve the API key pair for a given CloudStack user
- *
- * @param endpoint
- * CloudStack API endpoint (e.g. http://72.52.126.25/client/api/)
- * @param username
- * User account name
- * @param password
- * User password
- * @param domain
- * Domain name. If empty defaults to ROOT
- * @throws NoSuchElementException, AuthorizationException
- * @return
- */
- public static ApiKeyPair loginToEndpointAsUsernameInDomainWithPasswordAndReturnApiKeyPair(
- URI endpoint, String username, String password, String domain) {
- CloudStackContext context = null;
- try {
- Properties overrides = new Properties();
- overrides.put(Constants.PROPERTY_TRUST_ALL_CERTS, "true");
- overrides.put(Constants.PROPERTY_RELAX_HOSTNAME, "true");
- overrides.put("jclouds.cloudstack.credential-type", "passwordCredentials");
-
- context = ContextBuilder.newBuilder(new CloudStackApiMetadata())
- .endpoint(checkNotNull(endpoint, "endpoint").toASCIIString())
- .credentials(String.format("%s/%s", checkNotNull(domain, "domain"), checkNotNull(username, "username")), password)
- .overrides(overrides).build(CloudStackContext.class);
-
- CloudStackApi client = context.getApi();
- Set<Account> listOfAccounts = client.getAccountApi().listAccounts();
-
- domain = (domain.equals("") || domain.equals("/")) ? "ROOT" : domain;
- for (Account account : listOfAccounts) {
- for (User user : account.getUsers()) {
- if (user.getName().equals(username) && user.getDomain().equals(domain)) {
- return ApiKeyPair.builder().apiKey(user.getApiKey())
- .secretKey(user.getSecretKey()).build();
- }
- }
- }
- throw new NoSuchElementException("Unable to find API keypair for user " + username);
-
- } finally {
- if (context != null)
- context.close();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java
deleted file mode 100644
index 5cf7790..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.util;
-
-import org.jclouds.cloudstack.domain.Snapshot;
-import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
-
-/**
- * Methods to create SnapshotPolicySchedule objects in the format required by Cloudstack.
- */
-public class SnapshotPolicySchedules {
- public static SnapshotPolicySchedule hourly(int minute) {
- return SnapshotPolicySchedule.builder().interval(Snapshot.Interval.HOURLY).time(String.format("%02d", minute)).build();
- }
-
- public static SnapshotPolicySchedule daily(int hour, int minute) {
- return SnapshotPolicySchedule.builder().interval(Snapshot.Interval.DAILY).time(String.format("%02d:%02d", minute, hour)).build();
- }
-
- public static SnapshotPolicySchedule weekly(int day, int hour, int minute) {
- return SnapshotPolicySchedule.builder().interval(Snapshot.Interval.WEEKLY).time(String.format("%02d:%02d:%02d", minute, hour, day)).build();
- }
-
- public static SnapshotPolicySchedule monthly(int day, int hour, int minute) {
- return SnapshotPolicySchedule.builder().interval(Snapshot.Interval.MONTHLY).time(String.format("%02d:%02d:%02d", minute, hour, day)).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index ad45dce..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.cloudstack.CloudStackApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackApiMetadataTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackApiMetadataTest.java
deleted file mode 100644
index ad2f376..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackApiMetadataTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-import org.jclouds.compute.internal.BaseComputeServiceApiMetadataTest;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "CloudStackApiMetadataTest")
-public class CloudStackApiMetadataTest extends BaseComputeServiceApiMetadataTest {
-
- public CloudStackApiMetadataTest() {
- super(new CloudStackApiMetadata());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackContextBuilderTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackContextBuilderTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackContextBuilderTest.java
deleted file mode 100644
index 04999aa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/CloudStackContextBuilderTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-import static org.jclouds.reflect.Reflection2.typeToken;
-
-import org.jclouds.ContextBuilder;
-import org.jclouds.View;
-import org.jclouds.compute.ComputeServiceContext;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "CloudStackContextBuilderTest")
-public class CloudStackContextBuilderTest {
-
- public void testAssignability() {
- View view = ContextBuilder.newBuilder(new CloudStackApiMetadata()).credentials("foo", "bar")
- .buildView(typeToken(ComputeServiceContext.class));
- view.unwrapApi(CloudStackApi.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
deleted file mode 100644
index d669ebd..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Properties;
-
-import org.jclouds.cloudstack.features.AccountApi;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.util.Strings2;
-import org.testng.annotations.Test;
-
-import com.google.common.net.HttpHeaders;
-
-/**
- *
- * @see CloudStackProperties#CREDENTIAL_TYPE
- */
-@Test(groups = "unit", testName = "PasswordAuthenticationExpectTest")
-public class PasswordAuthenticationExpectTest extends BaseCloudStackExpectTest<AccountApi> {
-
- /**
- * this reflects the properties that a user would pass to createContext
- */
- @Override
- protected Properties setupProperties() {
- Properties contextProperties = super.setupProperties();
- contextProperties.setProperty("jclouds.cloudstack.credential-type", "passwordCredentials");
- return contextProperties;
- }
-
- public void testLoginWithPasswordSetsSessionKeyAndCookie() {
-
- AccountApi client = requestsSendResponses(
- login, loginResponse,
- HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=listAccounts&listAll=true&sessionkey=" + Strings2.urlEncode(sessionKey, '/'))
- .addHeader("Accept", "application/json")
- .addHeader(HttpHeaders.COOKIE, "JSESSIONID=" + jSessionId)
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listaccountsresponse.json"))
- .build(),
- logout, logoutResponse);
-
- assertNotNull(client.listAccounts());
- }
-
- @Override
- protected AccountApi clientFrom(CloudStackContext context) {
- return context.getApi().getAccountApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterExpectTest.java
deleted file mode 100644
index 877b0fe..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterExpectTest.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Map;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.compute.strategy.CloudStackComputeServiceAdapter;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.internal.BaseCloudStackComputeServiceContextExpectTest;
-import org.jclouds.compute.ComputeServiceAdapter.NodeAndInitialCredentials;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.util.Strings2;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Injector;
-
-/**
- * Tests the compute service abstraction of the cloudstack api.
- */
-@Test(groups = "unit")
-public class CloudStackComputeServiceAdapterExpectTest extends BaseCloudStackComputeServiceContextExpectTest<Injector> {
- HttpResponse deployVMResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/deployvirtualmachineresponse.json"))
- .build();
-
- HttpRequest queryAsyncJobResult = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "queryAsyncJobResult")
- .addQueryParam("jobid", "50006")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "v8BWKMxd%2BIzHIuTaZ9sNSzCWqFI%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse queryAsyncJobResultResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/queryasyncjobresultresponse-virtualmachine.json"))
- .build();
-
- HttpResponse queryAsyncJobResultSecurityGroupResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/queryasyncjobresultresponse-virtualmachine-securitygroup.json"))
- .build();
-
- HttpRequest queryAsyncJobResultAuthorizeIngress = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "queryAsyncJobResult")
- .addQueryParam("jobid", "13330fc9-8b3e-4582-aa3e-90883c041010")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "y4gk3ckWAMPDNZM26LUK0gAhfiE%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse queryAsyncJobResultAuthorizeIngressResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/queryasyncjobresultresponse-authorizeingress.json"))
- .build();
-
- HttpRequest listCapabilitiesNotListAll = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listCapabilities")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "l3PVoJnKK2G2gHk3HPHtpwWjlW4%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- public void testCreateNodeWithGroupEncodedIntoName() {
- HttpRequest deployVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "1")
- .addQueryParam("serviceofferingid", "1")
- .addQueryParam("templateid", "4")
- .addQueryParam("displayname", "test-e92")
- .addQueryParam("name", "test-e92")
- .addQueryParam("networkids", "204")
- .addQueryParam("group", "test")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "M2Wx0CgOeH9vYHhbcbblwziqpwI%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listProjects, listProjectsResponse)
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(deployVM, deployVMResponse)
- .put(queryAsyncJobResult, queryAsyncJobResultResponse)
- .build();
-
- Injector forNode = requestsSendResponses(requestResponseMap);
-
- Template template = forNode.getInstance(TemplateBuilder.class).osFamily(OsFamily.CENTOS).build();
- template.getOptions().as(CloudStackTemplateOptions.class).setupStaticNat(false);
-
- CloudStackComputeServiceAdapter adapter = forNode.getInstance(CloudStackComputeServiceAdapter.class);
-
- NodeAndInitialCredentials<VirtualMachine> server = adapter.createNodeWithGroupEncodedIntoName("test", "test-e92",
- template);
- assertNotNull(server);
- assertEquals(server.getCredentials(), LoginCredentials.builder().password("dD7jwajkh").build());
- }
-
- public void testCreateNodeWithGroupEncodedIntoNameWithKeyPair() throws IOException {
- HttpRequest deployVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "1")
- .addQueryParam("serviceofferingid", "1")
- .addQueryParam("templateid", "4")
- .addQueryParam("displayname", "test-e92")
- .addQueryParam("name", "test-e92")
- .addQueryParam("networkids", "204")
- .addQueryParam("group", "test")
- .addQueryParam("keypair", "mykeypair")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "D3qQlTNjxrBXeG82C7YPrwU1jMc%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listProjects, listProjectsResponse)
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(deployVM, deployVMResponse)
- .put(queryAsyncJobResult, queryAsyncJobResultResponse)
- .build();
-
- Injector forKeyPair = requestsSendResponses(requestResponseMap);
-
- String privKey = Strings2.toStringAndClose(getClass().getResourceAsStream("/test"));
- Template template = forKeyPair.getInstance(TemplateBuilder.class).osFamily(OsFamily.CENTOS).build();
- template.getOptions().as(CloudStackTemplateOptions.class).keyPair("mykeypair")
- .setupStaticNat(false)
- .overrideLoginPrivateKey(privKey);
-
- CloudStackComputeServiceAdapter adapter = forKeyPair.getInstance(CloudStackComputeServiceAdapter.class);
-
- NodeAndInitialCredentials<VirtualMachine> server = adapter.createNodeWithGroupEncodedIntoName("test", "test-e92",
- template);
- assertNotNull(server);
- assertEquals(server.getCredentials().getOptionalPrivateKey().get(), privKey);
- }
-
- public void testCreateNodeWithGroupEncodedIntoNameWithGenerateKeyPair() throws IOException {
- HttpRequest deployVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "1")
- .addQueryParam("serviceofferingid", "1")
- .addQueryParam("templateid", "4")
- .addQueryParam("displayname", "test-e92")
- .addQueryParam("name", "test-e92")
- .addQueryParam("networkids", "204")
- .addQueryParam("group", "test")
- .addQueryParam("keypair", "jclouds-test")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "kfU/J/REa4DdYj0b/pSjuB3h3Qc%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listProjects, listProjectsResponse)
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(deployVM, deployVMResponse)
- .put(createSSHKeyPair, createSSHKeyPairResponse)
- .put(queryAsyncJobResult, queryAsyncJobResultResponse)
- .build();
-
- Injector forKeyPair = requestsSendResponses(requestResponseMap);
-
- Template template = forKeyPair.getInstance(TemplateBuilder.class).osFamily(OsFamily.CENTOS).build();
- template.getOptions().as(CloudStackTemplateOptions.class).generateKeyPair(true)
- .setupStaticNat(false);
-
- CloudStackComputeServiceAdapter adapter = forKeyPair.getInstance(CloudStackComputeServiceAdapter.class);
-
- NodeAndInitialCredentials<VirtualMachine> server = adapter.createNodeWithGroupEncodedIntoName("test", "test-e92",
- template);
- assertNotNull(server);
- assertTrue(server.getCredentials().getOptionalPrivateKey().isPresent());
- }
-
- public void testCreateNodeWithGroupEncodedIntoNameWithKeyPairDefaultSecurityGroup() throws IOException {
- HttpRequest deployVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "2")
- .addQueryParam("serviceofferingid", "1")
- .addQueryParam("templateid", "241")
- .addQueryParam("displayname", "test-e92")
- .addQueryParam("name", "test-e92")
- .addQueryParam("networkids", "204")
- .addQueryParam("group", "test")
- .addQueryParam("keypair", "mykeypair")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "5qkUSGh0y%2BP/t04/j3%2BEN9PAeFI%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listProjects, listProjectsResponse)
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksWithSecurityGroupsResponse)
- .put(getZoneWithSecurityGroups, getZoneWithSecurityGroupsResponse)
- .put(deployVM, deployVMResponse)
- .put(queryAsyncJobResult, queryAsyncJobResultResponse)
- .build();
-
- Injector forKeyPair = requestsSendResponses(requestResponseMap);
-
- String privKey = Strings2.toStringAndClose(getClass().getResourceAsStream("/test"));
- Template template = forKeyPair.getInstance(TemplateBuilder.class)
- .osFamily(OsFamily.CENTOS)
- .locationId("2")
- .build();
- template.getOptions().as(CloudStackTemplateOptions.class).keyPair("mykeypair")
- .setupStaticNat(false)
- .overrideLoginPrivateKey(privKey);
-
- CloudStackComputeServiceAdapter adapter = forKeyPair.getInstance(CloudStackComputeServiceAdapter.class);
-
- NodeAndInitialCredentials<VirtualMachine> server = adapter.createNodeWithGroupEncodedIntoName("test", "test-e92",
- template);
- assertNotNull(server);
- assertEquals(server.getCredentials().getOptionalPrivateKey().get(), privKey);
- }
-
- public void testCreateNodeWithGroupEncodedIntoNameWithKeyPairDefaultSecurityGroupAndDisk() throws IOException {
- HttpRequest deployVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "2")
- .addQueryParam("serviceofferingid", "1")
- .addQueryParam("templateid", "241")
- .addQueryParam("displayname", "test-e92")
- .addQueryParam("name", "test-e92")
- .addQueryParam("networkids", "204")
- .addQueryParam("group", "test")
- .addQueryParam("keypair", "mykeypair")
- .addQueryParam("diskofferingid", "5678")
- .addQueryParam("size", "10")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "lDzBXtVKCktueskyI/haID9ohJU%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listProjects, listProjectsResponse)
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksWithSecurityGroupsResponse)
- .put(getZoneWithSecurityGroups, getZoneWithSecurityGroupsResponse)
- .put(deployVM, deployVMResponse)
- .put(queryAsyncJobResult, queryAsyncJobResultResponse)
- .build();
-
- Injector forKeyPair = requestsSendResponses(requestResponseMap);
-
- String privKey = Strings2.toStringAndClose(getClass().getResourceAsStream("/test"));
- Template template = forKeyPair.getInstance(TemplateBuilder.class)
- .osFamily(OsFamily.CENTOS)
- .locationId("2")
- .build();
- template.getOptions().as(CloudStackTemplateOptions.class).keyPair("mykeypair")
- .diskOfferingId("5678")
- .dataDiskSize(10)
- .setupStaticNat(false)
- .overrideLoginPrivateKey(privKey);
-
-
- CloudStackComputeServiceAdapter adapter = forKeyPair.getInstance(CloudStackComputeServiceAdapter.class);
-
- NodeAndInitialCredentials<VirtualMachine> server = adapter.createNodeWithGroupEncodedIntoName("test", "test-e92",
- template);
- assertNotNull(server);
- assertEquals(server.getCredentials().getOptionalPrivateKey().get(), privKey);
- }
-
- public void testCreateNodeWithGroupEncodedIntoNameWithKeyPairGenerateSecurityGroup() throws IOException {
- HttpRequest deployVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "2")
- .addQueryParam("serviceofferingid", "1")
- .addQueryParam("templateid", "241")
- .addQueryParam("displayname", "test-e92")
- .addQueryParam("name", "test-e92")
- .addQueryParam("networkids", "204")
- .addQueryParam("group", "test")
- .addQueryParam("keypair", "mykeypair")
- .addQueryParam("securitygroupids", "30")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "rz8V/tMk/UbxUhNqp7Bq3CrSg/k%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listProjects, listProjectsResponse)
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksWithSecurityGroupsResponse)
- .put(getZoneWithSecurityGroups, getZoneWithSecurityGroupsResponse)
- .put(deployVM, deployVMResponse)
- .put(queryAsyncJobResult, queryAsyncJobResultSecurityGroupResponse)
- .put(queryAsyncJobResultAuthorizeIngress, queryAsyncJobResultAuthorizeIngressResponse)
- .put(getSecurityGroup, getSecurityGroupResponse)
- .put(createSecurityGroup, createSecurityGroupResponse)
- .put(authorizeIngress, authorizeIngressResponse)
- .build();
-
- Injector forKeyPair = requestsSendResponses(requestResponseMap);
-
- String privKey = Strings2.toStringAndClose(getClass().getResourceAsStream("/test"));
- Template template = forKeyPair.getInstance(TemplateBuilder.class)
- .osFamily(OsFamily.CENTOS)
- .locationId("2")
- .build();
- template.getOptions().as(CloudStackTemplateOptions.class).keyPair("mykeypair")
- .setupStaticNat(false)
- .generateSecurityGroup(true)
- .overrideLoginPrivateKey(privKey);
-
- CloudStackComputeServiceAdapter adapter = forKeyPair.getInstance(CloudStackComputeServiceAdapter.class);
- CloudStackContext context = forKeyPair.getInstance(CloudStackContext.class);
-
- NodeAndInitialCredentials<VirtualMachine> server = adapter.createNodeWithGroupEncodedIntoName("test", "test-e92",
- template);
- assertNotNull(server);
- assertEquals(server.getCredentials().getOptionalPrivateKey().get(), privKey);
- }
-
- public void testCreateNodeWithGroupEncodedIntoNameWithKeyPairAssignedToAccountAndDomain() throws IOException {
- HttpRequest deployVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "1")
- .addQueryParam("serviceofferingid", "1")
- .addQueryParam("templateid", "4")
- .addQueryParam("displayname", "test-e92")
- .addQueryParam("name", "test-e92")
- .addQueryParam("account", "account") //
- .addQueryParam("domainid", "domainId") //
- .addQueryParam("networkids", "204")
- .addQueryParam("group", "test")
- .addQueryParam("keypair", "mykeypair")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "hGV6gZZakwvNKhTJurkm48%2Bzgso%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listProjects, listProjectsResponse)
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(deployVM, deployVMResponse)
- .put(queryAsyncJobResult, queryAsyncJobResultResponse)
- .build();
-
- Injector forKeyPair = requestsSendResponses(requestResponseMap);
-
- String privKey = Strings2.toStringAndClose(getClass().getResourceAsStream("/test"));
- Template template = forKeyPair.getInstance(TemplateBuilder.class).osFamily(OsFamily.CENTOS).build();
- template.getOptions().as(CloudStackTemplateOptions.class).keyPair("mykeypair")
- .account("account")
- .domainId("domainId")
- .setupStaticNat(false)
- .overrideLoginPrivateKey(privKey);
-
- CloudStackComputeServiceAdapter adapter = forKeyPair.getInstance(CloudStackComputeServiceAdapter.class);
- CloudStackContext context = forKeyPair.getInstance(CloudStackContext.class);
-
- NodeAndInitialCredentials<VirtualMachine> server = adapter.createNodeWithGroupEncodedIntoName("test", "test-e92",
- template);
- assertNotNull(server);
- assertEquals(server.getCredentials().getOptionalPrivateKey().get(), privKey);
- }
-
- @Override
- protected Injector clientFrom(CloudStackContext context) {
- return context.utils().injector();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java
deleted file mode 100644
index 6f926c1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute;
-import static com.google.common.collect.Iterables.getFirst;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-
-import java.util.Map;
-import java.util.Random;
-
-
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.compute.strategy.CloudStackComputeServiceAdapter;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.predicates.TemplatePredicates;
-import org.jclouds.compute.ComputeServiceAdapter.NodeAndInitialCredentials;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.functions.DefaultCredentialsFromImageOrOverridingCredentials;
-import org.jclouds.compute.strategy.PrioritizeCredentialsFromTemplate;
-import org.jclouds.domain.Credentials;
-import org.jclouds.ssh.SshKeys;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.common.net.HostAndPort;
-import com.google.common.net.InetAddresses;
-
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackComputeServiceAdapterLiveTest")
-public class CloudStackComputeServiceAdapterLiveTest extends BaseCloudStackApiLiveTest {
-
- private CloudStackComputeServiceAdapter adapter;
- private NodeAndInitialCredentials<VirtualMachine> vm;
-
- private String keyPairName;
- private Map<String, String> keyPair;
- Map<String, Credentials> credentialStore = Maps.newLinkedHashMap();
-
- @BeforeGroups(groups = { "live" })
- public void setupContext() {
- super.setupContext();
-
- adapter = context.utils().injector().getInstance(
- CloudStackComputeServiceAdapter.class);
-
- keyPairName = prefix + "-adapter-test-keypair";
- keyPair = SshKeys.generate();
-
- client.getSSHKeyPairApi().deleteSSHKeyPair(keyPairName);
- client.getSSHKeyPairApi().registerSSHKeyPair(keyPairName, keyPair.get("public"));
- }
-
- @Test
- public void testListLocations() {
- assertFalse(Iterables.isEmpty(adapter.listLocations()));
- }
-
- private static final PrioritizeCredentialsFromTemplate prioritizeCredentialsFromTemplate = new PrioritizeCredentialsFromTemplate(
- new DefaultCredentialsFromImageOrOverridingCredentials());
-
- @Test
- public void testCreateNodeWithGroupEncodedIntoName() {
- String group = prefix + "-foo";
- String name = group + "-node-" + new Random().nextInt();
- Template template = view.getComputeService().templateBuilder().build();
-
- if (!client
- .getTemplateApi()
- .getTemplateInZone(template.getImage().getId(),
- template.getLocation().getId()).isPasswordEnabled()) {
-
- // TODO: look at SecurityGroupApiLiveTest for how to do this
- template.getOptions().as(CloudStackTemplateOptions.class).keyPair(keyPairName);
- }
- vm = adapter.createNodeWithGroupEncodedIntoName(group, name, template);
-
- assertEquals(vm.getNode().getDisplayName(), name);
- // check to see if we setup a NAT rule (conceding we could check this from
- // cache)
- IPForwardingRule rule = getFirst(
- client.getNATApi().getIPForwardingRulesForVirtualMachine(vm.getNode().getId()), null);
-
- String address = rule != null ? rule.getIPAddress() : vm.getNode().getIPAddress();
-
- loginCredentials = prioritizeCredentialsFromTemplate.apply(template, vm.getCredentials());
-
- assert InetAddresses.isInetAddress(address) : vm;
- HostAndPort socket = HostAndPort.fromParts(address, 22);
- checkSSH(socket);
- }
-
- @Test
- public void testListHardwareProfiles() {
- Iterable<ServiceOffering> profiles = adapter.listHardwareProfiles();
- assertFalse(Iterables.isEmpty(profiles));
-
- for (ServiceOffering profile : profiles) {
- // TODO: check that the results are valid
- }
- }
-
- @Test
- public void testListImages() {
- Iterable<org.jclouds.cloudstack.domain.Template> templates = adapter.listImages();
- assertFalse(Iterables.isEmpty(templates));
-
- for (org.jclouds.cloudstack.domain.Template template : templates) {
- assert TemplatePredicates.isReady().apply(template) : template;
- }
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (vm != null)
- adapter.destroyNode(vm.getNodeId());
- super.tearDownContext();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java
deleted file mode 100644
index 7cc6d40..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute;
-
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.internal.BaseComputeServiceLiveTest;
-import org.jclouds.sshj.config.SshjSshClientModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Module;
-
-/**
- *
- * Generally disabled, as it incurs higher fees.
- */
-@Test(groups = "live", enabled = true, singleThreaded = true)
-public class CloudStackComputeServiceLiveTest extends BaseComputeServiceLiveTest {
- public CloudStackComputeServiceLiveTest() {
- provider = "cloudstack";
- }
-
- @Override
- protected Module getSshModule() {
- return new SshjSshClientModule();
- }
-
- // cloudstack does not support metadata
- @Override
- protected void checkUserMetadataContains(NodeMetadata node, ImmutableMap<String, String> userMetadata) {
- assert node.getUserMetadata().equals(ImmutableMap.<String, String> of()) : String.format(
- "node userMetadata did not match %s %s", userMetadata, node);
- }
-
- @Override
- public void testOptionToNotBlock() {
- // start call blocks until we static nat, which is long enough to reach
- // running state
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java
deleted file mode 100644
index 7affab0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute;
-
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListNetworksOptions;
-import org.jclouds.compute.RunNodesException;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.predicates.NodePredicates;
-import org.testng.annotations.Test;
-
-import java.net.URI;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Iterables.get;
-import static com.google.common.collect.Sets.newTreeSet;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.specifyVLAN;
-
-@Test(groups = "live", testName = "CloudStackExperimentLiveTest")
-public class CloudStackExperimentLiveTest extends BaseCloudStackApiLiveTest {
-
- public CloudStackExperimentLiveTest() {
- provider = "cloudstack";
- }
-
- protected void deleteNetworksInZoneWithVlanId(String zoneId, String vlanId) {
- Set<Network> networks = domainAdminClient.getNetworkApi().listNetworks(
- ListNetworksOptions.Builder
- .isDefault(false)
- .isSystem(false)
- .zoneId(zoneId)
- .trafficType(TrafficType.GUEST)
- );
-
- // Warning: the vlan id is not set in the response - using an workaround
- URI broadcastUri = URI.create("vlan://" + vlanId);
- for (Network net : networks) {
- if (broadcastUri.equals(net.getBroadcastURI())) {
- String jobId = domainAdminClient.getNetworkApi().deleteNetwork(net.getId());
- adminJobComplete.apply(jobId);
- }
- }
- }
-
- @Test
- public void testAndExperiment() {
- if (!domainAdminEnabled) {
- Logger.getAnonymousLogger().log(Level.SEVERE, "domainAdmin credentials not present, skipping test");
- return;
- }
-
- String group = prefix + "-vlan";
- String vlanId = "2";
- Network network = null;
- Set<? extends NodeMetadata> nodes = null;
- try {
- assert !view.getComputeService().listAssignableLocations().isEmpty();
-
- Template template = view.getComputeService().templateBuilder().build();
-
- // get the zone we are launching into
- String zoneId = template.getLocation().getId();
-
- // cleanup before running the test
- deleteNetworksInZoneWithVlanId(zoneId, vlanId);
-
- // find a network offering that supports vlans in our zone
- String offeringId = get(
- cloudStackContext.getApi().getOfferingApi().listNetworkOfferings(specifyVLAN(true).zoneId(zoneId)), 0).getId();
-
- // create an arbitrary network
- network = domainAdminClient
- .getNetworkApi()
- // startIP/endIP/netmask/gateway must be specified together
- .createNetworkInZone(zoneId, offeringId, group, group,
- vlan(vlanId).startIP("192.168.1.2").netmask("255.255.255.0").gateway("192.168.1.1"));
-
- // set options to specify this network id
- template.getOptions().as(CloudStackTemplateOptions.class).networks(network.getId());
-
- // launch the VM
- nodes = view.getComputeService().createNodesInGroup(group, 1, template);
-
- assert !nodes.isEmpty();
-
- } catch (RunNodesException e) {
- Logger.getAnonymousLogger().log(Level.SEVERE, "error creating nodes", e);
- nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet()));
- } finally {
- if (nodes != null)
- view.getComputeService().destroyNodesMatching(NodePredicates.inGroup(group));
- if (network != null)
- domainAdminClient.getNetworkApi().deleteNetwork(network.getId());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java
deleted file mode 100644
index 8b1db02..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.extensions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Map;
-import java.util.Properties;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.internal.BaseCloudStackComputeServiceContextExpectTest;
-import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.ImageTemplate;
-import org.jclouds.compute.extensions.ImageExtension;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.util.concurrent.Futures;
-import com.google.inject.Module;
-
-@Test(groups = "unit", testName = "CloudStackImageExtensionExpectTest")
-public class CloudStackImageExtensionExpectTest extends BaseCloudStackComputeServiceContextExpectTest<ComputeService> {
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = super.setupProperties();
- overrides.setProperty("jclouds.zones", "MTV-Zone1");
- return overrides;
- }
-
- public void testCreateImage() {
- HttpRequest listVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listVirtualMachines")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "3239ade9-fd25-405c-8eda-59f0313a3fb0")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "Qq7Br3qNsyr5ifWZHIrLAslhwm0%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listVMResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listvirtualmachinesresponse-imageextension.json"))
- .build();
-
- HttpRequest stopVM = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "stopVirtualMachine")
- .addQueryParam("id", "3239ade9-fd25-405c-8eda-59f0313a3fb0")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "y9vxRK61K8sDoWtvSJHIx5WO9AE%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse stopVMResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/stopvirtualmachineresponse-imageextension.json"))
- .build();
-
- HttpRequest stopAsyncJobResult = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "queryAsyncJobResult")
- .addQueryParam("jobid", "a7d5127b-24a2-4a44-a4a7-25a6d057b453")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "CVpnN%2FSbx%2FMCOOyj%2FoVAt3bn684%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse stopAsyncJobResultResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json"))
- .build();
-
- HttpRequest listVolumes = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listVolumes")
- .addQueryParam("listAll", "true")
- .addQueryParam("virtualmachineid", "3239ade9-fd25-405c-8eda-59f0313a3fb0")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "drLPf9NE9ROZPOfeDkASiKa50t8%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listVolumesResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listvolumesresponse-imageextension.json"))
- .build();
-
-
- HttpRequest createTemplate = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createTemplate")
- .addQueryParam("volumeid", "fe1ada16-57a0-40ae-b577-01a153690fb4")
- .addQueryParam("name", "temp-template-ignore")
- .addQueryParam("ostypeid", "45de18f1-87c6-4646-8099-95c61f2a300a")
- .addQueryParam("displaytext", "temp-template-ignore")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "madHsBgxjYbM6JnZKYWajOlfPlY%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse createTemplateResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/createtemplateresponse-imageextension.json"))
- .build();
-
- HttpRequest createAsyncJobResult = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "queryAsyncJobResult")
- .addQueryParam("jobid", "4e345230-8fcc-48a3-8a37-c5fe960df671")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "6mTKL9fjz7bn6C7tOaZBzKdZwHs%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse createAsyncJobResultResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/queryasyncjobresultresponse-createtemplate-imageextension.json"))
- .build();
-
- HttpRequest getTemplate = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listTemplates")
- .addQueryParam("listAll", "true")
- .addQueryParam("templatefilter", "executable")
- .addQueryParam("id", "3dc6ce25-a6cf-4d60-a664-3499993b511b")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "dXv%2Bl04EDd7hmrWv5CdW8v298RE%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse getTemplateResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listtemplatesresponse-imageextension.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(listVM, listVMResponse)
- .put(stopVM, stopVMResponse)
- .put(stopAsyncJobResult, stopAsyncJobResultResponse)
- .put(listVolumes, listVolumesResponse)
- .put(createTemplate, createTemplateResponse)
- .put(createAsyncJobResult, createAsyncJobResultResponse)
- .put(getTemplate, getTemplateResponse)
- .build();
-
- ImageExtension apiThatCreatesImage = requestsSendResponses(requestResponseMap).getImageExtension().get();
-
- ImageTemplate newImageTemplate = apiThatCreatesImage.buildImageTemplateFromNode("temp-template-ignore", "3239ade9-fd25-405c-8eda-59f0313a3fb0");
-
- Image image = Futures.getUnchecked(apiThatCreatesImage.createImage(newImageTemplate));
- assertEquals(image.getId(), "3dc6ce25-a6cf-4d60-a664-3499993b511b");
- }
-
- @Override
- public ComputeService createClient(Function<HttpRequest, HttpResponse> fn, Module module, Properties props) {
- return clientFrom(createInjector(fn, module, props).getInstance(CloudStackContext.class));
- }
-
- @Override
- protected ComputeService clientFrom(CloudStackContext context) {
- return context.getComputeService();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java
deleted file mode 100644
index 9eff8e6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.extensions;
-
-import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest;
-import org.jclouds.sshj.config.SshjSshClientModule;
-import org.testng.annotations.Test;
-
-import com.google.inject.Module;
-
-/**
- * Live test for CloudStack {@link ImageExtension} implementation.
- */
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackImageExtensionLiveTest")
-public class CloudStackImageExtensionLiveTest extends BaseImageExtensionLiveTest {
-
- public CloudStackImageExtensionLiveTest() {
- provider = "cloudstack";
- }
-
- @Override
- protected Module getSshModule() {
- return new SshjSshClientModule();
- }
-
-}
[03/51] [abbrv] stratos git commit: changes 10th oct
Posted by im...@apache.org.
changes 10th oct
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3b7cd880
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3b7cd880
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3b7cd880
Branch: refs/heads/master
Commit: 3b7cd880995129c2c396a62b0ac9fcef548f9975
Parents: 289b24d
Author: asankasa <as...@wso2.com>
Authored: Mon Oct 13 10:34:52 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:27 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/CloudstackIaas.java | 117 ++++++++-----------
.../util/CloudControllerConstants.java | 10 +-
.../validate/CloudstackPartitionValidator.java | 4 -
.../out/production/untitled/Cricket.class | Bin 0 -> 1897 bytes
.../out/production/untitled/Cricket1.class | Bin 0 -> 733 bytes
.../out/production/untitled/NumberGrid.class | Bin 0 -> 2379 bytes
.../untitled/out/production/untitled/test.class | Bin 0 -> 2164 bytes
components/untitled/src/Cricket.java | 94 +++++++++++++++
components/untitled/src/Cricket1.java | 16 +++
components/untitled/src/NumberGrid.java | 106 +++++++++++++++++
components/untitled/src/test.java | 86 ++++++++++++++
11 files changed, 361 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index 2999659..ccf4701 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -15,7 +15,6 @@ import org.apache.stratos.cloud.controller.validate.CloudstackPartitionValidator
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
import org.jclouds.cloudstack.CloudStackApi;
import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.ServiceOffering;
import org.jclouds.cloudstack.domain.Volume;
import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.options.ListZonesOptions;
@@ -34,28 +33,19 @@ public class CloudstackIaas extends Iaas{
private static final Log log = LogFactory.getLog(CloudstackIaas.class);
-
-
public CloudstackIaas(IaasProvider iaasProvider) {super(iaasProvider);}
@Override
public void buildComputeServiceAndTemplate() {
-
// builds and sets Compute Service
ComputeServiceBuilderUtil.buildDefaultComputeService(getIaasProvider());
// builds and sets Template
buildTemplate();
-
}
-
@Override
public void buildTemplate() {
-
-///todo implement this method
- System.out.println("=================inside the build template method===========================");
-
IaasProvider iaasInfo = getIaasProvider();
//if compute service is not available
@@ -70,17 +60,20 @@ public class CloudstackIaas extends Iaas{
TemplateBuilder templateBuilder = iaasInfo.getComputeService()
.templateBuilder();
+ //*************************SET PROPERTIES TO templateBuilder OBJECT*******************************************//
- /////////////////////////SET PROPERTIES TO templateBuilder OBJECT/////////////////
-
-
- //PROPERTY - 1
- // set image id specified
+ /**
+ * PROPERTY - 1
+ * set image id specified
+ */
templateBuilder.imageId(iaasInfo.getImage());
- //PROPERTY-2
- //if user has specified a zone in cloud-controller.xml, set the zone into templateBuilder object
- // (user should provide the zone id for this)
+ /**
+ * PROPERTY-2
+ * if user has specified a zone in cloud-controller.xml, set the zone into templateBuilder object
+ * (user should provide the zone id for this)
+ */
+
if(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
Set<? extends Location> locations = iaasInfo.getComputeService().listAssignableLocations();
for(Location location : locations) {
@@ -95,48 +88,38 @@ public class CloudstackIaas extends Iaas{
}
}
- //PROPERTY-2
- //if user has specified an instance type in cloud-controller.xml, set the instance type into templateBuilder
- //object.
- //todo discuss this issue with niraml
+ /**
+ * PROPERTY-3
+ * if user has specified an instance type in cloud-controller.xml, set the instance type into templateBuilder
+ * object.
+ *Important:Specify the Service Offering type ID. Not the name. Because the name is not unique.
+ */
if (iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE) != null) {
- // set instance type eg: m1.large
- System.out.println("==============instance type=============:" + CloudControllerConstants.INSTANCE_TYPE);
-
- //get the hardwareID (service offering ID) correspond to the offering name specified
- //because user has specified the service offering name.
-
- ComputeServiceContext context = iaasInfo.getComputeService()
- .getContext();
- CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
-
-
- //get all service offerings
- Set<ServiceOffering> serviceOfferings = cloudStackApi.getOfferingApi().listServiceOfferings();
-
-
- for(ServiceOffering serviceOffering : serviceOfferings) {
- if (serviceOffering.getName().equals(iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE))) {
-
- //set service offering id to template builder object
- templateBuilder.hardwareId(serviceOffering.getId());
- break;
- }
- }
+ templateBuilder.hardwareId(iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE));
}
//build the template
Template template = templateBuilder.build();
+
+ // if you wish to auto assign IPs, instance spawning call should be
+ // blocking, but if you
+ // wish to assign IPs manually, it can be non-blocking.
+ // is auto-assign-ip mode or manual-assign-ip mode?
boolean blockUntilRunning = Boolean.parseBoolean(iaasInfo
.getProperty(CloudControllerConstants.AUTO_ASSIGN_IP));
template.getOptions().as(TemplateOptions.class)
.blockUntilRunning(blockUntilRunning);
- ///////////////////////////////SET CLOUDSTACK SPECIFIC PROPERTIES TO TEMPLATE OBJECT////////////////////////
+ // this is required in order to avoid creation of additional security
+ // groups by Jclouds.
+ template.getOptions().as(TemplateOptions.class)
+ .inboundPorts(new int[] {});
+
+
+ //*******************SET CLOUDSTACK SPECIFIC PROPERTIES TO TEMPLATE OBJECT*********************************//
//set security group
- //todo test this
if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS) != null) {
template.getOptions()
.as(CloudStackTemplateOptions.class)
@@ -144,13 +127,29 @@ public class CloudstackIaas extends Iaas{
.split(CloudControllerConstants.ENTRY_SEPARATOR)));
}
- //todo error domain id and account wanted
- //set key-pair
- if (iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR) != null) {
- template.getOptions().as(CloudStackTemplateOptions.class).keyPair(iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR));
+ //set user name
+ if (iaasInfo.getProperty(CloudControllerConstants.USER_NAME) != null) {
+ template.getOptions().as(CloudStackTemplateOptions.class)
+ .account(iaasInfo.getProperty(CloudControllerConstants.USER_NAME));
+ }
+ //set domain ID
+ if (iaasInfo.getProperty(CloudControllerConstants.DOMAIN_ID) != null) {
+ template.getOptions().as(CloudStackTemplateOptions.class)
+ .domainId(iaasInfo.getProperty(CloudControllerConstants.DOMAIN_ID));
}
+ /**
+ * set key-pair (here we use already created key pair for the corresponding account)
+ * in cloudstack we cannot access a key pair without specifying user name and domain ID
+ */
+ if (iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR) != null &&
+ iaasInfo.getProperty(CloudControllerConstants.USER_NAME)!= null &&
+ iaasInfo.getProperty(CloudControllerConstants.DOMAIN_ID) != null ) {
+ template.getOptions().as(CloudStackTemplateOptions.class)
+ .keyPair(iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR));
+ }
+ //todo this is not working
// ability to define tags
if (iaasInfo.getProperty(CloudControllerConstants.TAGS) != null) {
template.getOptions()
@@ -158,11 +157,10 @@ public class CloudstackIaas extends Iaas{
.tags(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.TAGS)
.split(CloudControllerConstants.ENTRY_SEPARATOR)));
}
+ //todo add disk offering
// set Template
iaasInfo.setTemplate(template);
-
-
}
@Override
@@ -175,20 +173,10 @@ public class CloudstackIaas extends Iaas{
//todo implement this method
- System.out.println("======================this is the associateAddress method==================");
-
-
-
IaasProvider iaasInfo = getIaasProvider();
-
ComputeServiceContext context = iaasInfo.getComputeService().getContext();
CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
-
String ip = null;
-//todo remove hardcoded
- ip="192.168.57.20";
-
-
return ip;
}
@@ -392,9 +380,6 @@ public class CloudstackIaas extends Iaas{
IaasProvider iaasInfo = getIaasProvider();
ComputeServiceContext context = iaasInfo.getComputeService()
.getContext();
-
- //todo region ignored
-
CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
cloudStackApi.getVolumeApi().deleteVolume(volumeId);
log.info("Deletion of Volume [id]: "+volumeId+" was successful. "
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index deeed37..9063e1b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -18,10 +18,10 @@
*/
package org.apache.stratos.cloud.controller.util;
-import java.io.File;
-
import org.wso2.carbon.utils.CarbonUtils;
+import java.io.File;
+
public final class CloudControllerConstants {
/**
@@ -97,6 +97,11 @@ public final class CloudControllerConstants {
public static final String CLOUD_CONTROLLER_COL_FAMILY = CLOUD_CONTROLLER_EVENT_STREAM
.replaceAll("[/.]", "_");
+ //cloudstack specific
+
+ public static final String USER_NAME = "userName";
+ public static final String DOMAIN_ID = "domainId";
+
/**
* column names
*/
@@ -275,4 +280,5 @@ public final class CloudControllerConstants {
public static final String NETWORK_FIXED_IP = "fixedIp";
public static final String NETWORK_PORT = "portUuid";
public static final String NETWORK_UUID = "networkUuid";
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
index a7a5e61..6416707 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
@@ -30,10 +30,6 @@ public class CloudstackPartitionValidator implements PartitionValidator {
@Override
public IaasProvider validate(String partitionId, Properties properties) throws InvalidPartitionException {
- //todo remove this
- //iaas.detachVolume("ce886144-1daf-412c-942a-1c1529ed67dd","6e54ab44-521c-4922-933c-6a6641a6d1b1");
-// iaas.buildTemplate();
-
try {
IaasProvider updatedIaasProvider = new IaasProvider(iaasProvider);
Iaas updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider);
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/out/production/untitled/Cricket.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/Cricket.class b/components/untitled/out/production/untitled/Cricket.class
new file mode 100644
index 0000000..6188da5
Binary files /dev/null and b/components/untitled/out/production/untitled/Cricket.class differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/out/production/untitled/Cricket1.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/Cricket1.class b/components/untitled/out/production/untitled/Cricket1.class
new file mode 100644
index 0000000..59fea0d
Binary files /dev/null and b/components/untitled/out/production/untitled/Cricket1.class differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/out/production/untitled/NumberGrid.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/NumberGrid.class b/components/untitled/out/production/untitled/NumberGrid.class
new file mode 100644
index 0000000..86e7088
Binary files /dev/null and b/components/untitled/out/production/untitled/NumberGrid.class differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/out/production/untitled/test.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/test.class b/components/untitled/out/production/untitled/test.class
new file mode 100644
index 0000000..e42be12
Binary files /dev/null and b/components/untitled/out/production/untitled/test.class differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/src/Cricket.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/Cricket.java b/components/untitled/src/Cricket.java
new file mode 100644
index 0000000..021e9eb
--- /dev/null
+++ b/components/untitled/src/Cricket.java
@@ -0,0 +1,94 @@
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class Cricket {
+
+ static String[] days = { "mon", "tues", "wed", "thu", "fri", "sat", "sun" };
+ static int[] day30 = { 4, 6, 9, 11 };
+ static int[] day31 = { 1, 3,5,7,8,10,12};
+
+ public static int getMonth() {
+
+
+ int dayOne = 1;
+ String curMon = "Jan";
+ String curDay = "wed";
+ int curYr = 2014;
+
+ int count = 1;
+ int newDay = 29;
+ boolean monExits = false;
+
+
+ if (!monExits) {
+ if (curYr % 4 == 0) {
+
+ } else {
+ count--;
+ }
+ }
+ return count;
+ }
+
+
+
+ public static void main(String[] args) throws IOException {
+
+
+ boolean monExits = false;
+ BufferedReader inp = new BufferedReader( new
+ InputStreamReader(System.in));
+ int T = Integer.parseInt(inp.readLine());
+
+ for (int i = 2014; i < 2014 + T; i++) {
+
+ for(int month=1; month<=12; month++){
+
+ //if mont has 30 days
+
+ for (int a : day30) {
+ if (a == month) {
+ // count++;
+ monExits = true;
+
+ }
+ }
+ for (int a : day31) {
+ if (a == month) {
+ // count=count+2;
+ monExits = true;
+
+
+
+ }
+ }
+
+ if(monExits==false){
+
+ //day 29,30
+
+ }
+
+
+
+ }
+
+
+
+
+ }
+
+
+ /*
+ * countDays();
+ *
+ * HashMap<Integer, String[]> months = new HashMap<>(); months.put(30,
+ * new String[] { "Apr", "June", "Sep", "Nov" }); months.put(31, new
+ * String[] { "Jan", "Mar", "May", "July", "Aug", "Oct", "Dec" });
+ *
+ * System.out.println(months.get(30));
+ */
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/src/Cricket1.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/Cricket1.java b/components/untitled/src/Cricket1.java
new file mode 100644
index 0000000..e19bea6
--- /dev/null
+++ b/components/untitled/src/Cricket1.java
@@ -0,0 +1,16 @@
+import java.util.Scanner;
+
+/**
+ * Created by sanjaya on 10/11/14.
+ */
+public class Cricket1 {
+
+ public static void main(String args[]){
+
+ Scanner scanner = new Scanner(System.in);
+ int x = scanner.nextInt();
+
+
+ System.out.println(35 +" " +33 +" "+ 68);
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/src/NumberGrid.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/NumberGrid.java b/components/untitled/src/NumberGrid.java
new file mode 100644
index 0000000..38fab79
--- /dev/null
+++ b/components/untitled/src/NumberGrid.java
@@ -0,0 +1,106 @@
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+
+public class NumberGrid {
+
+
+ public static void main(String args[]) throws IOException {
+
+
+ BufferedReader stdin = new BufferedReader(new InputStreamReader(
+ System.in));
+ String line;
+
+ String firstLineArray[] = new String[4];
+
+
+ boolean readFirstLine = true;
+
+
+ ArrayList<int[]> arrayList = new ArrayList<int[]>();
+
+ while ((line = stdin.readLine()) != null && line.length() != 0) {
+
+ if (readFirstLine) {
+ firstLineArray = line.split(" ");
+ readFirstLine = false;
+ } else {
+
+ String[] strings = line.split(" ");
+ int[] ints = new int[strings.length];
+ for (int i = 0; i < strings.length; i++) {
+ ints[i] = Integer.parseInt(strings[i]);
+ }
+ arrayList.add(ints);
+ }
+
+ }
+
+ int rows = Integer.parseInt(firstLineArray[0]);
+ int coloms = Integer.parseInt(firstLineArray[1]);
+ int height = Integer.parseInt(firstLineArray[2]);
+ int width = Integer.parseInt(firstLineArray[3]);
+
+
+ int total = 0;
+ int newTotal = 0;
+
+
+ //for each row
+ for (int YPosition = 0; YPosition + height <= rows; YPosition++) {
+
+ for (int XPosition =0; XPosition+width <= coloms ; XPosition++) {
+ newTotal = 0;
+
+ for (int j = YPosition; j < YPosition + height; j++) {
+ for (int k = XPosition; k < XPosition + width; k++) {
+
+ newTotal += arrayList.get(j)[k];
+
+
+ }
+
+ }
+ if(total<newTotal){
+ total = newTotal;
+ }
+
+ }
+ }
+
+ //change height into width and width into height and check again
+
+ int temp;
+ temp = height;
+ height = width;
+ width = temp;
+
+ //for each row
+ for (int YPosition = 0; YPosition + height <= rows; YPosition++) {
+
+ for (int XPosition =0; XPosition+width <= coloms ; XPosition++) {
+ newTotal = 0;
+
+ for (int j = YPosition; j < YPosition + height; j++) {
+ for (int k = XPosition; k < XPosition + width; k++) {
+
+ newTotal += arrayList.get(j)[k];
+
+ }
+
+ }
+ if(total<newTotal){
+ total = newTotal;
+ }
+
+ }
+ }
+
+ System.out.println(total);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b7cd880/components/untitled/src/test.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/test.java b/components/untitled/src/test.java
new file mode 100644
index 0000000..3caaeba
--- /dev/null
+++ b/components/untitled/src/test.java
@@ -0,0 +1,86 @@
+/**
+ * Created by sanjaya on 10/11/14.
+ */
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class test{
+
+
+ static String array1[] = new String[2];
+ static double array2[] = new double[7];
+ static double array3[] = new double[7];
+ static int i =0;
+
+ public static void main(String args[]) throws IOException {
+
+
+ BufferedReader stdin = new BufferedReader(new InputStreamReader(
+ System.in));
+ String line;
+
+
+ while ((line = stdin.readLine()) != null && line.length() != 0) {
+
+ array1 = line.split(" ");
+ array2[i]= Double.parseDouble(array1[0]);
+ array3[i]= Double.parseDouble(array1[1]);
+
+ i++;
+
+
+ }
+
+
+ System.out.println(getPearsonCorrelation(array2, array3));
+
+ }
+
+ public static double getPearsonCorrelation(double[] scores1,double[] scores2){
+
+ double result = 0;
+
+ double sum_sq_x = 0;
+
+ double sum_sq_y = 0;
+
+ double sum_coproduct = 0;
+
+ double mean_x = scores1[0];
+
+ double mean_y = scores2[0];
+
+ for(int i=2;i<scores1.length+1;i+=1){
+
+ double sweep =Double.valueOf(i-1)/i;
+
+ double delta_x = scores1[i-1]-mean_x;
+
+ double delta_y = scores2[i-1]-mean_y;
+
+ sum_sq_x += delta_x * delta_x * sweep;
+
+ sum_sq_y += delta_y * delta_y * sweep;
+
+ sum_coproduct += delta_x * delta_y * sweep;
+
+ mean_x += delta_x / i;
+
+ mean_y += delta_y / i;
+
+ }
+
+ double pop_sd_x = (double) Math.sqrt(sum_sq_x/scores1.length);
+
+ double pop_sd_y = (double) Math.sqrt(sum_sq_y/scores1.length);
+
+ double cov_x_y = sum_coproduct / scores1.length;
+
+ result = cov_x_y / (pop_sd_x*pop_sd_y);
+
+ return result;
+
+ }
+
+}
\ No newline at end of file
[04/51] [abbrv] stratos git commit: work on 9 oct
Posted by im...@apache.org.
work on 9 oct
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/289b24d9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/289b24d9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/289b24d9
Branch: refs/heads/master
Commit: 289b24d94e143a34b8a62b83c808e4697edf64dc
Parents: bd9c0ec
Author: asankasa <as...@wso2.com>
Authored: Thu Oct 9 20:08:54 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:27 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/CloudstackIaas.java | 276 +++++++++++++++++--
.../validate/CloudstackPartitionValidator.java | 3 +-
2 files changed, 260 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/289b24d9/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index 425e328..2999659 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -14,15 +14,21 @@ import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.validate.CloudstackPartitionValidator;
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
import org.jclouds.cloudstack.CloudStackApi;
+import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
+import org.jclouds.cloudstack.domain.ServiceOffering;
+import org.jclouds.cloudstack.domain.Volume;
import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.options.ListZonesOptions;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
+import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
+import java.util.Arrays;
import java.util.Set;
+import java.util.concurrent.TimeoutException;
public class CloudstackIaas extends Iaas{
@@ -45,7 +51,10 @@ public class CloudstackIaas extends Iaas{
@Override
public void buildTemplate() {
+
+
///todo implement this method
+ System.out.println("=================inside the build template method===========================");
IaasProvider iaasInfo = getIaasProvider();
@@ -61,20 +70,24 @@ public class CloudstackIaas extends Iaas{
TemplateBuilder templateBuilder = iaasInfo.getComputeService()
.templateBuilder();
- //todo what is this image id???
- // set image id specified
- templateBuilder.imageId(iaasInfo.getImage());
- System.out.println("===========iaasInfo.getImage()=============== "+iaasInfo.getImage());
+ /////////////////////////SET PROPERTIES TO templateBuilder OBJECT/////////////////
+
- //logic
+ //PROPERTY - 1
+ // set image id specified
+ templateBuilder.imageId(iaasInfo.getImage());
+ //PROPERTY-2
+ //if user has specified a zone in cloud-controller.xml, set the zone into templateBuilder object
+ // (user should provide the zone id for this)
if(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
Set<? extends Location> locations = iaasInfo.getComputeService().listAssignableLocations();
for(Location location : locations) {
if(location.getScope().toString().equalsIgnoreCase(CloudControllerConstants.ZONE_ELEMENT) &&
location.getId().equals(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE))) {
- templateBuilder.locationId(location.getId());
+ //if the zone is valid set the zone to templateBuilder Object
+ templateBuilder.locationId(location.getId());
log.info("ZONE has been set as " + iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE)
+ " with id: " + location.getId());
break;
@@ -82,12 +95,70 @@ public class CloudstackIaas extends Iaas{
}
}
+ //PROPERTY-2
+ //if user has specified an instance type in cloud-controller.xml, set the instance type into templateBuilder
+ //object.
+ //todo discuss this issue with niraml
+ if (iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE) != null) {
+ // set instance type eg: m1.large
+ System.out.println("==============instance type=============:" + CloudControllerConstants.INSTANCE_TYPE);
+
+ //get the hardwareID (service offering ID) correspond to the offering name specified
+ //because user has specified the service offering name.
+
+ ComputeServiceContext context = iaasInfo.getComputeService()
+ .getContext();
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+
+ //get all service offerings
+ Set<ServiceOffering> serviceOfferings = cloudStackApi.getOfferingApi().listServiceOfferings();
+ for(ServiceOffering serviceOffering : serviceOfferings) {
+ if (serviceOffering.getName().equals(iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE))) {
+
+ //set service offering id to template builder object
+ templateBuilder.hardwareId(serviceOffering.getId());
+ break;
+ }
+ }
+ }
//build the template
Template template = templateBuilder.build();
+
+ boolean blockUntilRunning = Boolean.parseBoolean(iaasInfo
+ .getProperty(CloudControllerConstants.AUTO_ASSIGN_IP));
+ template.getOptions().as(TemplateOptions.class)
+ .blockUntilRunning(blockUntilRunning);
+
+ ///////////////////////////////SET CLOUDSTACK SPECIFIC PROPERTIES TO TEMPLATE OBJECT////////////////////////
+
+ //set security group
+ //todo test this
+ if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS) != null) {
+ template.getOptions()
+ .as(CloudStackTemplateOptions.class)
+ .securityGroupIds(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS)
+ .split(CloudControllerConstants.ENTRY_SEPARATOR)));
+ }
+
+ //todo error domain id and account wanted
+ //set key-pair
+ if (iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR) != null) {
+ template.getOptions().as(CloudStackTemplateOptions.class).keyPair(iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR));
+ }
+
+
+ // ability to define tags
+ if (iaasInfo.getProperty(CloudControllerConstants.TAGS) != null) {
+ template.getOptions()
+ .as(CloudStackTemplateOptions.class)
+ .tags(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.TAGS)
+ .split(CloudControllerConstants.ENTRY_SEPARATOR)));
+ }
+
// set Template
iaasInfo.setTemplate(template);
@@ -103,24 +174,49 @@ public class CloudstackIaas extends Iaas{
public String associateAddress(NodeMetadata node) {
//todo implement this method
- return null;
+
+ System.out.println("======================this is the associateAddress method==================");
+
+
+
+ IaasProvider iaasInfo = getIaasProvider();
+
+ ComputeServiceContext context = iaasInfo.getComputeService().getContext();
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+
+ String ip = null;
+//todo remove hardcoded
+ ip="192.168.57.20";
+
+
+ return ip;
}
@Override
public String associatePredefinedAddress(NodeMetadata node, String ip) {
+ System.out.println("======================This is the associatePredifinedAddress method=====================");
//todo implement this method
return null;
}
@Override
public void releaseAddress(String ip) {
-//todo implement this method
+//todo test this method
+
+ System.out.println("======================this is the release address method============");
+ IaasProvider iaasInfo = getIaasProvider();
+
+ ComputeServiceContext context = iaasInfo.getComputeService().getContext();
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+ cloudStackApi.getAddressApi().disassociateIPAddress(ip);
+
}
@Override
public boolean createKeyPairFromPublicKey(String region, String keyPairName, String publicKey) {
//todo implement this method
+ System.out.println("===============inside the create key pair method===================");
return false;
}
@@ -161,12 +257,15 @@ public class CloudstackIaas extends Iaas{
@Override
public boolean isValidHost(String zone, String host) throws InvalidHostException {
- //todo implement this method
-
+ //todo study more about this
+ IaasProvider iaasInfo = getIaasProvider();
+ // there's no such concept in cloudstack
+ String msg = "Invalid host: " + host +" in the zone: "+zone+ " and of the iaas: "+iaasInfo.getType();
+ log.error(msg);
+ throw new InvalidHostException(msg);
- return true;
}
@Override
@@ -174,8 +273,6 @@ public class CloudstackIaas extends Iaas{
return new CloudstackPartitionValidator();
}
-
-
@Override
public String createVolume(int sizeGB, String snapshotId) {
@@ -184,20 +281,124 @@ public class CloudstackIaas extends Iaas{
}
@Override
- public String attachVolume(String instanceId, String volumeId, String deviceName) {
+ public String attachVolume(String instanceId, String volumeId , String deviceName) {
+
+
+ IaasProvider iaasInfo = getIaasProvider();
+ ComputeServiceContext context = iaasInfo.getComputeService()
+ .getContext();
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+
+ //get volume
+ org.jclouds.cloudstack.domain.Volume volume = cloudStackApi.getVolumeApi().getVolume(volumeId);
+
+ //get current volume state
+ Volume.State volumeState = volume.getState();
+
+ if (log.isDebugEnabled()) {
+ log.debug("Volume " + volumeId + " is in state " + volumeState);
+ }
+
+ //if volume is not available, not allocated or cannot use
+ //volume state ALLOCATED means that volume has not been attached to any instance.
+
+ //TODO there is an error with logic.
+ if(!(volumeState == Volume.State.ALLOCATED || volumeState == Volume.State.CREATING || volumeState == Volume.State.READY)){
+ log.error(String.format("Volume %s can not be attached. Volume status is %s", volumeId, volumeState));
+ }
+
+ //check whether the account of volume and instance is same
+ if(!volume.getAccount().equals(cloudStackApi.getVirtualMachineApi().getVirtualMachine(instanceId).getAccount())){
+ log.error(String.format("Volume %s can not be attached. Instance account and Volume account are not the same ", volumeId));
+ }
+
+ boolean volumeBecameAvailable = false, volumeBecameAttached = false;
+
+ try {
+ if(volumeState == Volume.State.CREATING) {
+
+ volumeBecameAvailable = waitForStatus(volumeId, Volume.State.ALLOCATED, 5);
+
+ }else if(volumeState == Volume.State.READY){
+ volumeBecameAvailable = true;
+ }
+
+ } catch (TimeoutException e) {
+ log.error("[Volume ID] " + volumeId + "did not become ALLOCATED within expected timeout");
+ }
+
+ //if volume state is 'ALLOCATED'
+ if (volumeBecameAvailable) {
+
+ //attach volume into instance
+ cloudStackApi.getVolumeApi().attachVolume(volumeId, instanceId);
+
+ try {
+ volumeBecameAttached = waitForStatus(volumeId, Volume.State.READY, 2);
+ } catch (TimeoutException e) {
+ log.error("[Volume ID] " + volumeId + "did not become READY within expected timeout");
+ }
+ }
+
+ try {
+ // waiting 5seconds till volumes are actually attached.
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ //If volume state is not 'READY'
+ if(!volumeBecameAttached){
+ log.error(String.format("[Volume ID] %s attachment is called, but not yet became attached", volumeId));
+ }
+
+ log.info(String.format("Volume [id]: %s attachment for instance [id]: %s was successful [status]: Attaching. of Iaas : %s", volumeId, instanceId, iaasInfo));
+
+
+ return "Attaching";
- //todo implement this method
- return null;
}
@Override
public void detachVolume(String instanceId, String volumeId) {
-//todo implement this method
+
+
+ IaasProvider iaasInfo = getIaasProvider();
+
+ ComputeServiceContext context = iaasInfo.getComputeService()
+ .getContext();
+
+ if(log.isDebugEnabled()) {
+ log.debug(String.format("Starting to detach volume %s from the instance %s", volumeId, instanceId));
+ }
+
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+
+ cloudStackApi.getVolumeApi().detachVolume(volumeId);
+
+ try {
+ //TODO this is wrong
+ if(waitForStatus(volumeId, Volume.State.ALLOCATED, 5)){
+ log.info(String.format("Detachment of Volume [id]: %s from instance [id]: %s was successful. [region] : %s of Iaas : %s", volumeId, instanceId, iaasInfo));
+ }
+ } catch (TimeoutException e) {
+ log.error(String.format("Detachment of Volume [id]: %s from instance [id]: %s was unsuccessful. [volume Status] : %s", volumeId, instanceId, iaasInfo));
+ }
+
}
@Override
public void deleteVolume(String volumeId) {
-//todo implement this method
+ IaasProvider iaasInfo = getIaasProvider();
+ ComputeServiceContext context = iaasInfo.getComputeService()
+ .getContext();
+
+ //todo region ignored
+
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+ cloudStackApi.getVolumeApi().deleteVolume(volumeId);
+ log.info("Deletion of Volume [id]: "+volumeId+" was successful. "
+ + " of Iaas : " + iaasInfo);
}
@Override
@@ -205,4 +406,43 @@ public class CloudstackIaas extends Iaas{
{//todo implement this method
return null;
}
+
+ private boolean waitForStatus(String volumeId, Volume.State expectedStatus, int timeoutInMins) throws TimeoutException {
+ int timeout = 1000 * 60 * timeoutInMins;
+ long timout = System.currentTimeMillis() + timeout;
+
+ IaasProvider iaasInfo = getIaasProvider();
+ ComputeServiceContext context = iaasInfo.getComputeService().getContext();
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+
+ //get volume
+ org.jclouds.cloudstack.domain.Volume volume = cloudStackApi.getVolumeApi().getVolume(volumeId);
+
+ Volume.State volumeState = volume.getState();
+
+ while(volumeState != expectedStatus){
+ try {
+ if(log.isDebugEnabled()){
+ log.debug(String.format("Volume %s is still NOT in %s. Current State=%s", volumeId, expectedStatus, volumeState));
+ }
+ if(volumeState == Volume.State.FAILED || volumeState == Volume.State.DESTROYED || volumeState == Volume.State.UNRECOGNIZED){
+ log.error("Volume " + volumeId + " is in state" + volumeState);
+ return false;
+ }
+
+ Thread.sleep(1000);
+ volumeState = volume.getState();
+ if (System.currentTimeMillis()> timout) {
+ throw new TimeoutException();
+ }
+ } catch (InterruptedException e) {
+ // Ignoring the exception
+ }
+ }
+ if(log.isDebugEnabled()){
+ log.debug(String.format("Volume %s status became %s", volumeId, expectedStatus));
+ }
+
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/289b24d9/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
index 46b7f99..a7a5e61 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
@@ -31,7 +31,8 @@ public class CloudstackPartitionValidator implements PartitionValidator {
public IaasProvider validate(String partitionId, Properties properties) throws InvalidPartitionException {
//todo remove this
- iaas.buildComputeServiceAndTemplate();
+ //iaas.detachVolume("ce886144-1daf-412c-942a-1c1529ed67dd","6e54ab44-521c-4922-933c-6a6641a6d1b1");
+// iaas.buildTemplate();
try {
IaasProvider updatedIaasProvider = new IaasProvider(iaasProvider);
[16/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java
deleted file mode 100644
index 6080c4a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DeleteIPForwardingRuleResponseTest")
-public class DeleteIPForwardingRuleResponseTest extends BaseItemParserTest<Long> {
-
- @Override
- public String resource() {
- return "/deleteipforwardingruleresponse.json";
- }
-
- @Override
- @SelectJson("jobid")
- public Long expected() {
- return 50005l;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java
deleted file mode 100644
index 1e90ee8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DeleteNetworkResponseTest")
-public class DeleteNetworkResponseTest extends BaseItemParserTest<Long> {
-
- @Override
- public String resource() {
- return "/deletenetworkresponse.json";
- }
-
- @Override
- @SelectJson("jobid")
- public Long expected() {
- return 45612l;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse3xTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse3xTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse3xTest.java
deleted file mode 100644
index c366297..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse3xTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DeployVirtualMachineResponse3xTest")
-public class DeployVirtualMachineResponse3xTest extends BaseItemParserTest<AsyncCreateResponse> {
-
- @Override
- public String resource() {
- return "/deployvirtualmachineresponse.json";
- }
-
- @Override
- @SelectJson({ "deployvirtualmachine", "deployvirtualmachineresponse" })
- public AsyncCreateResponse expected() {
- return AsyncCreateResponse.builder().id("1234").jobId("50006").build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse4xTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse4xTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse4xTest.java
deleted file mode 100644
index 936656a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DeployVirtualMachineResponse4xTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DeployVirtualMachineResponse3xTest")
-public class DeployVirtualMachineResponse4xTest extends BaseItemParserTest<AsyncCreateResponse> {
-
- @Override
- public String resource() {
- return "/deployvirtualmachineresponse4x.json";
- }
-
- @Override
- @SelectJson({ "deployvirtualmachine", "deployvirtualmachineresponse" })
- public AsyncCreateResponse expected() {
- return AsyncCreateResponse.builder().id("1cce6cb7-2268-47ff-9696-d9e610f6619a")
- .jobId("13330fc9-8b3e-4582-aa3e-90883c041ff0").build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java
deleted file mode 100644
index 65c8d9f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DisableStaticNATResponseTest")
-public class DisableStaticNATResponseTest extends BaseItemParserTest<Long> {
-
- @Override
- public String resource() {
- return "/disablestaticnatresponse.json";
- }
-
- @Override
- @SelectJson("jobid")
- public Long expected() {
- return 50006l;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java
deleted file mode 100644
index 81ad59a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/EnableStaticNATResponseWhereResponseDoesntHaveJobTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.Unwrap;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "EnableStaticNATResponseWhereResponseDoesntHaveJobTest")
-public class EnableStaticNATResponseWhereResponseDoesntHaveJobTest extends BaseItemParserTest<AsyncCreateResponse> {
-
- @Override
- public String resource() {
- return "/enablestaticnatresponse-withoutjob.json";
- }
-
- @Override
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- public AsyncCreateResponse expected() {
- return AsyncCreateResponse.UNINITIALIZED;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/JobResultResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/JobResultResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/JobResultResponseTest.java
deleted file mode 100644
index 630e1d5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/JobResultResponseTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.cloudstack.domain.JobResult;
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", testName = "DeleteNetworkResponseTest")
-public class JobResultResponseTest extends BaseItemParserTest<JobResult> {
-
- @Override
- public String resource() {
- return "/deletetemplateresponse.json";
- }
-
- @Override
- @SelectJson("jobresult")
- public JobResult expected() {
- return JobResult.builder().success(true).build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java
deleted file mode 100644
index 5aa1e8b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.domain.Account.State;
-import org.jclouds.cloudstack.domain.Account.Type;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListAccountsResponseTest extends BaseSetParserTest<Account> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
-
- }
-
- @Override
- public String resource() {
- return "/listaccountsresponse.json";
- }
-
- @Override
- @SelectJson("account")
- public Set<Account> expected() {
- return ImmutableSet.<Account> of(Account
- .builder()
- .id("505")
- .name("jclouds")
- .type(Type.USER)
- .domainId("457")
- .domain("AA000062-jclouds-dev")
- .receivedBytes(318900216)
- .sentBytes(23189677)
- .VMLimit(15l)
- .VMs(1)
- .IPsAvailable(14l)
- .IPLimit(15l)
- .IPs(0)
- .IPsAvailable(15l)
- .volumeLimit(90l)
- .volumes(2)
- .volumesAvailable(88l)
- .snapshotLimit(250l)
- .snapshots(0)
- .snapshotsAvailable(250l)
- .templateLimit(15l)
- .templates(0)
- .templatesAvailable(15l)
- .VMsAvailable(14l)
- .VMsStopped(0)
- .VMsRunning(1)
- .state(State.ENABLED)
- .users(
- ImmutableSet.of(User.builder().id("505").name("jclouds").firstName("Adrian").lastName("Cole")
- .email("adrian@jclouds.org")
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-04-19T01:57:24+0000"))
- .state(User.State.ENABLED).account("jclouds").accountType(Type.USER).domainId("457")
- .domain("AA000062-jclouds-dev").apiKey("APIKEY").secretKey("SECRETKEY").build())).build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAlertsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAlertsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAlertsResponseTest.java
deleted file mode 100644
index db284ae..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListAlertsResponseTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Calendar;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.jclouds.cloudstack.domain.Alert;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListAlertsResponseTest extends BaseSetParserTest<Alert> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
-
- }
-
- @Override
- public String resource() {
- return "/listalertsresponse.json";
- }
-
- @Override
- @SelectJson("alert")
- public Set<Alert> expected() {
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT+02:00"));
- c.set(Calendar.YEAR, 2011);
- c.set(Calendar.MONTH, Calendar.DECEMBER);
- c.set(Calendar.DAY_OF_MONTH, 4);
- c.set(Calendar.HOUR_OF_DAY, 10);
- c.set(Calendar.MINUTE, 5);
- c.set(Calendar.SECOND, 2);
- return ImmutableSet.of(Alert.builder()
- .id("20").description("Failed to deploy Vm with Id: 52").sent(c.getTime()).type("7").build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java
deleted file mode 100644
index ec83197..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.cloudstack.domain.Capabilities;
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class ListCapabilitiesResponseTest extends BaseItemParserTest<Capabilities> {
-
- @Override
- public String resource() {
- return "/listcapabilitiesresponse.json";
- }
-
- @Override
- @SelectJson("capability")
- public Capabilities expected() {
- return Capabilities.builder().securityGroupsEnabled(true).canShareTemplates(true).cloudStackVersion("2.2")
- .build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapacityResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapacityResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapacityResponseTest.java
deleted file mode 100644
index 9fc4d53..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListCapacityResponseTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Capacity;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListCapacityResponseTest extends BaseSetParserTest<Capacity> {
-
- @Override
- public String resource() {
- return "/listcapacityresponse.json";
- }
-
- @Override
- @SelectJson("capacity")
- public Set<Capacity> expected() {
- Capacity a = Capacity.builder().type(Capacity.Type.PRIMARY_STORAGE_ALLOCATED_BYTES)
- .zoneId("1").zoneName("Dev Zone 1").podId("null").podName("All")
- .capacityUsed(34057748480L).capacityTotal(1796712955904L).percentUsed(1.9).build();
- Capacity b = Capacity.builder().type(Capacity.Type.PRIMARY_STORAGE_ALLOCATED_BYTES)
- .zoneId("1").zoneName("Dev Zone 1").podId("1").podName("Dev Pod 1")
- .capacityUsed(34057748480L).capacityTotal(1796712955904L).percentUsed(1.9).build();
- return ImmutableSet.of(a, b);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java
deleted file mode 100644
index bb3327a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListClustersResponseTest extends BaseSetParserTest<Cluster> {
-
- @Override
- public String resource() {
- return "/listclustersresponse.json";
- }
-
- @Override
- @SelectJson("cluster")
- public Set<Cluster> expected() {
- Cluster cluster1 = Cluster.builder()
- .id("1")
- .name("Xen Clust 1")
- .podId("1").podName("Dev Pod 1")
- .zoneId("1").zoneName("Dev Zone 1")
- .hypervisor("XenServer")
- .clusterType(Host.ClusterType.CLOUD_MANAGED)
- .allocationState(AllocationState.ENABLED)
- .managedState(Cluster.ManagedState.MANAGED)
- .build();
- Cluster cluster2 = Cluster.builder()
- .id("2")
- .name("Xen Clust 1")
- .podId("2").podName("Dev Pod 2")
- .zoneId("2").zoneName("Dev Zone 2")
- .hypervisor("XenServer")
- .clusterType(Host.ClusterType.CLOUD_MANAGED)
- .allocationState(AllocationState.ENABLED)
- .managedState(Cluster.ManagedState.MANAGED)
- .build();
-
- return ImmutableSet.of(cluster1, cluster2);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java
deleted file mode 100644
index 4935c1e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ConfigurationEntry;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListConfigurationEntriesResponseTest extends BaseSetParserTest<ConfigurationEntry> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
- }
-
- @Override
- public String resource() {
- return "/listconfigurationsresponse.json";
- }
-
- @Override
- @SelectJson("configuration")
- public Set<ConfigurationEntry> expected() {
- return ImmutableSet.of(
- ConfigurationEntry.builder().category("Advanced").name("account.cleanup.interval").value("86400")
- .description("The interval (in seconds) between cleanup for removed accounts").build(),
- ConfigurationEntry.builder().category("Advanced").name("agent.lb.enabled").value("true")
- .description("If agent load balancing enabled in cluster setup").build()
- );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java
deleted file mode 100644
index 5c55ea8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.DiskOffering;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListDiskOfferingsResponseTest extends BaseSetParserTest<DiskOffering> {
-
- @Override
- public String resource() {
- return "/listdiskofferingsresponse.json";
- }
-
- @Override
- @SelectJson("diskoffering")
- public Set<DiskOffering> expected() {
- return ImmutableSet.<DiskOffering> of(
- DiskOffering.builder().id("3").domainId("1").domain("ROOT").name("Small").displayText("Small Disk, 5 GB")
- .diskSize(5)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-11T15:22:32-0800"))
- .customized(false).build(),
- DiskOffering.builder().id("4").domainId("1").domain("ROOT").name("Medium").displayText("Medium Disk, 20 GB")
- .diskSize(20)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-11T15:22:32-0800"))
- .customized(false).build(),
- DiskOffering.builder().id("5").domainId("1").domain("ROOT").name("Large").displayText("Large Disk, 100 GB")
- .diskSize(100)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-11T15:22:32-0800"))
- .customized(false).build());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java
deleted file mode 100644
index 5a3a8fd..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Domain;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListDomainsResponseTest extends BaseSetParserTest<Domain> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
- });
- }
-
- @Override
- public String resource() {
- return "/listdomainsresponse.json";
- }
-
- @Override
- @SelectJson("domain")
- public Set<Domain> expected() {
- return ImmutableSet.of(
- Domain.builder().id("1").name("ROOT").level(0).hasChild(true).build(),
- Domain.builder().id("2").name("jclouds1").level(1).parentDomainId("1")
- .parentDomainName("ROOT").hasChild(false).build()
- );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java
deleted file mode 100644
index 6af9dff..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListFirewallRulesResponseTest extends BaseSetParserTest<FirewallRule> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
- }
-
- @Override
- public String resource() {
- return "/listfirewallrulesresponse.json";
- }
-
- @Override
- @SelectJson("firewallrule")
- public Set<FirewallRule> expected() {
- Set<String> CIDRs = ImmutableSet.of("0.0.0.0/0");
- return ImmutableSet.of(
- FirewallRule.builder().id("2017").protocol(FirewallRule.Protocol.TCP).startPort(30)
- .endPort(35).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE).CIDRs(CIDRs).build(),
- FirewallRule.builder().id("2016").protocol(FirewallRule.Protocol.TCP).startPort(22)
- .endPort(22).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE).CIDRs(CIDRs).build(),
- FirewallRule.builder().id("10").protocol(FirewallRule.Protocol.TCP).startPort(22)
- .endPort(22).ipAddressId("8").ipAddress("10.27.27.57").state(FirewallRule.State.ACTIVE).CIDRs(CIDRs).build()
- );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java
deleted file mode 100644
index b4f5855..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.config.CloudStackParserModule;
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Host;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListHostsResponseTest extends BaseParserTest<Set<Host>, Set<Host>> {
-
- public void compare(Set<Host> expects, Set<Host> response) {
- assertEquals(response.toString(), expects.toString());
- }
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule(), new CloudStackParserModule());
- }
-
- @Override
- public String resource() {
- return "/listhostsresponse.json";
- }
-
- @Override
- @SelectJson("host")
- public Set<Host> expected() {
- return ImmutableSet.of(
-
- Host.builder()
- .id("1")
- .name("cs2-xevsrv.alucloud.local")
- .state(Host.State.UP)
- .type(Host.Type.ROUTING)
- .ipAddress("10.26.26.107")
- .zoneId("1")
- .zoneName("Dev Zone 1")
- .podId("1")
- .podName("Dev Pod 1")
- .version("2.2.12.20110928142833")
- .hypervisor("XenServer")
- .cpuNumber(24)
- .cpuSpeed(2266)
- .cpuAllocated("2.76%")
- .cpuUsed("0.1%")
- .cpuWithOverProvisioning(54384.0f)
- .networkKbsRead(4443L)
- .networkKbsWrite(15048L)
- .memoryTotal(100549733760L)
- .memoryAllocated(3623878656L)
- .memoryUsed(3623878656L)
- .capabilities("xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64")
- .lastPinged(new SimpleDateFormatDateService().iso8601SecondsDateParse("1970-01-16T00:54:43+0200"))
- .managementServerId("223098941760041")
- .clusterId("1")
- .clusterName("Xen Clust 1")
- .clusterType(Host.ClusterType.CLOUD_MANAGED)
- .localStorageActive(false)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-11-26T23:28:36+0200"))
- .events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; " +
- "AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping")
- .hasEnoughCapacity(false)
- .allocationState(AllocationState.ENABLED).build(),
-
- Host.builder()
- .id("2")
- .name("nfs://10.26.26.165/mnt/nfs/cs_sec")
- .state(Host.State.ALERT)
- .disconnected(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-11-26T23:33:38+0200"))
- .type(Host.Type.SECONDARY_STORAGE)
- .ipAddress("nfs")
- .zoneId("1")
- .zoneName("Dev Zone 1")
- .version("2.2.12.20110928142833")
- .hypervisor("None")
- .lastPinged(new SimpleDateFormatDateService().iso8601SecondsDateParse("1970-01-16T00:42:30+0200"))
- .localStorageActive(false)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-11-26T23:33:38+0200"))
- .events("ManagementServerDown; AgentDisconnected; Remove; MaintenanceRequested; AgentConnected; Ping")
- .hasEnoughCapacity(false)
- .allocationState(AllocationState.ENABLED).build(),
-
- Host.builder()
- .id("3")
- .name("s-1-VM")
- .state(Host.State.UP)
- .type(Host.Type.SECONDARY_STORAGE_VM)
- .ipAddress("10.26.26.81")
- .zoneId("1")
- .zoneName("Dev Zone 1")
- .podId("1")
- .podName("Dev Pod 1")
- .version("2.2.12.20110928142833")
- .lastPinged(new SimpleDateFormatDateService().iso8601SecondsDateParse("1970-01-16T00:54:43+0200"))
- .managementServerId("223098941760041")
- .localStorageActive(false)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-11-26T23:35:51+0200"))
- .events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; " +
- "AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping")
- .hasEnoughCapacity(false)
- .allocationState(AllocationState.ENABLED).build(),
-
- Host.builder()
- .id("4")
- .name("v-2-VM")
- .state(Host.State.UP)
- .type(Host.Type.CONSOLE_PROXY)
- .ipAddress("10.26.26.96")
- .zoneId("1")
- .zoneName("Dev Zone 1")
- .podId("1")
- .podName("Dev Pod 1")
- .version("2.2.12.20110928142833")
- .lastPinged(new SimpleDateFormatDateService().iso8601SecondsDateParse("1970-01-16T00:54:43+0200"))
- .managementServerId("223098941760041")
- .localStorageActive(false)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-11-26T23:36:46+0200"))
- .events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; " +
- "AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping")
- .hasEnoughCapacity(false)
- .allocationState(AllocationState.ENABLED).build()
- );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java
deleted file mode 100644
index 3c26223..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.functions.ParseNamesFromHttpResponse;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.json.BaseSetParserTest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListHypervisorsResponseTest extends BaseSetParserTest<String> {
-
- @Override
- public String resource() {
- return "/listhypervisorsresponse.json";
- }
-
- @Override
- public Set<String> expected() {
- return ImmutableSet.<String> of("XenServer", "KVM", "VMware");
- }
-
- @Override
- protected Function<HttpResponse, Set<String>> parser(Injector injector) {
- return injector.getInstance(ParseNamesFromHttpResponse.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java
deleted file mode 100644
index 203c41e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListIPForwardingRulesResponseTest extends BaseSetParserTest<IPForwardingRule> {
-
- @Override
- public String resource() {
- return "/listipforwardingrulesresponse.json";
- }
-
- @Override
- @SelectJson("ipforwardingrule")
- public Set<IPForwardingRule> expected() {
- return ImmutableSet.<IPForwardingRule> of(
- IPForwardingRule.builder().id("66").protocol("tcp").startPort(22).endPort(22).virtualMachineId("58")
- .virtualMachineDisplayName("i-4-58-VM").virtualMachineName("i-4-58-VM")
- .IPAddressId("15").IPAddress("10.27.27.64").state("Active").build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java
deleted file mode 100644
index 2c9e783..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.LoadBalancerRule;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-import org.testng.collections.Sets;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListLoadBalancerRulesResponseTest extends BaseSetParserTest<LoadBalancerRule> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
- }
-
- @Override
- public String resource() {
- return "/listloadbalancerrulesresponse.json";
- }
-
- @Override
- @SelectJson("loadbalancerrule")
- public Set<LoadBalancerRule> expected() {
- return ImmutableSet.<LoadBalancerRule> of(LoadBalancerRule.builder()
- .id("93").account("admin").algorithm(LoadBalancerRule.Algorithm.ROUNDROBIN)
- .description("null").domain("ROOT").domainId("1").name("Ranny").privatePort(80)
- .publicIP("10.27.27.59").publicIPId("10").publicPort(80).state(LoadBalancerRule.State.ADD)
- .CIDRs(Sets.<String>newHashSet()).zoneId(null)
- .build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java
deleted file mode 100644
index 05bd194..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.REQUIRED;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListNetworkOfferingsResponseTest extends BaseSetParserTest<NetworkOffering> {
-
- @Override
- public String resource() {
- return "/listnetworkofferingsresponse.json";
- }
-
- @Override
- @SelectJson("networkoffering")
- public Set<NetworkOffering> expected() {
- return ImmutableSet.<NetworkOffering>of(
- NetworkOffering.builder().id("7").name("DefaultDirectNetworkOffering").displayText("Direct")
- .trafficType(TrafficType.PUBLIC).isDefault(true).supportsVLAN(false).availability(REQUIRED)
- .networkRate(200).build(), NetworkOffering.builder().id("6").name("DefaultVirtualizedNetworkOffering")
- .displayText("Virtual Vlan").trafficType(TrafficType.GUEST).isDefault(true).supportsVLAN(false)
- .availability(REQUIRED).networkRate(200).build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java
deleted file mode 100644
index 65ed915..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.net.URI;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkService;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.ImmutableSortedSet;
-
-@Test(groups = "unit")
-public class ListNetworksResponseTest extends BaseSetParserTest<Network> {
-
- @Override
- public String resource() {
- return "/listnetworksresponse.json";
- }
-
- @Override
- @SelectJson("network")
- public Set<Network> expected() {
- return ImmutableSet
- .<Network> of(Network
- .builder()
- .id("204")
- .account("adrian")
- .name("Virtual Network")
- .displayText(
- "A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.")
- .broadcastDomainType("Vlan")
- .trafficType(TrafficType.GUEST)
- .zoneId("1")
- .networkOfferingId("6")
- .networkOfferingName("DefaultVirtualizedNetworkOffering")
- .networkOfferingDisplayText("Virtual Vlan")
- .networkOfferingAvailability("Required")
- .isShared(false)
- .isSystem(false)
- .state("Implemented")
- .related("204")
- .broadcastURI(URI.create("vlan://240"))
- .DNS(ImmutableList.of("8.8.8.8"))
- .guestIPType(GuestIPType.VIRTUAL)
- .domain("ROOT")
- .domainId("1")
- .isDefault(true)
- .services(
- ImmutableSortedSet.of(
- NetworkService.builder().name("Vpn").capabilities(ImmutableMap.of("SupportedVpnTypes", "pptp,l2tp,ipsec")).build(),
- NetworkService.builder().name("Gateway").build(),
- NetworkService.builder().name("UserData").build(),
- NetworkService.builder().name("Dhcp").build(),
- NetworkService.builder().name("Firewall").capabilities(ImmutableSortedMap.<String, String> naturalOrder()
- .put("SupportedSourceNatTypes", "per account").put("StaticNat", "true")
- .put("TrafficStatistics", "per public ip").put("PortForwarding", "true")
- .put("MultipleIps", "true").put("SupportedProtocols", "tcp,udp").build()).build(),
- NetworkService.builder().name("Dns").build(),
- NetworkService.builder().name("Lb").capabilities(ImmutableMap.of("SupportedLbAlgorithms",
- "roundrobin,leastconn,source", "SupportedProtocols", "tcp, udp")).build()))
- .networkDomain("cs3cloud.internal").build());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java
deleted file mode 100644
index 0453777..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Map;
-
-import org.jclouds.cloudstack.functions.ParseIdToNameFromHttpResponse;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.json.BaseItemParserTest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListOSCategoriesResponseTest extends BaseItemParserTest<Map<String, String>> {
-
- @Override
- public String resource() {
- return "/listoscategoriesresponse.json";
- }
-
- @Override
- public Map<String, String> expected() {
- return ImmutableMap.<String, String> builder().put("1", "CentOS").put("10", "Ubuntu").put("2", "Debian").put("3", "Oracle")
- .put("4", "RedHat").put("5", "SUSE").put("6", "Windows").put("7", "Other").put("8", "Novel").put("9", "Unix")
- .build();
- }
-
- @Override
- protected Function<HttpResponse, Map<String, String>> parser(Injector injector) {
- return injector.getInstance(ParseIdToNameFromHttpResponse.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java
deleted file mode 100644
index 91bef18..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListOSTypesResponseTest extends BaseSetParserTest<OSType> {
-
- @Override
- public String resource() {
- return "/listostypesresponse.json";
- }
-
- @Override
- @SelectJson("ostype")
- public Set<OSType> expected() {
- return ImmutableSet
- .<OSType> builder()
- .add(OSType.builder().id("69").OSCategoryId("7").description("Asianux 3(32-bit)").build())
- .add(OSType.builder().id("70").OSCategoryId("7").description("Asianux 3(64-bit)").build())
- .add(OSType.builder().id("1").OSCategoryId("1").description("CentOS 4.5 (32-bit)").build())
- .add(OSType.builder().id("2").OSCategoryId("1").description("CentOS 4.6 (32-bit)").build())
- .add(OSType.builder().id("3").OSCategoryId("1").description("CentOS 4.7 (32-bit)").build())
- .add(OSType.builder().id("4").OSCategoryId("1").description("CentOS 4.8 (32-bit)").build())
- .add(OSType.builder().id("5").OSCategoryId("1").description("CentOS 5.0 (32-bit)").build())
- .add(OSType.builder().id("6").OSCategoryId("1").description("CentOS 5.0 (64-bit)").build())
- .add(OSType.builder().id("7").OSCategoryId("1").description("CentOS 5.1 (32-bit)").build())
- .add(OSType.builder().id("8").OSCategoryId("1").description("CentOS 5.1 (64-bit)").build())
- .add(OSType.builder().id("9").OSCategoryId("1").description("CentOS 5.2 (32-bit)").build())
- .add(OSType.builder().id("10").OSCategoryId("1").description("CentOS 5.2 (64-bit)").build())
- .add(OSType.builder().id("11").OSCategoryId("1").description("CentOS 5.3 (32-bit)").build())
- .add(OSType.builder().id("12").OSCategoryId("1").description("CentOS 5.3 (64-bit)").build())
- .add(OSType.builder().id("13").OSCategoryId("1").description("CentOS 5.4 (32-bit)").build())
- .add(OSType.builder().id("14").OSCategoryId("1").description("CentOS 5.4 (64-bit)").build())
- .add(OSType.builder().id("111").OSCategoryId("1").description("CentOS 5.5 (32-bit)").build())
- .add(OSType.builder().id("112").OSCategoryId("1").description("CentOS 5.5 (64-bit)").build())
- .add(OSType.builder().id("73").OSCategoryId("2").description("Debian GNU/Linux 4(32-bit)").build())
- .add(OSType.builder().id("74").OSCategoryId("2").description("Debian GNU/Linux 4(64-bit)").build())
- .add(OSType.builder().id("72").OSCategoryId("2").description("Debian GNU/Linux 5(64-bit)").build())
- .add(OSType.builder().id("15").OSCategoryId("2").description("Debian GNU/Linux 5.0 (32-bit)").build())
- .add(OSType.builder().id("132").OSCategoryId("2").description("Debian GNU/Linux 6(32-bit)").build())
- .add(OSType.builder().id("133").OSCategoryId("2").description("Debian GNU/Linux 6(64-bit)").build())
- .add(OSType.builder().id("102").OSCategoryId("6").description("DOS").build())
- .add(OSType.builder().id("118").OSCategoryId("4").description("Fedora 10").build())
- .add(OSType.builder().id("117").OSCategoryId("4").description("Fedora 11").build())
- .add(OSType.builder().id("116").OSCategoryId("4").description("Fedora 12").build())
- .add(OSType.builder().id("115").OSCategoryId("4").description("Fedora 13").build())
- .add(OSType.builder().id("120").OSCategoryId("4").description("Fedora 8").build())
- .add(OSType.builder().id("119").OSCategoryId("4").description("Fedora 9").build())
- .add(OSType.builder().id("83").OSCategoryId("9").description("FreeBSD (32-bit)").build())
- .add(OSType.builder().id("84").OSCategoryId("9").description("FreeBSD (64-bit)").build())
- .add(OSType.builder().id("92").OSCategoryId("6").description("Microsoft Small Bussiness Server 2003").build())
- .add(OSType.builder().id("78").OSCategoryId("8").description("Novell Netware 5.1").build())
- .add(OSType.builder().id("77").OSCategoryId("8").description("Novell Netware 6.x").build())
- .add(OSType.builder().id("68").OSCategoryId("7").description("Open Enterprise Server").build())
- .add(OSType.builder().id("16").OSCategoryId("3").description("Oracle Enterprise Linux 5.0 (32-bit)").build())
- .add(OSType.builder().id("17").OSCategoryId("3").description("Oracle Enterprise Linux 5.0 (64-bit)").build())
- .add(OSType.builder().id("18").OSCategoryId("3").description("Oracle Enterprise Linux 5.1 (32-bit)").build())
- .add(OSType.builder().id("19").OSCategoryId("3").description("Oracle Enterprise Linux 5.1 (64-bit)").build())
- .add(OSType.builder().id("20").OSCategoryId("3").description("Oracle Enterprise Linux 5.2 (32-bit)").build())
- .add(OSType.builder().id("21").OSCategoryId("3").description("Oracle Enterprise Linux 5.2 (64-bit)").build())
- .add(OSType.builder().id("22").OSCategoryId("3").description("Oracle Enterprise Linux 5.3 (32-bit)").build())
- .add(OSType.builder().id("23").OSCategoryId("3").description("Oracle Enterprise Linux 5.3 (64-bit)").build())
- .add(OSType.builder().id("24").OSCategoryId("3").description("Oracle Enterprise Linux 5.4 (32-bit)").build())
- .add(OSType.builder().id("25").OSCategoryId("3").description("Oracle Enterprise Linux 5.4 (64-bit)").build())
- .add(OSType.builder().id("134").OSCategoryId("3").description("Oracle Enterprise Linux 5.5 (32-bit)").build())
- .add(OSType.builder().id("135").OSCategoryId("3").description("Oracle Enterprise Linux 5.5 (64-bit)").build())
- .add(OSType.builder().id("104").OSCategoryId("7").description("OS/2").build())
- .add(OSType.builder().id("60").OSCategoryId("7").description("Other (32-bit)").build())
- .add(OSType.builder().id("103").OSCategoryId("7").description("Other (64-bit)").build())
- .add(OSType.builder().id("75").OSCategoryId("7").description("Other 2.6x Linux (32-bit)").build())
- .add(OSType.builder().id("76").OSCategoryId("7").description("Other 2.6x Linux (64-bit)").build())
- .add(OSType.builder().id("98").OSCategoryId("7").description("Other Linux (32-bit)").build())
- .add(OSType.builder().id("99").OSCategoryId("7").description("Other Linux (64-bit)").build())
- .add(OSType.builder().id("59").OSCategoryId("10").description("Other Ubuntu (32-bit)").build())
- .add(OSType.builder().id("100").OSCategoryId("10").description("Other Ubuntu (64-bit)").build())
- .add(OSType.builder().id("131").OSCategoryId("10").description("Red Hat Enterprise Linux 2").build())
- .add(OSType.builder().id("66").OSCategoryId("4").description("Red Hat Enterprise Linux 3(32-bit)").build())
- .add(OSType.builder().id("67").OSCategoryId("4").description("Red Hat Enterprise Linux 3(64-bit)").build())
- .add(OSType.builder().id("106").OSCategoryId("4").description("Red Hat Enterprise Linux 4(64-bit)").build())
- .add(OSType.builder().id("26").OSCategoryId("4").description("Red Hat Enterprise Linux 4.5 (32-bit)").build())
- .add(OSType.builder().id("27").OSCategoryId("4").description("Red Hat Enterprise Linux 4.6 (32-bit)").build())
- .add(OSType.builder().id("28").OSCategoryId("4").description("Red Hat Enterprise Linux 4.7 (32-bit)").build())
- .add(OSType.builder().id("29").OSCategoryId("4").description("Red Hat Enterprise Linux 4.8 (32-bit)").build())
- .add(OSType.builder().id("30").OSCategoryId("4").description("Red Hat Enterprise Linux 5.0 (32-bit)").build())
- .add(OSType.builder().id("31").OSCategoryId("4").description("Red Hat Enterprise Linux 5.0 (64-bit)").build())
- .add(OSType.builder().id("32").OSCategoryId("4").description("Red Hat Enterprise Linux 5.1 (32-bit)").build())
- .add(OSType.builder().id("33").OSCategoryId("4").description("Red Hat Enterprise Linux 5.1 (64-bit)").build())
- .add(OSType.builder().id("34").OSCategoryId("4").description("Red Hat Enterprise Linux 5.2 (32-bit)").build())
- .add(OSType.builder().id("35").OSCategoryId("4").description("Red Hat Enterprise Linux 5.2 (64-bit)").build())
- .add(OSType.builder().id("36").OSCategoryId("4").description("Red Hat Enterprise Linux 5.3 (32-bit)").build())
- .add(OSType.builder().id("37").OSCategoryId("4").description("Red Hat Enterprise Linux 5.3 (64-bit)").build())
- .add(OSType.builder().id("38").OSCategoryId("4").description("Red Hat Enterprise Linux 5.4 (32-bit)").build())
- .add(OSType.builder().id("39").OSCategoryId("4").description("Red Hat Enterprise Linux 5.4 (64-bit)").build())
- .add(OSType.builder().id("113").OSCategoryId("4").description("Red Hat Enterprise Linux 5.5 (32-bit)").build())
- .add(OSType.builder().id("114").OSCategoryId("4").description("Red Hat Enterprise Linux 5.5 (64-bit)").build())
- .add(OSType.builder().id("136").OSCategoryId("4").description("Red Hat Enterprise Linux 6.0 (32-bit)").build())
- .add(OSType.builder().id("137").OSCategoryId("4").description("Red Hat Enterprise Linux 6.0 (64-bit)").build())
- .add(OSType.builder().id("85").OSCategoryId("9").description("SCO OpenServer 5").build())
- .add(OSType.builder().id("86").OSCategoryId("9").description("SCO UnixWare 7").build())
- .add(OSType.builder().id("79").OSCategoryId("9").description("Sun Solaris 10(32-bit)").build())
- .add(OSType.builder().id("80").OSCategoryId("9").description("Sun Solaris 10(64-bit)").build())
- .add(OSType.builder().id("82").OSCategoryId("9").description("Sun Solaris 8(Experimental)").build())
- .add(OSType.builder().id("81").OSCategoryId("9").description("Sun Solaris 9(Experimental)").build())
- .add(OSType.builder().id("109").OSCategoryId("5").description("SUSE Linux Enterprise 10(32-bit)").build())
- .add(OSType.builder().id("110").OSCategoryId("5").description("SUSE Linux Enterprise 10(64-bit)").build())
- .add(OSType.builder().id("96").OSCategoryId("5").description("SUSE Linux Enterprise 8(32-bit)").build())
- .add(OSType.builder().id("97").OSCategoryId("5").description("SUSE Linux Enterprise 8(64-bit)").build())
- .add(OSType.builder().id("107").OSCategoryId("5").description("SUSE Linux Enterprise 9(32-bit)").build())
- .add(OSType.builder().id("108").OSCategoryId("5").description("SUSE Linux Enterprise 9(64-bit)").build())
- .add(OSType.builder().id("41").OSCategoryId("5").description("SUSE Linux Enterprise Server 10 SP1 (32-bit)")
- .build())
- .add(OSType.builder().id("42").OSCategoryId("5").description("SUSE Linux Enterprise Server 10 SP1 (64-bit)")
- .build())
- .add(OSType.builder().id("43").OSCategoryId("5").description("SUSE Linux Enterprise Server 10 SP2 (32-bit)")
- .build())
- .add(OSType.builder().id("44").OSCategoryId("5").description("SUSE Linux Enterprise Server 10 SP2 (64-bit)")
- .build())
- .add(OSType.builder().id("45").OSCategoryId("5").description("SUSE Linux Enterprise Server 10 SP3 (64-bit)")
- .build())
- .add(OSType.builder().id("46").OSCategoryId("5").description("SUSE Linux Enterprise Server 11 (32-bit)")
- .build())
- .add(OSType.builder().id("47").OSCategoryId("5").description("SUSE Linux Enterprise Server 11 (64-bit)")
- .build())
- .add(OSType.builder().id("40").OSCategoryId("5").description("SUSE Linux Enterprise Server 9 SP4 (32-bit)")
- .build())
- .add(OSType.builder().id("121").OSCategoryId("10").description("Ubuntu 10.04 (32-bit)").build())
- .add(OSType.builder().id("126").OSCategoryId("10").description("Ubuntu 10.04 (64-bit)").build())
- .add(OSType.builder().id("125").OSCategoryId("10").description("Ubuntu 8.04 (32-bit)").build())
- .add(OSType.builder().id("130").OSCategoryId("10").description("Ubuntu 8.04 (64-bit)").build())
- .add(OSType.builder().id("124").OSCategoryId("10").description("Ubuntu 8.10 (32-bit)").build())
- .add(OSType.builder().id("129").OSCategoryId("10").description("Ubuntu 8.10 (64-bit)").build())
- .add(OSType.builder().id("123").OSCategoryId("10").description("Ubuntu 9.04 (32-bit)").build())
- .add(OSType.builder().id("128").OSCategoryId("10").description("Ubuntu 9.04 (64-bit)").build())
- .add(OSType.builder().id("122").OSCategoryId("10").description("Ubuntu 9.10 (32-bit)").build())
- .add(OSType.builder().id("127").OSCategoryId("10").description("Ubuntu 9.10 (64-bit)").build())
- .add(OSType.builder().id("95").OSCategoryId("6").description("Windows 2000 Advanced Server").build())
- .add(OSType.builder().id("105").OSCategoryId("6").description("Windows 2000 Professional").build())
- .add(OSType.builder().id("61").OSCategoryId("6").description("Windows 2000 Server").build())
- .add(OSType.builder().id("55").OSCategoryId("6").description("Windows 2000 Server SP4 (32-bit)").build())
- .add(OSType.builder().id("65").OSCategoryId("6").description("Windows 3.1").build())
- .add(OSType.builder().id("48").OSCategoryId("6").description("Windows 7 (32-bit)").build())
- .add(OSType.builder().id("49").OSCategoryId("6").description("Windows 7 (64-bit)").build())
- .add(OSType.builder().id("63").OSCategoryId("6").description("Windows 95").build())
- .add(OSType.builder().id("62").OSCategoryId("6").description("Windows 98").build())
- .add(OSType.builder().id("64").OSCategoryId("6").description("Windows NT 4").build())
- .add(OSType.builder().id("87").OSCategoryId("6").description("Windows Server 2003 DataCenter Edition(32-bit)")
- .build())
- .add(OSType.builder().id("88").OSCategoryId("6").description("Windows Server 2003 DataCenter Edition(64-bit)")
- .build())
- .add(OSType.builder().id("50").OSCategoryId("6").description("Windows Server 2003 Enterprise Edition(32-bit)")
- .build())
- .add(OSType.builder().id("51").OSCategoryId("6").description("Windows Server 2003 Enterprise Edition(64-bit)")
- .build())
- .add(OSType.builder().id("89").OSCategoryId("6").description("Windows Server 2003 Standard Edition(32-bit)")
- .build())
- .add(OSType.builder().id("90").OSCategoryId("6").description("Windows Server 2003 Standard Edition(64-bit)")
- .build())
- .add(OSType.builder().id("91").OSCategoryId("6").description("Windows Server 2003 Web Edition").build())
- .add(OSType.builder().id("52").OSCategoryId("6").description("Windows Server 2008 (32-bit)").build())
- .add(OSType.builder().id("53").OSCategoryId("6").description("Windows Server 2008 (64-bit)").build())
- .add(OSType.builder().id("54").OSCategoryId("6").description("Windows Server 2008 R2 (64-bit)").build())
- .add(OSType.builder().id("56").OSCategoryId("6").description("Windows Vista (32-bit)").build())
- .add(OSType.builder().id("101").OSCategoryId("6").description("Windows Vista (64-bit)").build())
- .add(OSType.builder().id("93").OSCategoryId("6").description("Windows XP (32-bit)").build())
- .add(OSType.builder().id("94").OSCategoryId("6").description("Windows XP (64-bit)").build())
- .add(OSType.builder().id("57").OSCategoryId("6").description("Windows XP SP2 (32-bit)").build())
- .add(OSType.builder().id("58").OSCategoryId("6").description("Windows XP SP3 (32-bit)").build()).build();
- }
-}
[17/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java
deleted file mode 100644
index 82402ea..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListPortForwardingRulesOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListPortForwardingRulesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListPortForwardingRulesOptions.Builder.ipAddressId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListPortForwardingRulesOptions}
- */
-@Test(groups = "unit")
-public class ListPortForwardingRulesOptionsTest {
-
- public void testAccount() {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions().accountInDomain("account", "6");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountStatic() {
- ListPortForwardingRulesOptions options = accountInDomain("account", "6");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testName() {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions().ipAddressId("9");
- assertEquals(ImmutableList.of("9"), options.buildQueryParameters().get("ipaddressid"));
- }
-
- public void testNameStatic() {
- ListPortForwardingRulesOptions options = ipAddressId("9");
- assertEquals(ImmutableList.of("9"), options.buildQueryParameters().get("ipaddressid"));
- }
-
- public void testDomainId() {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListPortForwardingRulesOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java
deleted file mode 100644
index fb606ae..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.IPAddress;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.VLANId;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.allocatedOnly;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.networkId;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.usesVirtualNetwork;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListIPAddressesOptions}
- */
-@Test(groups = "unit")
-public class ListPublicIPAddressesOptionsTest {
-
- public void testAllocatedOnly() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().allocatedOnly(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("allocatedonly"));
- }
-
- public void testAllocatedOnlyStatic() {
- ListPublicIPAddressesOptions options = allocatedOnly(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("allocatedonly"));
- }
-
- public void testVLANId() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().VLANId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("vlanid"));
- }
-
- public void testVLANIdStatic() {
- ListPublicIPAddressesOptions options = VLANId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("vlanid"));
- }
-
- public void testNetworkId() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().networkId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testNetworkIdStatic() {
- ListPublicIPAddressesOptions options = networkId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testIPAddress() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().IPAddress("10.1.1.1");
- assertEquals(ImmutableList.of("10.1.1.1"), options.buildQueryParameters().get("ipaddress"));
- }
-
- public void testIPAddressStatic() {
- ListPublicIPAddressesOptions options = IPAddress("10.1.1.1");
- assertEquals(ImmutableList.of("10.1.1.1"), options.buildQueryParameters().get("ipaddress"));
- }
-
- public void testAccountInDomainId() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- ListPublicIPAddressesOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testZoneId() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListPublicIPAddressesOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testUsingVirtualNetwork() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().usesVirtualNetwork(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testUsingVirtualNetworkStatic() {
- ListPublicIPAddressesOptions options = usesVirtualNetwork(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testId() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainId() {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testIdStatic() {
- ListPublicIPAddressesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainIdStatic() {
- ListPublicIPAddressesOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java
deleted file mode 100644
index 6b5a6e8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListSecurityGroupsOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListSecurityGroupsOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListSecurityGroupsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListSecurityGroupsOptions.Builder.named;
-import static org.jclouds.cloudstack.options.ListSecurityGroupsOptions.Builder.virtualMachineId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListSecurityGroupsOptions}
- */
-@Test(groups = "unit")
-public class ListSecurityGroupsOptionsTest {
-
- public void testId() {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListSecurityGroupsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testAccount() {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions().accountInDomain("account", "1");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- }
-
- public void testAccountStatic() {
- ListSecurityGroupsOptions options = accountInDomain("account", "1");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- }
-
- public void testName() {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions().named("securityGroupName");
- assertEquals(ImmutableList.of("securityGroupName"), options.buildQueryParameters().get("securitygroupname"));
- }
-
- public void testNameStatic() {
- ListSecurityGroupsOptions options = named("securityGroupName");
- assertEquals(ImmutableList.of("securityGroupName"), options.buildQueryParameters().get("securitygroupname"));
- }
-
- public void testDomainId() {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListSecurityGroupsOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testVirtualMachineId() {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions().virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-
- public void testVirtualMachineIdStatic() {
- ListSecurityGroupsOptions options = virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java
deleted file mode 100644
index 2c4745f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListServiceOfferingsOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListServiceOfferingsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListServiceOfferingsOptions.Builder.name;
-import static org.jclouds.cloudstack.options.ListServiceOfferingsOptions.Builder.virtualMachineId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListServiceOfferingsOptions}
- */
-@Test(groups = "unit")
-public class ListServiceOfferingsOptionsTest {
-
- public void testId() {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListServiceOfferingsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testName() {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions().name("name");
- assertEquals(ImmutableList.of("name"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- ListServiceOfferingsOptions options = name("name");
- assertEquals(ImmutableList.of("name"), options.buildQueryParameters().get("name"));
- }
-
- public void testDomainId() {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListServiceOfferingsOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testVirtualMachineId() {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions().virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-
- public void testVirtualMachineIdStatic() {
- ListServiceOfferingsOptions options = virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java
deleted file mode 100644
index 28e0ca0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.clusterId;
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.ipAddress;
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.name;
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.path;
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Test for the ListStoragePoolsOptions class.
- */
-@Test(groups = "unit")
-public class ListStoragePoolsOptionsTest {
-
- public void testClusterId() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().clusterId("14");
- assertEquals(ImmutableList.of(14 + ""), options.buildQueryParameters().get("clusterid"));
- }
-
- public void testClusterIdStatic() {
- ListStoragePoolsOptions options = clusterId("14");
- assertEquals(ImmutableList.of(14 + ""), options.buildQueryParameters().get("clusterid"));
- }
-
- public void testId() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().id("15");
- assertEquals(ImmutableList.of(15 + ""), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListStoragePoolsOptions options = id("15");
- assertEquals(ImmutableList.of(15 + ""), options.buildQueryParameters().get("id"));
- }
-
- public void testIpAddress() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().ipAddress("192.168.42.42");
- assertEquals(ImmutableList.of("192.168.42.42"), options.buildQueryParameters().get("ipaddress"));
- }
-
- public void testIpAddressStatic() {
- ListStoragePoolsOptions options = ipAddress("192.168.42.42");
- assertEquals(ImmutableList.of("192.168.42.42"), options.buildQueryParameters().get("ipaddress"));
- }
-
- public void testKeyword() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListStoragePoolsOptions options = keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testName() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().name("bob");
- assertEquals(ImmutableList.of("bob"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- ListStoragePoolsOptions options = name("bob");
- assertEquals(ImmutableList.of("bob"), options.buildQueryParameters().get("name"));
- }
-
- public void testPath() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().path("/foo/bar");
- assertEquals(ImmutableList.of("/foo/bar"), options.buildQueryParameters().get("path"));
- }
-
- public void testPathStatic() {
- ListStoragePoolsOptions options = path("/foo/bar");
- assertEquals(ImmutableList.of("/foo/bar"), options.buildQueryParameters().get("path"));
- }
-
- public void testPodId() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().podId("16");
- assertEquals(ImmutableList.of(16 + ""), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- ListStoragePoolsOptions options = podId("16");
- assertEquals(ImmutableList.of(16 + ""), options.buildQueryParameters().get("podid"));
- }
-
- public void testZoneId() {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions().zoneId("17");
- assertEquals(ImmutableList.of(17 + ""), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListStoragePoolsOptions options = zoneId("17");
- assertEquals(ImmutableList.of(17 + ""), options.buildQueryParameters().get("zoneid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java
deleted file mode 100644
index 17be0e0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.filter;
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.hypervisor;
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.TemplateFilter;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListTemplatesOptions}
- */
-@Test(groups = "unit")
-public class ListTemplatesOptionsTest {
-
- public void testId() {
- ListTemplatesOptions options = new ListTemplatesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListTemplatesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainId() {
- ListTemplatesOptions options = new ListTemplatesOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListTemplatesOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainId() {
- ListTemplatesOptions options = new ListTemplatesOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- ListTemplatesOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testHypervisor() {
- ListTemplatesOptions options = new ListTemplatesOptions().hypervisor("KVM");
- assertEquals(ImmutableList.of("KVM"), options.buildQueryParameters().get("hypervisor"));
- }
-
- public void testHypervisorStatic() {
- ListTemplatesOptions options = hypervisor("KVM");
- assertEquals(ImmutableList.of("KVM"), options.buildQueryParameters().get("hypervisor"));
- }
-
- public void testName() {
- ListTemplatesOptions options = new ListTemplatesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testNameStatic() {
- ListTemplatesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testZoneId() {
- ListTemplatesOptions options = new ListTemplatesOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListTemplatesOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testFilterDefault() {
- assertEquals(ImmutableList.of("executable"),
- new ListTemplatesOptions().buildQueryParameters().get("templatefilter"));
- }
-
- public void testFilter() {
- ListTemplatesOptions options = new ListTemplatesOptions().filter(TemplateFilter.SELF_EXECUTABLE);
- assertEquals(ImmutableList.of("self-executable"), options.buildQueryParameters().get("templatefilter"));
- }
-
- public void testFilterStatic() {
- ListTemplatesOptions options = filter(TemplateFilter.SELF_EXECUTABLE);
- assertEquals(ImmutableList.of("self-executable"), options.buildQueryParameters().get("templatefilter"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java
deleted file mode 100644
index 80b9896..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.accountId;
-import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.page;
-import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.pageSize;
-import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.type;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalUsageApi.listUsageOptions() API call
- */
-@Test(groups = "unit")
-public class ListUsageRecordsOptionsTest {
-
- public void testAccountInDomain() {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions().accountInDomain("fred", "42");
- assertEquals(ImmutableSet.of("fred"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableSet.of("42"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainStatic() {
- ListUsageRecordsOptions options = accountInDomain("fred", "42");
- assertEquals(ImmutableSet.of("fred"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableSet.of("42"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainId() {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions().domainId("42");
- assertEquals(ImmutableSet.of("42"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListUsageRecordsOptions options = domainId("42");
- assertEquals(ImmutableSet.of("42"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountId() {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions().accountId("41");
- assertEquals(ImmutableSet.of("41"), options.buildQueryParameters().get("accountid"));
- }
-
- public void testAccountIdStatic() {
- ListUsageRecordsOptions options = accountId("41");
- assertEquals(ImmutableSet.of("41"), options.buildQueryParameters().get("accountid"));
- }
-
- public void testKeyword() {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions().keyword("bob");
- assertEquals(ImmutableSet.of("bob"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListUsageRecordsOptions options = keyword("bob");
- assertEquals(ImmutableSet.of("bob"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testTypeStatic() {
- ListUsageRecordsOptions options = type("3");
- assertEquals(ImmutableSet.of("3"), options.buildQueryParameters().get("type"));
- }
-
- public void testPageStatic() {
- ListUsageRecordsOptions options = page("1");
- assertEquals(ImmutableSet.of("1"), options.buildQueryParameters().get("page"));
- }
-
- public void testPageSizeStatic() {
- ListUsageRecordsOptions options = pageSize("500");
- assertEquals(ImmutableSet.of("500"), options.buildQueryParameters().get("pagesize"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java
deleted file mode 100644
index fe3ac34..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.accountType;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.page;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.pageSize;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.state;
-import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.userName;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.User;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code ListUsersOptions}
- */
-@Test(groups = "unit")
-public class ListUsersOptionsTest {
-
-
- public void testId() {
- ListUsersOptions options = new ListUsersOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListUsersOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testUserName() {
- ListUsersOptions options = new ListUsersOptions().userName("andrei");
- assertEquals(ImmutableSet.of("andrei"), options.buildQueryParameters().get("name"));
- }
-
- public void testUserNameStatic() {
- ListUsersOptions options = userName("andrei");
- assertEquals(ImmutableSet.of("andrei"), options.buildQueryParameters().get("name"));
- }
-
- public void testState() {
- ListUsersOptions options = new ListUsersOptions().state(User.State.ENABLED);
- assertEquals(ImmutableList.of("enabled"), options.buildQueryParameters().get("state"));
- }
-
- public void testStateStatic() {
- ListUsersOptions options = state(User.State.ENABLED);
- assertEquals(ImmutableList.of("enabled"), options.buildQueryParameters().get("state"));
- }
-
- public void testAccountType() {
- ListUsersOptions options = new ListUsersOptions().accountType("user");
- assertEquals(ImmutableList.of("user"), options.buildQueryParameters().get("accounttype"));
- }
-
- public void testAccountTypeStatic() {
- ListUsersOptions options = accountType("user");
- assertEquals(ImmutableList.of("user"), options.buildQueryParameters().get("accounttype"));
- }
-
- public void testKeyword() {
- ListUsersOptions options = new ListUsersOptions().keyword("key");
- assertEquals(ImmutableList.of("key"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListUsersOptions options = keyword("key");
- assertEquals(ImmutableList.of("key"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testPage() {
- ListUsersOptions options = new ListUsersOptions().page(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("page"));
- }
-
- public void testPageStatic() {
- ListUsersOptions options = page(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("page"));
- }
-
- public void testPageSize() {
- ListUsersOptions options = new ListUsersOptions().pageSize(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("pagesize"));
- }
-
- public void testPageSizeStatic() {
- ListUsersOptions options = pageSize(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("pagesize"));
- }
-
- public void testAccountInDomainId() {
- ListUsersOptions options = new ListUsersOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- ListUsersOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListUsersOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java
deleted file mode 100644
index bb5df4c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.groupId;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.hostId;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.networkId;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.state;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.usesVirtualNetwork;
-import static org.jclouds.cloudstack.options.ListVirtualMachinesOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListVirtualMachinesOptions}
- */
-@Test(groups = "unit")
-public class ListVirtualMachesOptionsTest {
-
- public void testHostId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().hostId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("hostid"));
- }
-
- public void testHostIdStatic() {
- ListVirtualMachinesOptions options = hostId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("hostid"));
- }
-
- public void testPodId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().podId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- ListVirtualMachinesOptions options = podId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("podid"));
- }
-
- public void testNetworkId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().networkId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testNetworkIdStatic() {
- ListVirtualMachinesOptions options = networkId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testGroupId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().groupId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("groupid"));
- }
-
- public void testGroupIdStatic() {
- ListVirtualMachinesOptions options = groupId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("groupid"));
- }
-
- public void testAccountInDomainId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- ListVirtualMachinesOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testName() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testNameStatic() {
- ListVirtualMachinesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testZoneId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListVirtualMachinesOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testState() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().state("state");
- assertEquals(ImmutableList.of("state"), options.buildQueryParameters().get("state"));
- }
-
- public void testStateStatic() {
- ListVirtualMachinesOptions options = state("state");
- assertEquals(ImmutableList.of("state"), options.buildQueryParameters().get("state"));
- }
-
- public void testUsingVirtualNetwork() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().usesVirtualNetwork(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testUsingVirtualNetworkStatic() {
- ListVirtualMachinesOptions options = usesVirtualNetwork(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainId() {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testIdStatic() {
- ListVirtualMachinesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainIdStatic() {
- ListVirtualMachinesOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java
deleted file mode 100644
index b8139f4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.forVirtualNetwork;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.networkId;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.vlan;
-import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListVlanIPRangesOptions}
- */
-@Test(groups = "unit")
-public class ListVlanIPRangesOptionsTest {
-
- public void testAccountInDomain() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().accountInDomain("fred", "19");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("19"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainStatic() {
- ListVlanIPRangesOptions options = accountInDomain("fred", "19");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("19"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainId() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().domainId("19");
- assertEquals(ImmutableList.of("19"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListVlanIPRangesOptions options = domainId("19");
- assertEquals(ImmutableList.of("19"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testForVirtualNetwork() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().forVirtualNetwork(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testForVirtualNetworkStatic() {
- ListVlanIPRangesOptions options = forVirtualNetwork(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testId() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListVlanIPRangesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testKeyword() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListVlanIPRangesOptions options = keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testNetworkId() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().networkId("209");
- assertEquals(ImmutableList.of("209"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testNetworkIdStatic() {
- ListVlanIPRangesOptions options = networkId("209");
- assertEquals(ImmutableList.of("209"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testPodId() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().podId("13");
- assertEquals(ImmutableList.of("13"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- ListVlanIPRangesOptions options = podId("13");
- assertEquals(ImmutableList.of("13"), options.buildQueryParameters().get("podid"));
- }
-
- public void testVlan() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().vlan(1001);
- assertEquals(ImmutableList.of("1001"), options.buildQueryParameters().get("vlan"));
- }
-
- public void testVlanStatic() {
- ListVlanIPRangesOptions options = vlan(1001);
- assertEquals(ImmutableList.of("1001"), options.buildQueryParameters().get("vlan"));
- }
-
- public void testZoneId() {
- ListVlanIPRangesOptions options = new ListVlanIPRangesOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListVlanIPRangesOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java
deleted file mode 100644
index 17d1146..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListZonesOptions.Builder.available;
-import static org.jclouds.cloudstack.options.ListZonesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListZonesOptions.Builder.id;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListZonesOptions}
- */
-@Test(groups = "unit")
-public class ListZonesOptionsTest {
-
- public void testId() {
- ListZonesOptions options = new ListZonesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testAvailable() {
- ListZonesOptions options = new ListZonesOptions().available(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("available"));
- }
-
- public void testDomainId() {
- ListZonesOptions options = new ListZonesOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testIdStatic() {
- ListZonesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testAvailableStatic() {
- ListZonesOptions options = available(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("available"));
- }
-
- public void testDomainIdStatic() {
- ListZonesOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java
deleted file mode 100644
index 6d6cdee..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.UpdateAccountOptions.Builder.networkDomain;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code UpdateAccountOptions}
- */
-@Test(groups = "unit")
-public class UpdateAccountOptionsTest {
-
- public void testNetworkDomain() {
- UpdateAccountOptions options = new UpdateAccountOptions().networkDomain("net");
- assertEquals(ImmutableSet.of("net"), options.buildQueryParameters().get("networkdomain"));
- }
-
- public void testNameStatic() {
- UpdateAccountOptions options = networkDomain("net");
- assertEquals(ImmutableSet.of("net"), options.buildQueryParameters().get("networkdomain"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java
deleted file mode 100644
index b5c933e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.UpdateClusterOptions.Builder.allocationState;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code UpdateClusterOptions}
- */
-@Test(groups = "unit")
-public class UpdateClusterOptionsTest {
-
- public void testAllocationState() {
- UpdateClusterOptions options = new UpdateClusterOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- UpdateClusterOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testClusterName() {
- UpdateClusterOptions options = new UpdateClusterOptions().clusterName("My Cluster");
- assertEquals(ImmutableList.of("My Cluster"), options.buildQueryParameters().get("clustername"));
- }
-
- public void testClusterType() {
- UpdateClusterOptions options = new UpdateClusterOptions().clusterType(Host.ClusterType.CLOUD_MANAGED);
- assertEquals(ImmutableList.of("CloudManaged"), options.buildQueryParameters().get("clustertype"));
- }
-
- public void testHypervisor() {
- UpdateClusterOptions options = new UpdateClusterOptions().hypervisor("XenServer");
- assertEquals(ImmutableList.of("XenServer"), options.buildQueryParameters().get("hypervisor"));
- }
-
- public void testManagedState() {
- UpdateClusterOptions options = new UpdateClusterOptions().managedState(Cluster.ManagedState.PREPARE_UNMANAGED);
- assertEquals(ImmutableList.of("PrepareUnmanaged"), options.buildQueryParameters().get("managedstate"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java
deleted file mode 100644
index 097b12d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.UpdateDiskOfferingOptions.Builder.displayText;
-import static org.jclouds.cloudstack.options.UpdateDiskOfferingOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code UpdateDiskOfferingOptions}
- */
-@Test(groups = "unit")
-public class UpdateDiskOfferingOptionsTest {
-
- public void testName() {
- UpdateDiskOfferingOptions options = new UpdateDiskOfferingOptions().name("test-name");
- assertEquals(ImmutableSet.of("test-name"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- UpdateDiskOfferingOptions options = name("test-name");
- assertEquals(ImmutableSet.of("test-name"), options.buildQueryParameters().get("name"));
- }
-
- public void testDisplayText() {
- UpdateDiskOfferingOptions options = new UpdateDiskOfferingOptions().displayText("test-display-text");
- assertEquals(ImmutableSet.of("test-display-text"), options.buildQueryParameters().get("displaytext"));
- }
-
- public void testDisplayTextStatic() {
- UpdateDiskOfferingOptions options = displayText("test-display-text");
- assertEquals(ImmutableSet.of("test-display-text"), options.buildQueryParameters().get("displaytext"));
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java
deleted file mode 100644
index bf4d088..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.UpdateHostOptions.Builder.allocationState;
-import static org.jclouds.cloudstack.options.UpdateHostOptions.Builder.hostTags;
-import static org.jclouds.cloudstack.options.UpdateHostOptions.Builder.osCategoryId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code UpdateHostOptions}
- */
-@Test(groups = "unit")
-public class UpdateHostOptionsTest {
-
- public void testAllocationState() {
- UpdateHostOptions options = new UpdateHostOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- UpdateHostOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testHostTags() {
- UpdateHostOptions options = new UpdateHostOptions().hostTags(ImmutableSet.<String>of("foo", "bar", "baz"));
- assertEquals(ImmutableList.of("foo,bar,baz"), options.buildQueryParameters().get("hosttags"));
- }
-
- public void testHostTagsStatic() {
- UpdateHostOptions options = hostTags(ImmutableSet.<String>of("foo", "bar", "baz"));
- assertEquals(ImmutableList.of("foo,bar,baz"), options.buildQueryParameters().get("hosttags"));
- }
-
- public void testOsCategoryId() {
- UpdateHostOptions options = new UpdateHostOptions().osCategoryId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("oscategoryid"));
- }
-
- public void testOsCategoryIdStatic() {
- UpdateHostOptions options = osCategoryId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("oscategoryid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptionsTest.java
deleted file mode 100644
index a18311c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptionsTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.OPTIONAL;
-import static org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions.Builder.availability;
-import static org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions.Builder.displayText;
-import static org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code UpdateNetworkOfferingOptions}
- */
-@Test(groups = "unit")
-public class UpdateNetworkOfferingOptionsTest {
-
- public void testName() {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions().name("test-name");
- assertEquals(ImmutableSet.of("test-name"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- UpdateNetworkOfferingOptions options = name("test-name");
- assertEquals(ImmutableSet.of("test-name"), options.buildQueryParameters().get("name"));
- }
-
- public void testDisplayText() {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions().displayText("test-display-text");
- assertEquals(ImmutableSet.of("test-display-text"), options.buildQueryParameters().get("displaytext"));
- }
-
- public void testDisplayTextStatic() {
- UpdateNetworkOfferingOptions options = displayText("test-display-text");
- assertEquals(ImmutableSet.of("test-display-text"), options.buildQueryParameters().get("displaytext"));
- }
-
- public void testAvailability() {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions().availability(OPTIONAL);
- assertEquals(ImmutableSet.of("Optional"), options.buildQueryParameters().get("availability"));
- }
-
- public void testAvailabilityStatic() {
- UpdateNetworkOfferingOptions options = availability(OPTIONAL);
- assertEquals(ImmutableSet.of("Optional"), options.buildQueryParameters().get("availability"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java
deleted file mode 100644
index a112549..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.allocationState;
-import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.endIp;
-import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.gateway;
-import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.name;
-import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.netmask;
-import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.startIp;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code UpdatePodOptions}
- */
-@Test(groups = "unit")
-public class UpdatePodOptionsTest {
-
- public void testName() {
- UpdatePodOptions options = new UpdatePodOptions().name("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- UpdatePodOptions options = name("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("name"));
- }
-
- public void testStartIp() {
- UpdatePodOptions options = new UpdatePodOptions().startIp("192.168.42.42");
- assertEquals(ImmutableList.of("192.168.42.42"), options.buildQueryParameters().get("startip"));
- }
-
- public void testStartIpStatic() {
- UpdatePodOptions options = startIp("192.168.42.42");
- assertEquals(ImmutableList.of("192.168.42.42"), options.buildQueryParameters().get("startip"));
- }
-
- public void testEndIp() {
- UpdatePodOptions options = new UpdatePodOptions().endIp("192.168.42.52");
- assertEquals(ImmutableList.of("192.168.42.52"), options.buildQueryParameters().get("endip"));
- }
-
- public void testEndIpStatic() {
- UpdatePodOptions options = endIp("192.168.42.52");
- assertEquals(ImmutableList.of("192.168.42.52"), options.buildQueryParameters().get("endip"));
- }
-
- public void testGateway() {
- UpdatePodOptions options = new UpdatePodOptions().gateway("192.168.42.62");
- assertEquals(ImmutableList.of("192.168.42.62"), options.buildQueryParameters().get("gateway"));
- }
-
- public void testGatewayStatic() {
- UpdatePodOptions options = gateway("192.168.42.62");
- assertEquals(ImmutableList.of("192.168.42.62"), options.buildQueryParameters().get("gateway"));
- }
-
- public void testNetmask() {
- UpdatePodOptions options = new UpdatePodOptions().netmask("255.255.240.0");
- assertEquals(ImmutableList.of("255.255.240.0"), options.buildQueryParameters().get("netmask"));
- }
-
- public void testNetmaskStatic() {
- UpdatePodOptions options = netmask("255.255.240.0");
- assertEquals(ImmutableList.of("255.255.240.0"), options.buildQueryParameters().get("netmask"));
- }
-
- public void testAllocationState() {
- UpdatePodOptions options = new UpdatePodOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- UpdatePodOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptionsTest.java
deleted file mode 100644
index 7bbe2b7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptionsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.UpdateServiceOfferingOptions.Builder.displayText;
-import static org.jclouds.cloudstack.options.UpdateServiceOfferingOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code UpdateServiceOfferingOptions}
- */
-@Test(groups = "unit")
-public class UpdateServiceOfferingOptionsTest {
-
- public void testName() {
- UpdateServiceOfferingOptions options = new UpdateServiceOfferingOptions().name("test-name");
- assertEquals(ImmutableSet.of("test-name"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- UpdateServiceOfferingOptions options = name("test-name");
- assertEquals(ImmutableSet.of("test-name"), options.buildQueryParameters().get("name"));
- }
-
- public void testDisplayText() {
- UpdateServiceOfferingOptions options = new UpdateServiceOfferingOptions().displayText("test-display-text");
- assertEquals(ImmutableSet.of("test-display-text"), options.buildQueryParameters().get("displaytext"));
- }
-
- public void testDisplayTextStatic() {
- UpdateServiceOfferingOptions options = displayText("test-display-text");
- assertEquals(ImmutableSet.of("test-display-text"), options.buildQueryParameters().get("displaytext"));
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java
deleted file mode 100644
index 595e9da..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.email;
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.firstName;
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.lastName;
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.timezone;
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userApiKey;
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userName;
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userSecretKey;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code UpdateUserOptions}
- */
-@Test(groups = "unit")
-public class UpdateUserOptionsTest {
-
- public void testEmail() {
- UpdateUserOptions options = new UpdateUserOptions().email("andrei@example.com");
- assertEquals(ImmutableSet.of("andrei@example.com"), options.buildQueryParameters().get("email"));
- }
-
- public void testEmailStatic() {
- UpdateUserOptions options = email("andrei@example.com");
- assertEquals(ImmutableSet.of("andrei@example.com"), options.buildQueryParameters().get("email"));
- }
-
- public void testFirstName() {
- UpdateUserOptions options = new UpdateUserOptions().firstName("First");
- assertEquals(ImmutableSet.of("First"), options.buildQueryParameters().get("firstname"));
- }
-
- public void testFirstStatic() {
- UpdateUserOptions options = firstName("First");
- assertEquals(ImmutableSet.of("First"), options.buildQueryParameters().get("firstname"));
- }
-
- public void testLastName() {
- UpdateUserOptions options = new UpdateUserOptions().lastName("Last");
- assertEquals(ImmutableSet.of("Last"), options.buildQueryParameters().get("lastname"));
- }
-
- public void testLastNameStatic() {
- UpdateUserOptions options = lastName("Last");
- assertEquals(ImmutableSet.of("Last"), options.buildQueryParameters().get("lastname"));
- }
-
- public void testTimezone() {
- UpdateUserOptions options = new UpdateUserOptions().timezone("timez");
- assertEquals(ImmutableSet.of("timez"), options.buildQueryParameters().get("timezone"));
- }
-
- public void testTimezoneStatic() {
- UpdateUserOptions options = timezone("timez");
- assertEquals(ImmutableSet.of("timez"), options.buildQueryParameters().get("timezone"));
- }
-
- public void testUserApiKey() {
- UpdateUserOptions options = new UpdateUserOptions().userApiKey("sdfoasdjfo");
- assertEquals(ImmutableSet.of("sdfoasdjfo"), options.buildQueryParameters().get("userapikey"));
- }
-
- public void testUserApiKeyStatic() {
- UpdateUserOptions options = userApiKey("sdfoasdjfo");
- assertEquals(ImmutableSet.of("sdfoasdjfo"), options.buildQueryParameters().get("userapikey"));
- }
-
- public void testUserSecretKey() {
- UpdateUserOptions options = new UpdateUserOptions().userSecretKey("sdfoasdjfo");
- assertEquals(ImmutableSet.of("sdfoasdjfo"), options.buildQueryParameters().get("usersecretkey"));
- }
-
- public void testUserSecretKeyStatic() {
- UpdateUserOptions options = userSecretKey("sdfoasdjfo");
- assertEquals(ImmutableSet.of("sdfoasdjfo"), options.buildQueryParameters().get("usersecretkey"));
- }
-
- public void testUserName() {
- UpdateUserOptions options = new UpdateUserOptions().userName("andrei");
- assertEquals(ImmutableSet.of("andrei"), options.buildQueryParameters().get("username"));
- }
-
- public void testUserNameStatic() {
- UpdateUserOptions options = userName("andrei");
- assertEquals(ImmutableSet.of("andrei"), options.buildQueryParameters().get("username"));
- }
-}
[40/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
deleted file mode 100644
index a4584db..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-public class TemplatePermission {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromTemplatePermission(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected String domainId;
- protected boolean isPublic;
-
- /**
- * @see TemplatePermission#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see TemplatePermission#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see TemplatePermission#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see TemplatePermission#isPublic()
- */
- public T isPublic(boolean isPublic) {
- this.isPublic = isPublic;
- return self();
- }
-
- public TemplatePermission build() {
- return new TemplatePermission(id, account, domainId, isPublic);
- }
-
- public T fromTemplatePermission(TemplatePermission in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .domainId(in.getDomainId())
- .isPublic(in.isPublic());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final String domainId;
- private final boolean isPublic;
-
- @ConstructorProperties({
- "id", "account", "domainid", "ispublic"
- })
- protected TemplatePermission(String id, @Nullable String account, @Nullable String domainId, boolean isPublic) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.domainId = domainId;
- this.isPublic = isPublic;
- }
-
- /**
- * Gets the template ID
- *
- * @return the template ID
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * Gets the list of accounts the template is available for
- *
- * @return the list of accounts the template is available for
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * Gets the ID of the domain to which the template belongs
- *
- * @return the ID of the domain to which the template belongs
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * Returns true if this template is a public template, false otherwise
- *
- * @return true if this template is a public template, false otherwise
- */
- public boolean isPublic() {
- return this.isPublic;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, domainId, isPublic);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- TemplatePermission that = TemplatePermission.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.isPublic, that.isPublic);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("domainId", domainId).add("isPublic", isPublic);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java
deleted file mode 100644
index 92de05c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * @see NetworkOfferingApi#listNetworkOfferings
- */
-public enum TrafficType {
-
- /**
- * traffic to the public internet
- */
- PUBLIC,
- /**
- * VM-to-VM traffic and VMs are assigned a virtual IP created by CloudStack
- */
- GUEST,
- /**
- * System network that only Admin can view, and only when isSystem is
- * specified.
- */
- STORAGE,
- /**
- * System network that only Admin can view, and only when isSystem is
- * specified.
- */
- MANAGEMENT,
- /**
- * System network that only Admin can view, and only when isSystem is
- * specified.
- */
- CONTROL,
-
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static TrafficType fromValue(String type) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
deleted file mode 100644
index 5d413da..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Represents a usage record from CloudStack
- */
-public class UsageRecord {
-
- /**
- */
- public static enum UsageType {
- RUNNING_VM(1),
- ALLOCATED_VM(2),
- IP_ADDRESS(3),
- NETWORK_BYTES_SENT(4),
- NETWORK_BYTES_RECEIVED(5),
- VOLUME(6),
- TEMPLATE(7),
- ISO(8),
- SNAPSHOT(9),
- SECURITY_GROUP(10),
- LOAD_BALANCER_POLICY(11),
- PORT_FORWARDING_RULE(12),
- NETWORK_OFFERING(13),
- VPN_USERS(14),
- UNRECOGNIZED(0);
-
- private int code;
-
- private static final Map<Integer, UsageType> INDEX = Maps.uniqueIndex(ImmutableSet.copyOf(UsageType.values()),
- new Function<UsageType, Integer>() {
-
- @Override
- public Integer apply(UsageType input) {
- return input.code;
- }
-
- });
-
- UsageType(int code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return "" + code;
- }
-
- public static UsageType fromValue(String usageType) {
- Integer code = Integer.valueOf(checkNotNull(usageType, "usageType"));
- return INDEX.containsKey(code) ? INDEX.get(code) : UNRECOGNIZED;
- }
-
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromUsageRecord(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String description;
- protected String accountId;
- protected String accountName;
- protected String domainId;
- protected Date startDate;
- protected Date endDate;
- protected Date assignDate;
- protected String releaseDate;
- protected String zoneId;
- protected String virtualMachineId;
- protected String virtualMachineName;
- protected String serviceOfferingId;
- protected String templateId;
- protected String ipAddress;
- protected boolean isSourceNAT;
- protected double rawUsageHours;
- protected String usage;
- protected String type;
- protected UsageType usageType;
-
- /**
- * @see UsageRecord#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see UsageRecord#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see UsageRecord#getAccountId()
- */
- public T accountId(String accountId) {
- this.accountId = accountId;
- return self();
- }
-
- /**
- * @see UsageRecord#getAccountName()
- */
- public T accountName(String accountName) {
- this.accountName = accountName;
- return self();
- }
-
- /**
- * @see UsageRecord#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see UsageRecord#getStartDate()
- */
- public T startDate(Date startDate) {
- this.startDate = startDate;
- return self();
- }
-
- /**
- * @see UsageRecord#getEndDate()
- */
- public T endDate(Date endDate) {
- this.endDate = endDate;
- return self();
- }
-
- /**
- * @see UsageRecord#getAssignDate()
- */
- public T assignDate(Date assignDate) {
- this.assignDate = assignDate;
- return self();
- }
-
- /**
- * @see UsageRecord#getReleaseDate()
- */
- public T releaseDate(String releaseDate) {
- this.releaseDate = releaseDate;
- return self();
- }
-
- /**
- * @see UsageRecord#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see UsageRecord#getVirtualMachineId()
- */
- public T virtualMachineId(String virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- return self();
- }
-
- /**
- * @see UsageRecord#getVirtualMachineName()
- */
- public T virtualMachineName(String virtualMachineName) {
- this.virtualMachineName = virtualMachineName;
- return self();
- }
-
- /**
- * @see UsageRecord#getServiceOfferingId()
- */
- public T serviceOfferingId(String serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- return self();
- }
-
- /**
- * @see UsageRecord#getTemplateId()
- */
- public T templateId(String templateId) {
- this.templateId = templateId;
- return self();
- }
-
- /**
- * @see UsageRecord#getIpAddress()
- */
- public T ipAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- return self();
- }
-
- /**
- * @see UsageRecord#isSourceNAT()
- */
- public T isSourceNAT(boolean isSourceNAT) {
- this.isSourceNAT = isSourceNAT;
- return self();
- }
-
- /**
- * @see UsageRecord#getRawUsageHours()
- */
- public T rawUsageHours(double rawUsageHours) {
- this.rawUsageHours = rawUsageHours;
- return self();
- }
-
- /**
- * @see UsageRecord#getUsage()
- */
- public T usage(String usage) {
- this.usage = usage;
- return self();
- }
-
- /**
- * @see UsageRecord#getType()
- */
- public T type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see UsageRecord#getUsageType()
- */
- public T usageType(UsageType usageType) {
- this.usageType = usageType;
- return self();
- }
-
- public UsageRecord build() {
- return new UsageRecord(id, description, accountId, accountName, domainId, startDate, endDate, assignDate, releaseDate,
- zoneId, virtualMachineId, virtualMachineName, serviceOfferingId, templateId, ipAddress, isSourceNAT, rawUsageHours,
- usage, type, usageType);
- }
-
- public T fromUsageRecord(UsageRecord in) {
- return this
- .id(in.getId())
- .description(in.getDescription())
- .accountId(in.getAccountId())
- .accountName(in.getAccountName())
- .domainId(in.getDomainId())
- .startDate(in.getStartDate())
- .endDate(in.getEndDate())
- .assignDate(in.getAssignDate())
- .releaseDate(in.getReleaseDate())
- .zoneId(in.getZoneId())
- .virtualMachineId(in.getVirtualMachineId())
- .virtualMachineName(in.getVirtualMachineName())
- .serviceOfferingId(in.getServiceOfferingId())
- .templateId(in.getTemplateId())
- .ipAddress(in.getIpAddress())
- .isSourceNAT(in.isSourceNAT())
- .rawUsageHours(in.getRawUsageHours())
- .usage(in.getUsage())
- .type(in.getType())
- .usageType(in.getUsageType());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String description;
- private final String accountId;
- private final String accountName;
- private final String domainId;
- private final Date startDate;
- private final Date endDate;
- private final Date assignDate;
- private final String releaseDate;
- private final String zoneId;
- private final String virtualMachineId;
- private final String virtualMachineName;
- private final String serviceOfferingId;
- private final String templateId;
- private final String ipAddress;
- private final boolean isSourceNAT;
- private final double rawUsageHours;
- private final String usage;
- private final String type;
- private final UsageType usageType;
-
- @ConstructorProperties({
- "usageid", "description", "accountid", "account", "domainid", "startdate", "enddate", "assigndate", "releasedate",
- "zoneid", "virtualmachineid", "name", "offeringid", "templateid", "ipaddress", "issourcenat", "rawusage", "usage",
- "type", "usagetype"
- })
- protected UsageRecord(String id, @Nullable String description, @Nullable String accountId, @Nullable String accountName,
- @Nullable String domainId, @Nullable Date startDate, @Nullable Date endDate, @Nullable Date assignDate,
- @Nullable String releaseDate, @Nullable String zoneId, @Nullable String virtualMachineId, @Nullable String virtualMachineName,
- @Nullable String serviceOfferingId, @Nullable String templateId, @Nullable String ipAddress,
- boolean isSourceNAT, double rawUsageHours, @Nullable String usage, @Nullable String type, @Nullable UsageType usageType) {
- this.id = id;
- this.description = description;
- this.accountId = accountId;
- this.accountName = accountName;
- this.domainId = domainId;
- this.startDate = startDate;
- this.endDate = endDate;
- this.assignDate = assignDate;
- this.releaseDate = releaseDate;
- this.zoneId = zoneId;
- this.virtualMachineId = virtualMachineId;
- this.virtualMachineName = virtualMachineName;
- this.serviceOfferingId = serviceOfferingId;
- this.templateId = templateId;
- this.ipAddress = ipAddress;
- this.isSourceNAT = isSourceNAT;
- this.rawUsageHours = rawUsageHours;
- this.usage = usage;
- this.type = type;
- this.usageType = usageType;
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- @Nullable
- public String getAccountId() {
- return this.accountId;
- }
-
- @Nullable
- public String getAccountName() {
- return this.accountName;
- }
-
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- @Nullable
- public Date getStartDate() {
- return this.startDate;
- }
-
- @Nullable
- public Date getEndDate() {
- return this.endDate;
- }
-
- @Nullable
- public Date getAssignDate() {
- return this.assignDate;
- }
-
- @Nullable
- public String getReleaseDate() {
- return this.releaseDate;
- }
-
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Nullable
- public String getVirtualMachineId() {
- return this.virtualMachineId;
- }
-
- @Nullable
- public String getVirtualMachineName() {
- return this.virtualMachineName;
- }
-
- @Nullable
- public String getServiceOfferingId() {
- return this.serviceOfferingId;
- }
-
- @Nullable
- public String getTemplateId() {
- return this.templateId;
- }
-
- @Nullable
- public String getIpAddress() {
- return this.ipAddress;
- }
-
- public boolean isSourceNAT() {
- return this.isSourceNAT;
- }
-
- public double getRawUsageHours() {
- return this.rawUsageHours;
- }
-
- @Nullable
- public String getUsage() {
- return this.usage;
- }
-
- @Nullable
- public String getType() {
- return this.type;
- }
-
- @Nullable
- public UsageType getUsageType() {
- return this.usageType;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, description, accountId, accountName, domainId, startDate, endDate, assignDate, releaseDate,
- zoneId, virtualMachineId, virtualMachineName, serviceOfferingId, templateId, ipAddress, isSourceNAT, rawUsageHours,
- usage, type, usageType);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- UsageRecord that = UsageRecord.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.accountId, that.accountId)
- && Objects.equal(this.accountName, that.accountName)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.startDate, that.startDate)
- && Objects.equal(this.endDate, that.endDate)
- && Objects.equal(this.assignDate, that.assignDate)
- && Objects.equal(this.releaseDate, that.releaseDate)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.virtualMachineId, that.virtualMachineId)
- && Objects.equal(this.virtualMachineName, that.virtualMachineName)
- && Objects.equal(this.serviceOfferingId, that.serviceOfferingId)
- && Objects.equal(this.templateId, that.templateId)
- && Objects.equal(this.ipAddress, that.ipAddress)
- && Objects.equal(this.isSourceNAT, that.isSourceNAT)
- && Objects.equal(this.rawUsageHours, that.rawUsageHours)
- && Objects.equal(this.usage, that.usage)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.usageType, that.usageType);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("description", description).add("accountId", accountId).add("accountName", accountName)
- .add("domainId", domainId).add("startDate", startDate).add("endDate", endDate).add("assignDate", assignDate)
- .add("releaseDate", releaseDate).add("zoneId", zoneId).add("virtualMachineId", virtualMachineId)
- .add("virtualMachineName", virtualMachineName).add("serviceOfferingId", serviceOfferingId).add("templateId", templateId)
- .add("ipAddress", ipAddress).add("isSourceNAT", isSourceNAT).add("rawUsageHours", rawUsageHours).add("usage", usage)
- .add("type", type).add("usageType", usageType);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java
deleted file mode 100644
index 8c3d71c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/User.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class User
- */
-public class User {
-
- /**
- */
- public static enum State {
- ENABLED,
- DISABLED,
- UNKNOWN;
-
- public static State fromValue(String value) {
- try {
- return valueOf(value.toUpperCase());
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return name().toLowerCase();
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromUser(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String name;
- protected String firstName;
- protected String lastName;
- protected String email;
- protected Date created;
- protected User.State state;
- protected String account;
- protected Account.Type accountType;
- protected String domain;
- protected String domainId;
- protected String timeZone;
- protected String apiKey;
- protected String secretKey;
-
- /**
- * @see User#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see User#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see User#getFirstName()
- */
- public T firstName(String firstName) {
- this.firstName = firstName;
- return self();
- }
-
- /**
- * @see User#getLastName()
- */
- public T lastName(String lastName) {
- this.lastName = lastName;
- return self();
- }
-
- /**
- * @see User#getEmail()
- */
- public T email(String email) {
- this.email = email;
- return self();
- }
-
- /**
- * @see User#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see User#getState()
- */
- public T state(User.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see User#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see User#getAccountType()
- */
- public T accountType(Account.Type accountType) {
- this.accountType = accountType;
- return self();
- }
-
- /**
- * @see User#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see User#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see User#getTimeZone()
- */
- public T timeZone(String timeZone) {
- this.timeZone = timeZone;
- return self();
- }
-
- /**
- * @see User#getApiKey()
- */
- public T apiKey(String apiKey) {
- this.apiKey = apiKey;
- return self();
- }
-
- /**
- * @see User#getSecretKey()
- */
- public T secretKey(String secretKey) {
- this.secretKey = secretKey;
- return self();
- }
-
- public User build() {
- return new User(id, name, firstName, lastName, email, created, state, account, accountType, domain, domainId, timeZone, apiKey, secretKey);
- }
-
- public T fromUser(User in) {
- return this
- .id(in.getId())
- .name(in.getName())
- .firstName(in.getFirstName())
- .lastName(in.getLastName())
- .email(in.getEmail())
- .created(in.getCreated())
- .state(in.getState())
- .account(in.getAccount())
- .accountType(in.getAccountType())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .timeZone(in.getTimeZone())
- .apiKey(in.getApiKey())
- .secretKey(in.getSecretKey());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String name;
- private final String firstName;
- private final String lastName;
- private final String email;
- private final Date created;
- private final User.State state;
- private final String account;
- private final Account.Type accountType;
- private final String domain;
- private final String domainId;
- private final String timeZone;
- private final String apiKey;
- private final String secretKey;
-
- @ConstructorProperties({
- "id", "username", "firstname", "lastname", "email", "created", "state", "account", "accounttype", "domain",
- "domainid", "timezone", "apikey", "secretkey"
- })
- protected User(String id, @Nullable String name, @Nullable String firstName, @Nullable String lastName,
- @Nullable String email, @Nullable Date created, @Nullable User.State state, @Nullable String account,
- @Nullable Account.Type accountType, @Nullable String domain, @Nullable String domainId, @Nullable String timeZone,
- @Nullable String apiKey, @Nullable String secretKey) {
- this.id = checkNotNull(id, "id");
- this.name = name;
- this.firstName = firstName;
- this.lastName = lastName;
- this.email = email;
- this.created = created;
- this.state = state;
- this.account = account;
- this.accountType = accountType;
- this.domain = domain;
- this.domainId = domainId;
- this.timeZone = timeZone;
- this.apiKey = apiKey;
- this.secretKey = secretKey;
- }
-
- /**
- * @return the user ID
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the user name
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the user firstname
- */
- @Nullable
- public String getFirstName() {
- return this.firstName;
- }
-
- /**
- * @return the user lastname
- */
- @Nullable
- public String getLastName() {
- return this.lastName;
- }
-
- /**
- * @return the user email address
- */
- @Nullable
- public String getEmail() {
- return this.email;
- }
-
- /**
- * @return the date and time the user account was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the user state
- */
- @Nullable
- public User.State getState() {
- return this.state;
- }
-
- /**
- * @return the account name of the user
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the account type of the user
- */
- @Nullable
- public Account.Type getAccountType() {
- return this.accountType;
- }
-
- /**
- * @return the domain name of the user
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain ID of the user
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the timezone user was created in
- */
- @Nullable
- public String getTimeZone() {
- return this.timeZone;
- }
-
- /**
- * @return the api key of the user
- */
- @Nullable
- public String getApiKey() {
- return this.apiKey;
- }
-
- /**
- * @return the secret key of the user
- */
- @Nullable
- public String getSecretKey() {
- return this.secretKey;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name, firstName, lastName, email, created, state, account, accountType, domain, domainId, timeZone, apiKey, secretKey);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- User that = User.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.firstName, that.firstName)
- && Objects.equal(this.lastName, that.lastName)
- && Objects.equal(this.email, that.email)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.accountType, that.accountType)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.timeZone, that.timeZone)
- && Objects.equal(this.apiKey, that.apiKey)
- && Objects.equal(this.secretKey, that.secretKey);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("name", name).add("firstName", firstName).add("lastName", lastName).add("email", email)
- .add("created", created).add("state", state).add("account", account).add("accountType", accountType).add("domain", domain)
- .add("domainId", domainId).add("timeZone", timeZone).add("apiKey", apiKey).add("secretKey", secretKey);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
deleted file mode 100644
index b3e5215..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class VMGroup
- */
-public class VMGroup {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromVMGroup(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected Date created;
- protected String domain;
- protected String domainId;
- protected String name;
-
- /**
- * @see VMGroup#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see VMGroup#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see VMGroup#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see VMGroup#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see VMGroup#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see VMGroup#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- public VMGroup build() {
- return new VMGroup(id, account, created, domain, domainId, name);
- }
-
- public T fromVMGroup(VMGroup in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .created(in.getCreated())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .name(in.getName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final Date created;
- private final String domain;
- private final String domainId;
- private final String name;
-
- @ConstructorProperties({
- "id", "account", "created", "domain", "domainid", "name"
- })
- protected VMGroup(String id, @Nullable String account, @Nullable Date created, @Nullable String domain,
- @Nullable String domainId, @Nullable String name) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.created = created;
- this.domain = domain;
- this.domainId = domainId;
- this.name = name;
- }
-
- /**
- * @return the VMGroup's ID
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account that owns the VMGroup
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the VMGroup's creation timestamp
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the domain that contains the VMGroup
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the ID of the domain that contains the VMGroup
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the name of the VMGroup
- */
- public String getName() {
- return this.name;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, created, domain, domainId, name);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- VMGroup that = VMGroup.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.name, that.name);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId).add("name", name);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
deleted file mode 100644
index 0e23a38..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
+++ /dev/null
@@ -1,1049 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class VirtualMachine
- */
-public class VirtualMachine {
-
- /**
- */
- public static enum State {
- STARTING, RUNNING, STOPPING, STOPPED, DESTROYED, EXPUNGING, MIGRATING, ERROR, UNKNOWN, SHUTDOWNED, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static State fromValue(String state) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromVirtualMachine(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected long cpuCount;
- protected long cpuSpeed;
- protected String cpuUsed;
- protected String displayName;
- protected Date created;
- protected String domain;
- protected String domainId;
- protected boolean usesVirtualNetwork;
- protected String group;
- protected String groupId;
- protected String guestOSId;
- protected boolean HAEnabled;
- protected String hostId;
- protected String hostname;
- protected String IPAddress;
- protected String ISODisplayText;
- protected String ISOId;
- protected String ISOName;
- protected String jobId;
- protected Integer jobStatus;
- protected long memory;
- protected String name;
- protected Long networkKbsRead;
- protected Long networkKbsWrite;
- protected String password;
- protected boolean passwordEnabled;
- protected String publicIP;
- protected String publicIPId;
- protected String rootDeviceId;
- protected String rootDeviceType;
- protected String serviceOfferingId;
- protected String serviceOfferingName;
- protected VirtualMachine.State state;
- protected String templateDisplayText;
- protected String templateId;
- protected String templateName;
- protected String zoneId;
- protected String zoneName;
- protected Set<NIC> nics = ImmutableSet.of();
- protected String hypervisor;
- protected Set<SecurityGroup> securityGroups = ImmutableSet.of();
-
- /**
- * @see VirtualMachine#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see VirtualMachine#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see VirtualMachine#getCpuCount()
- */
- public T cpuCount(long cpuCount) {
- this.cpuCount = cpuCount;
- return self();
- }
-
- /**
- * @see VirtualMachine#getCpuSpeed()
- */
- public T cpuSpeed(long cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- return self();
- }
-
- /**
- * @see VirtualMachine#getCpuUsed()
- */
- public T cpuUsed(String cpuUsed) {
- this.cpuUsed = cpuUsed;
- return self();
- }
-
- /**
- * @see VirtualMachine#getDisplayName()
- */
- public T displayName(String displayName) {
- this.displayName = displayName;
- return self();
- }
-
- /**
- * @see VirtualMachine#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see VirtualMachine#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see VirtualMachine#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see VirtualMachine#usesVirtualNetwork()
- */
- public T usesVirtualNetwork(boolean usesVirtualNetwork) {
- this.usesVirtualNetwork = usesVirtualNetwork;
- return self();
- }
-
- /**
- * @see VirtualMachine#getGroup()
- */
- public T group(String group) {
- this.group = group;
- return self();
- }
-
- /**
- * @see VirtualMachine#getGroupId()
- */
- public T groupId(String groupId) {
- this.groupId = groupId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getGuestOSId()
- */
- public T guestOSId(String guestOSId) {
- this.guestOSId = guestOSId;
- return self();
- }
-
- /**
- * @see VirtualMachine#isHAEnabled()
- */
- public T isHAEnabled(boolean HAEnabled) {
- this.HAEnabled = HAEnabled;
- return self();
- }
-
- /**
- * @see VirtualMachine#getHostId()
- */
- public T hostId(String hostId) {
- this.hostId = hostId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getHostname()
- */
- public T hostname(String hostname) {
- this.hostname = hostname;
- return self();
- }
-
- /**
- * @see VirtualMachine#getIPAddress()
- */
- public T IPAddress(String IPAddress) {
- this.IPAddress = IPAddress;
- return self();
- }
-
- /**
- * @see VirtualMachine#getISODisplayText()
- */
- public T ISODisplayText(String ISODisplayText) {
- this.ISODisplayText = ISODisplayText;
- return self();
- }
-
- /**
- * @see VirtualMachine#getISOId()
- */
- public T ISOId(String ISOId) {
- this.ISOId = ISOId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getISOName()
- */
- public T ISOName(String ISOName) {
- this.ISOName = ISOName;
- return self();
- }
-
- /**
- * @see VirtualMachine#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getJobStatus()
- */
- public T jobStatus(Integer jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- /**
- * @see VirtualMachine#getMemory()
- */
- public T memory(long memory) {
- this.memory = memory;
- return self();
- }
-
- /**
- * @see VirtualMachine#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see VirtualMachine#getNetworkKbsRead()
- */
- public T networkKbsRead(Long networkKbsRead) {
- this.networkKbsRead = networkKbsRead;
- return self();
- }
-
- /**
- * @see VirtualMachine#getNetworkKbsWrite()
- */
- public T networkKbsWrite(Long networkKbsWrite) {
- this.networkKbsWrite = networkKbsWrite;
- return self();
- }
-
- /**
- * @see VirtualMachine#getPassword()
- */
- public T password(String password) {
- this.password = password;
- return self();
- }
-
- /**
- * @see VirtualMachine#isPasswordEnabled()
- */
- public T passwordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- return self();
- }
-
- /**
- * @see VirtualMachine#getPublicIP()
- */
- public T publicIP(String publicIP) {
- this.publicIP = publicIP;
- return self();
- }
-
- /**
- * @see VirtualMachine#getPublicIPId()
- */
- public T publicIPId(String publicIPId) {
- this.publicIPId = publicIPId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getRootDeviceId()
- */
- public T rootDeviceId(String rootDeviceId) {
- this.rootDeviceId = rootDeviceId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getRootDeviceType()
- */
- public T rootDeviceType(String rootDeviceType) {
- this.rootDeviceType = rootDeviceType;
- return self();
- }
-
- /**
- * @see VirtualMachine#getServiceOfferingId()
- */
- public T serviceOfferingId(String serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getServiceOfferingName()
- */
- public T serviceOfferingName(String serviceOfferingName) {
- this.serviceOfferingName = serviceOfferingName;
- return self();
- }
-
- /**
- * @see VirtualMachine#getState()
- */
- public T state(VirtualMachine.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see VirtualMachine#getTemplateDisplayText()
- */
- public T templateDisplayText(String templateDisplayText) {
- this.templateDisplayText = templateDisplayText;
- return self();
- }
-
- /**
- * @see VirtualMachine#getTemplateId()
- */
- public T templateId(String templateId) {
- this.templateId = templateId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getTemplateName()
- */
- public T templateName(String templateName) {
- this.templateName = templateName;
- return self();
- }
-
- /**
- * @see VirtualMachine#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see VirtualMachine#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- /**
- * @see VirtualMachine#getNICs()
- */
- public T nics(Set<NIC> nics) {
- this.nics = ImmutableSet.copyOf(checkNotNull(nics, "nics"));
- return self();
- }
-
- public T nics(NIC... in) {
- return nics(ImmutableSet.copyOf(in));
- }
-
- /**
- * @see VirtualMachine#getHypervisor()
- */
- public T hypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- return self();
- }
-
- /**
- * @see VirtualMachine#getSecurityGroups()
- */
- public T securityGroups(Set<SecurityGroup> securityGroups) {
- this.securityGroups = ImmutableSet.copyOf(checkNotNull(securityGroups, "securityGroups"));
- return self();
- }
-
- public T securityGroups(SecurityGroup... in) {
- return securityGroups(ImmutableSet.copyOf(in));
- }
-
- public VirtualMachine build() {
- return new VirtualMachine(id, account, cpuCount, cpuSpeed, cpuUsed, displayName, created, domain, domainId,
- usesVirtualNetwork, group, groupId, guestOSId, HAEnabled, hostId, hostname, IPAddress, ISODisplayText, ISOId,
- ISOName, jobId, jobStatus, memory, name, networkKbsRead, networkKbsWrite, password, passwordEnabled, publicIP,
- publicIPId, rootDeviceId, rootDeviceType, serviceOfferingId, serviceOfferingName, state, templateDisplayText,
- templateId, templateName, zoneId, zoneName, nics, hypervisor, securityGroups);
- }
-
- public T fromVirtualMachine(VirtualMachine in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .cpuCount(in.getCpuCount())
- .cpuSpeed(in.getCpuSpeed())
- .cpuUsed(in.getCpuUsedAsString())
- .displayName(in.getDisplayName())
- .created(in.getCreated())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .usesVirtualNetwork(in.usesVirtualNetwork())
- .group(in.getGroup())
- .groupId(in.getGroupId())
- .guestOSId(in.getGuestOSId())
- .isHAEnabled(in.isHAEnabled())
- .hostId(in.getHostId())
- .hostname(in.getHostname())
- .IPAddress(in.getIPAddress())
- .ISODisplayText(in.getISODisplayText())
- .ISOId(in.getISOId())
- .ISOName(in.getISOName())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus())
- .memory(in.getMemory())
- .name(in.getName())
- .networkKbsRead(in.getNetworkKbsRead())
- .networkKbsWrite(in.getNetworkKbsWrite())
- .password(in.getPassword())
- .passwordEnabled(in.isPasswordEnabled())
- .publicIP(in.getPublicIP())
- .publicIPId(in.getPublicIPId())
- .rootDeviceId(in.getRootDeviceId())
- .rootDeviceType(in.getRootDeviceType())
- .serviceOfferingId(in.getServiceOfferingId())
- .serviceOfferingName(in.getServiceOfferingName())
- .state(in.getState())
- .templateDisplayText(in.getTemplateDisplayText())
- .templateId(in.getTemplateId())
- .templateName(in.getTemplateName())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName())
- .nics(in.getNICs())
- .hypervisor(in.getHypervisor())
- .securityGroups(in.getSecurityGroups());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final long cpuCount;
- private final long cpuSpeed;
- private final String cpuUsed;
- private final String displayName;
- private final Date created;
- private final String domain;
- private final String domainId;
- private final boolean usesVirtualNetwork;
- private final String group;
- private final String groupId;
- private final String guestOSId;
- private final boolean HAEnabled;
- private final String hostId;
- private final String hostname;
- private final String IPAddress;
- private final String ISODisplayText;
- private final String ISOId;
- private final String ISOName;
- private final String jobId;
- private final Integer jobStatus;
- private final long memory;
- private final String name;
- private final Long networkKbsRead;
- private final Long networkKbsWrite;
- private final String password;
- private final boolean passwordEnabled;
- private final String publicIP;
- private final String publicIPId;
- private final String rootDeviceId;
- private final String rootDeviceType;
- private final String serviceOfferingId;
- private final String serviceOfferingName;
- private final VirtualMachine.State state;
- private final String templateDisplayText;
- private final String templateId;
- private final String templateName;
- private final String zoneId;
- private final String zoneName;
- private final Set<NIC> nics;
- private final String hypervisor;
- private final Set<SecurityGroup> securityGroups;
-
- @ConstructorProperties({
- "id", "account", "cpunumber", "cpuspeed", "cpuused", "displayname", "created", "domain", "domainid", "forvirtualnetwork", "group", "groupid", "guestosid", "haenable", "hostid", "hostname", "ipaddress", "isodisplaytext", "isoid", "isoname", "jobid", "jobstatus", "memory", "name", "networkkbsread", "networkkbswrite", "password", "passwordenabled", "publicip", "publicipid", "rootdeviceid", "rootdevicetype", "serviceofferingid", "serviceofferingname", "state", "templatedisplaytext", "templateid", "templatename", "zoneid", "zonename", "nic", "hypervisor", "securitygroup"
- })
- protected VirtualMachine(String id, @Nullable String account, long cpuCount, long cpuSpeed, @Nullable String cpuUsed,
- @Nullable String displayName, @Nullable Date created, @Nullable String domain, @Nullable String domainId,
- boolean usesVirtualNetwork, @Nullable String group, @Nullable String groupId, @Nullable String guestOSId,
- boolean HAEnabled, @Nullable String hostId, @Nullable String hostname, String IPAddress, String ISODisplayText,
- @Nullable String ISOId, @Nullable String ISOName, @Nullable String jobId, @Nullable Integer jobStatus,
- long memory, @Nullable String name, @Nullable Long networkKbsRead, @Nullable Long networkKbsWrite, @Nullable String password,
- boolean passwordEnabled, @Nullable String publicIP, @Nullable String publicIPId, @Nullable String rootDeviceId,
- @Nullable String rootDeviceType, @Nullable String serviceOfferingId, @Nullable String serviceOfferingName,
- @Nullable VirtualMachine.State state, @Nullable String templateDisplayText, @Nullable String templateId,
- @Nullable String templateName, @Nullable String zoneId, @Nullable String zoneName, @Nullable Set<NIC> nics,
- @Nullable String hypervisor, @Nullable Set<SecurityGroup> securityGroups) {
- Preconditions.checkArgument(Strings.isNullOrEmpty(cpuUsed) || cpuUsed.matches("^[0-9\\.|,\\-]+%$"), "cpuUsed value should be a decimal number followed by %");
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.cpuCount = cpuCount;
- this.cpuSpeed = cpuSpeed;
- this.cpuUsed = cpuUsed;
- this.displayName = displayName;
- this.created = created;
- this.domain = domain;
- this.domainId = domainId;
- this.usesVirtualNetwork = usesVirtualNetwork;
- this.group = group;
- this.groupId = groupId;
- this.guestOSId = guestOSId;
- this.HAEnabled = HAEnabled;
- this.hostId = hostId;
- this.hostname = hostname;
- this.IPAddress = IPAddress;
- this.ISODisplayText = ISODisplayText;
- this.ISOId = ISOId;
- this.ISOName = ISOName;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- this.memory = memory;
- this.name = name;
- this.networkKbsRead = networkKbsRead;
- this.networkKbsWrite = networkKbsWrite;
- this.password = password;
- this.passwordEnabled = passwordEnabled;
- this.publicIP = publicIP;
- this.publicIPId = publicIPId;
- this.rootDeviceId = rootDeviceId;
- this.rootDeviceType = rootDeviceType;
- this.serviceOfferingId = serviceOfferingId;
- this.serviceOfferingName = serviceOfferingName;
- this.state = state;
- this.templateDisplayText = templateDisplayText;
- this.templateId = templateId;
- this.templateName = templateName;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- this.nics = nics == null ? ImmutableSet.<NIC>of() : ImmutableSet.copyOf(nics);
- this.hypervisor = hypervisor;
- this.securityGroups = securityGroups == null ? ImmutableSet.<SecurityGroup>of() : ImmutableSet.copyOf(securityGroups);
- }
-
- /**
- * @return the ID of the virtual machine
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account associated with the virtual machine
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the number of cpu this virtual machine is running with
- */
- public long getCpuCount() {
- return this.cpuCount;
- }
-
- /**
- * @return the speed of each cpu
- */
- public long getCpuSpeed() {
- return this.cpuSpeed;
- }
-
- /**
- * @return the amount of the vm's CPU currently used
- */
- public float getCpuUsed() {
- return cpuUsed != null ? Float.parseFloat(cpuUsed.substring(0, cpuUsed.length() - 1).replace(',', '.')) : 0.0f;
- }
-
- private String getCpuUsedAsString() {
- return cpuUsed;
- }
-
- /**
- * @return user generated name. The name of the virtual machine is returned
- * if no displayname exists.
- */
- @Nullable
- public String getDisplayName() {
- return this.displayName;
- }
-
- /**
- * @return the date when this virtual machine was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the name of the domain in which the virtual machine exists
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the ID of the domain in which the virtual machine exists
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the virtual network for the service offering
- */
- public boolean usesVirtualNetwork() {
- return this.usesVirtualNetwork;
- }
-
- /**
- * @return the group name of the virtual machine
- */
- @Nullable
- public String getGroup() {
- return this.group;
- }
-
- /**
- * @return the group ID of the virtual machine
- */
- @Nullable
- public String getGroupId() {
- return this.groupId;
- }
-
- /**
- * @return Os type ID of the virtual machine
- */
- @Nullable
- public String getGuestOSId() {
- return this.guestOSId;
- }
-
- /**
- * @return true if high-availability is enabled, false otherwise
- */
- public boolean isHAEnabled() {
- return this.HAEnabled;
- }
-
- /**
- * @return the ID of the host for the virtual machine
- */
- @Nullable
- public String getHostId() {
- return this.hostId;
- }
-
- /**
- * @return the name of the host for the virtual machine
- */
- @Nullable
- public String getHostname() {
- return this.hostname;
- }
-
- /**
- * @return the ip address of the virtual machine
- */
- @Nullable
- public String getIPAddress() {
- return this.IPAddress;
- }
-
- /**
- * @return an alternate display text of the ISO attached to the virtual
- * machine
- */
- @Nullable
- public String getISODisplayText() {
- return this.ISODisplayText;
- }
-
- /**
- * @return the ID of the ISO attached to the virtual machine
- */
- @Nullable
- public String getISOId() {
- return this.ISOId;
- }
-
- /**
- * @return the name of the ISO attached to the virtual machine
- */
- @Nullable
- public String getISOName() {
- return this.ISOName;
- }
-
- /**
- * @return shows the current pending asynchronous job ID. This tag is not
- * returned if no current pending jobs are acting on the virtual
- * machine
- */
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- /**
- * @return shows the current pending asynchronous job status
- */
- @Nullable
- public Integer getJobStatus() {
- return this.jobStatus;
- }
-
- /**
- * @return the memory allocated for the virtual machine
- */
- public long getMemory() {
- return this.memory;
- }
-
- /**
- * @return the name of the virtual machine
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the incoming network traffic on the vm
- */
- @Nullable
- public Long getNetworkKbsRead() {
- return this.networkKbsRead;
- }
-
- /**
- * @return the outgoing network traffic on the host
- */
- @Nullable
- public Long getNetworkKbsWrite() {
- return this.networkKbsWrite;
- }
-
- /**
- * @return the password (if exists) of the virtual machine
- */
- @Nullable
- public String getPassword() {
- return this.password;
- }
-
- /**
- * @return true if the password rest feature is enabled, false otherwise
- */
- public boolean isPasswordEnabled() {
- return this.passwordEnabled;
- }
-
- /**
- * @return public IP of this virtual machine
- */
- @Nullable
- public String getPublicIP() {
- return this.publicIP;
- }
-
- /**
- * @return ID of the public IP of this virtual machine
- */
- @Nullable
- public String getPublicIPId() {
- return this.publicIPId;
- }
-
- /**
- * @return device ID of the root volume
- */
- @Nullable
- public String getRootDeviceId() {
- return this.rootDeviceId;
- }
-
- /**
- * @return device type of the root volume
- */
- @Nullable
- public String getRootDeviceType() {
- return this.rootDeviceType;
- }
-
- /**
- * @return the ID of the service offering of the virtual machine
- */
- @Nullable
- public String getServiceOfferingId() {
- return this.serviceOfferingId;
- }
-
- /**
- * @return the name of the service offering of the virtual machine
- */
- @Nullable
- public String getServiceOfferingName() {
- return this.serviceOfferingName;
- }
-
- /**
- * @return the state of the virtual machine
- */
- @Nullable
- public VirtualMachine.State getState() {
- return this.state;
- }
-
- /**
- * @return an alternate display text of the template for the virtual machine
- */
- @Nullable
- public String getTemplateDisplayText() {
- return this.templateDisplayText;
- }
-
- /**
- * @return the ID of the template for the virtual machine. A -1 is returned
- * if the virtual machine was created from an ISO file.
- */
- @Nullable
- public String getTemplateId() {
- return this.templateId;
- }
-
- /**
- * @return the name of the template for the virtual machine
- */
- @Nullable
- public String getTemplateName() {
- return this.templateName;
- }
-
- /**
- * @return the ID of the availability zone for the virtual machine
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return the name of the availability zone for the virtual machine
- */
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- public Set<NIC> getNICs() {
- return this.nics;
- }
-
- /**
- * @return type of the hypervisor
- */
- @Nullable
- public String getHypervisor() {
- return this.hypervisor;
- }
-
- /**
- * @return list of security groups associated with the virtual machine
- */
- public Set<SecurityGroup> getSecurityGroups() {
- return this.securityGroups;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, cpuCount, cpuSpeed, cpuUsed, displayName, created, domain, domainId, usesVirtualNetwork, group, groupId, guestOSId, HAEnabled, hostId, hostname, IPAddress, ISODisplayText, ISOId, ISOName, jobId, jobStatus, memory, name, networkKbsRead, networkKbsWrite, password, passwordEnabled, publicIP, publicIPId, rootDeviceId, rootDeviceType, serviceOfferingId, serviceOfferingName, state, templateDisplayText, templateId, templateName, zoneId, zoneName, nics, hypervisor, securityGroups);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- VirtualMachine that = VirtualMachine.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.cpuCount, that.cpuCount)
- && Objects.equal(this.cpuSpeed, that.cpuSpeed)
- && Objects.equal(this.cpuUsed, that.cpuUsed)
- && Objects.equal(this.displayName, that.displayName)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.usesVirtualNetwork, that.usesVirtualNetwork)
- && Objects.equal(this.group, that.group)
- && Objects.equal(this.groupId, that.groupId)
- && Objects.equal(this.guestOSId, that.guestOSId)
- && Objects.equal(this.HAEnabled, that.HAEnabled)
- && Objects.equal(this.hostId, that.hostId)
- && Objects.equal(this.hostname, that.hostname)
- && Objects.equal(this.IPAddress, that.IPAddress)
- && Objects.equal(this.ISODisplayText, that.ISODisplayText)
- && Objects.equal(this.ISOId, that.ISOId)
- && Objects.equal(this.ISOName, that.ISOName)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus)
- && Objects.equal(this.memory, that.memory)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.networkKbsRead, that.networkKbsRead)
- && Objects.equal(this.networkKbsWrite, that.networkKbsWrite)
- && Objects.equal(this.password, that.password)
- && Objects.equal(this.passwordEnabled, that.passwordEnabled)
- && Objects.equal(this.publicIP, that.publicIP)
- && Objects.equal(this.publicIPId, that.publicIPId)
- && Objects.equal(this.rootDeviceId, that.rootDeviceId)
- && Objects.equal(this.rootDeviceType, that.rootDeviceType)
- && Objects.equal(this.serviceOfferingId, that.serviceOfferingId)
- && Objects.equal(this.serviceOfferingName, that.serviceOfferingName)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.templateDisplayText, that.templateDisplayText)
- && Objects.equal(this.templateId, that.templateId)
- && Objects.equal(this.templateName, that.templateName)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName)
- && Objects.equal(this.nics, that.nics)
- && Objects.equal(this.hypervisor, that.hypervisor)
- && Objects.equal(this.securityGroups, that.securityGroups);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("cpuCount", cpuCount).add("cpuSpeed", cpuSpeed).add("cpuUsed", cpuUsed)
- .add("displayName", displayName).add("created", created).add("domain", domain).add("domainId", domainId)
- .add("usesVirtualNetwork", usesVirtualNetwork).add("group", group).add("groupId", groupId).add("guestOSId", guestOSId)
- .add("HAEnabled", HAEnabled).add("hostId", hostId).add("hostname", hostname).add("IPAddress", IPAddress)
- .add("ISODisplayText", ISODisplayText).add("ISOId", ISOId).add("ISOName", ISOName).add("jobId", jobId)
- .add("jobStatus", jobStatus).add("memory", memory).add("name", name).add("networkKbsRead", networkKbsRead)
- .add("networkKbsWrite", networkKbsWrite).add("password", password).add("passwordEnabled", passwordEnabled)
- .add("publicIP", publicIP).add("publicIPId", publicIPId).add("rootDeviceId", rootDeviceId).add("rootDeviceType", rootDeviceType)
- .add("serviceOfferingId", serviceOfferingId).add("serviceOfferingName", serviceOfferingName).add("state", state)
- .add("templateDisplayText", templateDisplayText).add("templateId", templateId).add("templateName", templateName)
- .add("zoneId", zoneId).add("zoneName", zoneName).add("nics", nics).add("hypervisor", hypervisor).add("securityGroups", securityGroups);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
deleted file mode 100644
index 49c7d18..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Represents the data object used in CloudStack's "Vlan" API.
- */
-public class VlanIPRange implements Comparable<VlanIPRange> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromVlanIPRange(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String description;
- protected boolean forVirtualNetwork;
- protected String zoneId;
- protected String vlan;
- protected String account;
- protected String domainId;
- protected String domain;
- protected String podId;
- protected String podName;
- protected String gateway;
- protected String netmask;
- protected String startIP;
- protected String endIP;
- protected String networkId;
-
- /**
- * @see VlanIPRange#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see VlanIPRange#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see VlanIPRange#isForVirtualNetwork()
- */
- public T forVirtualNetwork(boolean forVirtualNetwork) {
- this.forVirtualNetwork = forVirtualNetwork;
- return self();
- }
-
- /**
- * @see VlanIPRange#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see VlanIPRange#getVlan()
- */
- public T vlan(String vlan) {
- this.vlan = vlan;
- return self();
- }
-
- /**
- * @see VlanIPRange#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see VlanIPRange#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see VlanIPRange#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see VlanIPRange#getPodId()
- */
- public T podId(String podId) {
- this.podId = podId;
- return self();
- }
-
- /**
- * @see VlanIPRange#getPodName()
- */
- public T podName(String podName) {
- this.podName = podName;
- return self();
- }
-
- /**
- * @see VlanIPRange#getGateway()
- */
- public T gateway(String gateway) {
- this.gateway = gateway;
- return self();
- }
-
- /**
- * @see VlanIPRange#getNetmask()
- */
- public T netmask(String netmask) {
- this.netmask = netmask;
- return self();
- }
-
- /**
- * @see VlanIPRange#getStartIP()
- */
- public T startIP(String startIP) {
- this.startIP = startIP;
- return self();
- }
-
- /**
- * @see VlanIPRange#getEndIP()
- */
- public T endIP(String endIP) {
- this.endIP = endIP;
- return self();
- }
-
- /**
- * @see VlanIPRange#getNetworkId()
- */
- public T networkId(String networkId) {
- this.networkId = networkId;
- return self();
- }
-
- public VlanIPRange build() {
- return new VlanIPRange(id, description, forVirtualNetwork, zoneId, vlan, account, domainId, domain, podId,
- podName, gateway, netmask, startIP, endIP, networkId);
- }
-
- public T fromVlanIPRange(VlanIPRange in) {
- return this
- .id(in.getId())
- .description(in.getDescription())
- .forVirtualNetwork(in.isForVirtualNetwork())
- .zoneId(in.getZoneId())
- .vlan(in.getVlan())
- .account(in.getAccount())
- .domainId(in.getDomainId())
- .domain(in.getDomain())
- .podId(in.getPodId())
- .podName(in.getPodName())
- .gateway(in.getGateway())
- .netmask(in.getNetmask())
- .startIP(in.getStartIP())
- .endIP(in.getEndIP())
- .networkId(in.getNetworkId());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String description;
- private final boolean forVirtualNetwork;
- private final String zoneId;
- private final String vlan;
- private final String account;
- private final String domainId;
- private final String domain;
- private final String podId;
- private final String podName;
- private final String gateway;
- private final String netmask;
- private final String startIP;
- private final String endIP;
- private final String networkId;
-
- @ConstructorProperties({
- "id", "description", "forvirtualnetwork", "zoneid", "vlan", "account", "domainid", "domain", "podid", "podname",
- "gateway", "netmask", "startip", "endip", "networkid"
- })
- protected VlanIPRange(String id, @Nullable String description, boolean forVirtualNetwork, @Nullable String zoneId,
- @Nullable String vlan, @Nullable String account, @Nullable String domainId, @Nullable String domain,
- @Nullable String podId, @Nullable String podName, @Nullable String gateway, @Nullable String netmask,
- @Nullable String startIP, @Nullable String endIP, @Nullable String networkId) {
- this.id = checkNotNull(id, "id");
- this.description = description;
- this.forVirtualNetwork = forVirtualNetwork;
- this.zoneId = zoneId;
- this.vlan = vlan;
- this.account = account;
- this.domainId = domainId;
- this.domain = domain;
- this.podId = podId;
- this.podName = podName;
- this.gateway = gateway;
- this.netmask = netmask;
- this.startIP = startIP;
- this.endIP = endIP;
- this.networkId = networkId;
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- public boolean isForVirtualNetwork() {
- return this.forVirtualNetwork;
- }
-
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Nullable
- public String getVlan() {
- return this.vlan;
- }
-
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- @Nullable
- public String getPodId() {
- return this.podId;
- }
-
- @Nullable
- public String getPodName() {
- return this.podName;
- }
-
- @Nullable
- public String getGateway() {
- return this.gateway;
- }
-
- @Nullable
- public String getNetmask() {
- return this.netmask;
- }
-
- @Nullable
- public String getStartIP() {
- return this.startIP;
- }
-
- @Nullable
- public String getEndIP() {
- return this.endIP;
- }
-
- @Nullable
- public String getNetworkId() {
- return this.networkId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, description, forVirtualNetwork, zoneId, vlan, account, domainId, domain, podId, podName, gateway, netmask, startIP, endIP, networkId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- VlanIPRange that = VlanIPRange.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.forVirtualNetwork, that.forVirtualNetwork)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.vlan, that.vlan)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.podId, that.podId)
- && Objects.equal(this.podName, that.podName)
- && Objects.equal(this.gateway, that.gateway)
- && Objects.equal(this.netmask, that.netmask)
- && Objects.equal(this.startIP, that.startIP)
- && Objects.equal(this.endIP, that.endIP)
- && Objects.equal(this.networkId, that.networkId);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("description", description).add("forVirtualNetwork", forVirtualNetwork).add("zoneId", zoneId)
- .add("vlan", vlan).add("account", account).add("domainId", domainId).add("domain", domain).add("podId", podId)
- .add("podName", podName).add("gateway", gateway).add("netmask", netmask).add("startIP", startIP).add("endIP", endIP)
- .add("networkId", networkId);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(VlanIPRange other) {
- return this.id.compareTo(other.id);
- }
-
-}
[37/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java
deleted file mode 100644
index f91c405..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LoadBalancerApi.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.LoadBalancerRule;
-import org.jclouds.cloudstack.domain.LoadBalancerRule.Algorithm;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateLoadBalancerRuleOptions;
-import org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions;
-import org.jclouds.cloudstack.options.UpdateLoadBalancerRuleOptions;
-import org.jclouds.functions.JoinOnComma;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.ParamParser;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface LoadBalancerApi {
-
- /**
- * List the load balancer rules
- *
- * @param options
- * if present, how to constrain the list.
- * @return load balancer rules matching query, or empty set, if no load
- * balancer rules are found
- */
- @Named("listLoadBalancerRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listLoadBalancerRules", "true" })
- @SelectJson("loadbalancerrule")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<LoadBalancerRule> listLoadBalancerRules(ListLoadBalancerRulesOptions... options);
-
- /**
- * get a specific LoadBalancerRule by id
- *
- * @param id
- * LoadBalancerRule to get
- * @return LoadBalancerRule or null if not found
- */
- @Named("listLoadBalancerRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listLoadBalancerRules", "true" })
- @SelectJson("loadbalancerrule")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- LoadBalancerRule getLoadBalancerRule(@QueryParam("id") String id);
-
- /**
- * Creates a load balancer rule.
- *
- * @param publicIPId
- * the public port from where the network traffic will be load
- * balanced from
- * @param algorithm
- * load balancer algorithm (source, roundrobin, leastconn)
- * @param name
- * name of the load balancer rule
- * @param privatePort
- * the private port of the private ip address/virtual machine where
- * the network traffic will be load balanced to
- * @param publicPort
- * public ip address id from where the network traffic will be load
- * balanced from
- * @param options optional call arguments
- * @return newly created rule
- */
- @Named("createLoadBalancerRule")
- @GET
- @QueryParams(keys = "command", values = "createLoadBalancerRule")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String createLoadBalancerRuleForPublicIP(@QueryParam("publicipid") String publicIPId,
- @QueryParam("algorithm") Algorithm algorithm, @QueryParam("name") String name,
- @QueryParam("privateport") int privatePort, @QueryParam("publicport") int publicPort,
- CreateLoadBalancerRuleOptions... options);
-
- /**
- * Update a load balancer rule.
- *
- * @param id
- * rule id
- * @param options
- * optional arguments
- * @return updated rule
- */
- @Named("updateLoadBalancerRule")
- @GET
- @QueryParams(keys = "command", values = "updateLoadBalancerRule")
- @SelectJson("loadbalancerrule")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- LoadBalancerRule updateLoadBalancerRule(@QueryParam("id") String id, UpdateLoadBalancerRuleOptions... options);
-
- /**
- *
- * deletes a loadbalancer rule
- *
- * @param id
- * id of the rule to delete
- * @return async job id of the job completing or null, if the load balancer
- * rule was not found.
- */
- @Named("deleteLoadBalancerRule")
- @GET
- @QueryParams(keys = "command", values = "deleteLoadBalancerRule")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- String deleteLoadBalancerRule(@QueryParam("id") String id);
-
- /**
- * Assigns virtual machine or a list of virtual machines to a load balancer
- * rule.
- *
- * @param id
- * the ID of the load balancer rule
- * @param virtualMachineIds
- * the list of IDs of the virtual machine that are being assigned
- * to the load balancer rule
- * @return job id related to the operation
- */
- @Named("assignToLoadBalancerRule")
- @GET
- @QueryParams(keys = "command", values = "assignToLoadBalancerRule")
- @Fallback(NullOnNotFoundOr404.class)
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String assignVirtualMachinesToLoadBalancerRule(@QueryParam("id") String id,
- @QueryParam("virtualmachineids") @ParamParser(JoinOnComma.class) Iterable<String> virtualMachineIds);
-
- /**
- * Assigns virtual machine or a list of virtual machines to a load balancer
- * rule.
- *
- * @param id
- * the ID of the load balancer rule
- * @param virtualMachineIds
- * the list of IDs of the virtual machine that are being assigned
- * to the load balancer rule
- * @return job id related to the operation
- */
- @Named("assignToLoadBalancerRule")
- @GET
- @QueryParams(keys = "command", values = "assignToLoadBalancerRule")
- @Fallback(NullOnNotFoundOr404.class)
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String assignVirtualMachinesToLoadBalancerRule(@QueryParam("id") String id,
- @QueryParam("virtualmachineids") @ParamParser(JoinOnComma.class) String... virtualMachineIds);
-
- /**
- * Removes a virtual machine or a list of virtual machines from a load
- * balancer rule.
- *
- * @param id
- * the ID of the load balancer rule
- * @param virtualMachineIds
- * the list of IDs of the virtual machine that are being removed
- * from the load balancer rule
- * @return job id related to the operation
- */
- @Named("removeFromLoadBalancerRule")
- @GET
- @QueryParams(keys = "command", values = "removeFromLoadBalancerRule")
- @Fallback(NullOnNotFoundOr404.class)
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String removeVirtualMachinesFromLoadBalancerRule(@QueryParam("id") String id,
- @QueryParam("virtualmachineids") @ParamParser(JoinOnComma.class) Iterable<String> virtualMachineIds);
-
- /**
- * Removes a virtual machine or a list of virtual machines from a load
- * balancer rule.
- *
- * @param id
- * the ID of the load balancer rule
- * @param virtualMachineIds
- * the list of IDs of the virtual machine that are being removed
- * from the load balancer rule
- * @return job id related to the operation
- */
- @Named("removeFromLoadBalancerRule")
- @GET
- @QueryParams(keys = "command", values = "removeFromLoadBalancerRule")
- @Fallback(NullOnNotFoundOr404.class)
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String removeVirtualMachinesFromLoadBalancerRule(@QueryParam("id") String id,
- @QueryParam("virtualmachineids") @ParamParser(JoinOnComma.class) String... virtualMachineIds);
-
- /**
- * List all virtual machine instances that are assigned to a load balancer
- * rule.
- *
- * @param id
- * id of the rule
- * @return VirtualMachines matching query, or empty set, if no
- * VirtualMachines are assigned
- */
- @Named("listLoadBalancerRuleInstances")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listLoadBalancerRuleInstances", "true" })
- @SelectJson("loadbalancerruleinstance")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<VirtualMachine> listVirtualMachinesAssignedToLoadBalancerRule(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NATApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NATApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NATApi.java
deleted file mode 100644
index 015c2ba..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NATApi.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateIPForwardingRuleOptions;
-import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface NATApi {
-
- /**
- * List the ip forwarding rules
- *
- * @param options
- * if present, how to constrain the list.
- * @return IPForwardingRules matching query, or empty set, if no
- * IPForwardingRules are found
- */
- @Named("listIpForwardingRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listIpForwardingRules", "true" })
- @SelectJson("ipforwardingrule")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<IPForwardingRule> listIPForwardingRules(ListIPForwardingRulesOptions... options);
-
- /**
- * get a specific IPForwardingRule by id
- *
- * @param id
- * IPForwardingRule to get
- * @return IPForwardingRule or null if not found
- */
- @Named("listIpForwardingRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listIpForwardingRules", "true" })
- @SelectJson("ipforwardingrule")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- IPForwardingRule getIPForwardingRule(@QueryParam("id") String id);
-
- /**
- * get a set of IPForwardingRules by ipaddress id
- *
- * @param id
- * IPAddress of rule to get
- * @return IPForwardingRule matching query or empty if not found
- */
- @Named("listIpForwardingRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listIpForwardingRules", "true" })
- @SelectJson("ipforwardingrule")
- @Consumes(MediaType.APPLICATION_JSON)
- Set<IPForwardingRule> getIPForwardingRulesForIPAddress(@QueryParam("ipaddressid") String id);
-
- /**
- * get a set of IPForwardingRules by virtual machine id
- *
- * @param id
- * virtual machine of rule to get
- * @return IPForwardingRule matching query or empty set if not found
- */
- @Named("listIpForwardingRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listIpForwardingRules", "true" })
- @SelectJson("ipforwardingrule")
- @Consumes(MediaType.APPLICATION_JSON)
- Set<IPForwardingRule> getIPForwardingRulesForVirtualMachine(@QueryParam("virtualmachineid") String id);
-
- /**
- * Creates an ip forwarding rule
- *
- * @param IPAddressId
- * the public IP address id of the forwarding rule, already
- * associated via associateIp
- * @param protocol
- * the protocol for the rule. Valid values are TCP or UDP.
- * @param startPort
- * the start port for the rule
- * @return response used to track creation
- */
- @Named("createIpForwardingRule")
- @GET
- @QueryParams(keys = "command", values = "createIpForwardingRule")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createIPForwardingRule(@QueryParam("ipaddressid") String IPAddressId,
- @QueryParam("protocol") String protocol, @QueryParam("startport") int startPort,
- CreateIPForwardingRuleOptions... options);
-
- @Named("enableStaticNat")
- @GET
- @QueryParams(keys = "command", values = "enableStaticNat")
- @Consumes(MediaType.APPLICATION_JSON)
- void enableStaticNATForVirtualMachine(
- @QueryParam("virtualmachineid") String virtualMachineId, @QueryParam("ipaddressid") String IPAddressId);
-
- /**
- * Deletes an ip forwarding rule
- *
- * @param id
- * the id of the forwarding rule
- */
- @Named("deleteIpForwardingRule")
- @GET
- @QueryParams(keys = "command", values = "deleteIpForwardingRule")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- String deleteIPForwardingRule(@QueryParam("id") String id);
-
- /**
- * Disables static rule for given ip address
- *
- * @param IPAddressId
- * the public IP address id for which static nat feature is being
- * disabled
- */
- @Named("disableStaticNat")
- @GET
- @QueryParams(keys = "command", values = "disableStaticNat")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String disableStaticNATOnPublicIP(@QueryParam("ipaddressid") String IPAddressId);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java
deleted file mode 100644
index 9784b41..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/NetworkApi.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateNetworkOptions;
-import org.jclouds.cloudstack.options.ListNetworksOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface NetworkApi {
-
- /**
- * Lists networks
- *
- * @param options
- * if present, how to constrain the list.
- * @return networks matching query, or empty set, if no networks are found
- */
- @Named("listNetworks")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listNetworks", "true" })
- @SelectJson("network")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Network> listNetworks(ListNetworksOptions... options);
-
- /**
- * get a specific network by id
- *
- * @param id
- * network to get
- * @return network or null if not found
- */
- @Named("listNetworks")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listNetworks", "true" })
- @SelectJson("network")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Network getNetwork(@QueryParam("id") String id);
-
- /**
- * Creates a network
- *
- * @param zoneId
- * the Zone ID for the Vlan ip range
- * @param networkOfferingId
- * the network offering id
- * @param name
- * the name of the network
- * @param displayText
- * the display text of the network
- * @param options
- * optional parameters
- * @return newly created network
- */
- @Named("createNetwork")
- @GET
- @QueryParams(keys = "command", values = "createNetwork")
- @SelectJson("network")
- @Consumes(MediaType.APPLICATION_JSON)
- Network createNetworkInZone(@QueryParam("zoneid") String zoneId,
- @QueryParam("networkofferingid") String networkOfferingId, @QueryParam("name") String name,
- @QueryParam("displaytext") String displayText, CreateNetworkOptions... options);
-
- /**
- * Deletes a network
- *
- * @param id
- * the ID of the network
- * @return job id related to destroying the network, or null if resource was
- * not found
- */
- @Named("deleteNetwork")
- @GET
- @QueryParams(keys = "command", values = "deleteNetwork")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- String deleteNetwork(@QueryParam("id") String id);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java
deleted file mode 100644
index 4baf0f6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/OfferingApi.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.DiskOffering;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListDiskOfferingsOptions;
-import org.jclouds.cloudstack.options.ListNetworkOfferingsOptions;
-import org.jclouds.cloudstack.options.ListServiceOfferingsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface OfferingApi {
-
- /**
- * Lists service offerings
- *
- * @param options
- * if present, how to constrain the list.
- * @return service offerings matching query, or empty set, if no service
- * offerings are found
- */
- @Named("listServiceOfferings")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listServiceOfferings", "true" })
- @SelectJson("serviceoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<ServiceOffering> listServiceOfferings(ListServiceOfferingsOptions... options);
-
- /**
- * get a specific service offering by id
- *
- * @param id
- * offering to get
- * @return service offering or null if not found
- */
- @Named("listServiceOfferings")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listServiceOfferings", "true" })
- @SelectJson("serviceoffering")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- ServiceOffering getServiceOffering(@QueryParam("id") String id);
-
- /**
- * Lists disk offerings
- *
- * @param options
- * if present, how to constrain the list.
- * @return disk offerings matching query, or empty set, if no disk offerings
- * are found
- */
- @Named("listDiskOfferings")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listDiskOfferings", "true" })
- @SelectJson("diskoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<DiskOffering> listDiskOfferings(ListDiskOfferingsOptions... options);
-
- /**
- * get a specific disk offering by id
- *
- * @param id
- * offering to get
- * @return disk offering or null if not found
- */
- @Named("listDiskOfferings")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listDiskOfferings", "true" })
- @SelectJson("diskoffering")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- DiskOffering getDiskOffering(@QueryParam("id") String id);
-
- /**
- * Lists service offerings
- *
- * @param options
- * if present, how to constrain the list.
- * @return service offerings matching query, or empty set, if no service
- * offerings are found
- */
- @Named("listNetworkOfferings")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listNetworkOfferings", "true" })
- @SelectJson("networkoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<NetworkOffering> listNetworkOfferings(ListNetworkOfferingsOptions... options);
-
- /**
- * get a specific service offering by id
- *
- * @param id
- * offering to get
- * @return service offering or null if not found
- */
- @Named("listNetworkOfferings")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listNetworkOfferings", "true" })
- @SelectJson("networkoffering")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- NetworkOffering getNetworkOffering(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java
deleted file mode 100644
index f426cdf..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ProjectApi.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Project;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListProjectsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack project features.
- *
- * @see <a
- * href="http://download.cloud.com/releases/3.0.6/api_3.0.6/TOC_Root_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface ProjectApi {
- /**
- * Lists the projects this account has access to.
- *
- * @param options if present, how to constrain the list
- */
- @Named("listProjects")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listProjects", "true" })
- @SelectJson("project")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Project> listProjects(ListProjectsOptions... options);
-
- /**
- * gets a specific Project by id
- *
- * @param id
- * Project to get
- * @return Project or null if not found */
- @Named("listProjects")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listProjects", "true" })
- @SelectJson("project")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Project getProject(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java
deleted file mode 100644
index 6ab8e53..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairApi.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListSSHKeyPairsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack SSHKeyPair features.
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.8/TOC_User.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface SSHKeyPairApi {
- /**
- * Returns a list of {@link SshKeyPair}s registered by current user.
- *
- * @param options if present, how to constrain the list
- * @return Set of {@link SshKeyPair}s matching the current constrains or
- * empty set if no SshKeyPairs found.
- */
- @Named("listSSHKeyPairs")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listSSHKeyPairs", "true" })
- @SelectJson("sshkeypair")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<SshKeyPair> listSSHKeyPairs(ListSSHKeyPairsOptions... options);
-
- /**
- * Registers a {@link SshKeyPair} with the given name and public kay material.
- *
- * @param name of the keypair
- * @param publicKey Public key material of the keypair
- * @return Created SshKeyPair.
- */
- @Named("registerSSHKeyPair")
- @GET
- @QueryParams(keys = "command", values = "registerSSHKeyPair")
- @SelectJson("keypair")
- @Consumes(MediaType.APPLICATION_JSON)
- SshKeyPair registerSSHKeyPair(@QueryParam("name") String name, @QueryParam("publickey") String publicKey);
-
- /**
- * Creates a {@link SshKeyPair} with specified name.
- *
- * @param name of the SshKeyPair.
- * @return Created SshKeyPair.
- */
- @Named("createSSHKeyPair")
- @GET
- @QueryParams(keys = "command", values = "createSSHKeyPair")
- @SelectJson("keypair")
- @Consumes(MediaType.APPLICATION_JSON)
- SshKeyPair createSSHKeyPair(@QueryParam("name") String name);
-
- /**
- * Retrieves the {@link SSHKeyPairApi} with given name.
- *
- * @param name name of the key pair
- * @return SSH Key pair or null if not found.
- */
- @Named("listSSHKeyPairs")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listSSHKeyPairs", "true" })
- @SelectJson("sshkeypair")
- @OnlyElement()
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- SshKeyPair getSSHKeyPair(@QueryParam("name") String name);
-
- /**
- * Deletes the {@link SSHKeyPairApi} with given name.
- *
- * @param name name of the key pair
- * @return
- */
- @Named("deleteSSHKeyPair")
- @GET
- @QueryParams(keys = "command", values = "deleteSSHKeyPair")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteSSHKeyPair(@QueryParam("name") String name);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java
deleted file mode 100644
index 3f53b8f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.binders.BindAccountSecurityGroupPairsToIndexedQueryParams;
-import org.jclouds.cloudstack.binders.BindCIDRsToCommaDelimitedQueryParam;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.ListSecurityGroupsOptions;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-import com.google.common.collect.Multimap;
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface SecurityGroupApi {
-
- /**
- * Lists security groups
- *
- * @param options
- * if present, how to constrain the list.
- * @return security groups matching query, or empty set, if no security
- * groups are found
- */
- @Named("listSecurityGroups")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listSecurityGroups", "true" })
- @SelectJson("securitygroup")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<SecurityGroup> listSecurityGroups(ListSecurityGroupsOptions... options);
-
- /**
- * get a specific security group by id
- *
- * @param id
- * group to get
- * @return security group or null if not found
- */
- @Named("listSecurityGroups")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listSecurityGroups", "true" })
- @SelectJson("securitygroup")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- SecurityGroup getSecurityGroup(@QueryParam("id") String id);
-
- /**
- * get a specific security group by name
- *
- * @param securityGroupName
- * group to get
- * @return security group or null if not found
- */
- @Named("listSecurityGroups")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listSecurityGroups", "true" })
- @SelectJson("securitygroup")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- SecurityGroup getSecurityGroupByName(@QueryParam("securitygroupname") String securityGroupName);
-
- /**
- * Creates a security group
- *
- * @param name
- * name of the security group
- * @return security group
- */
- @Named("createSecurityGroup")
- @GET
- @QueryParams(keys = "command", values = "createSecurityGroup")
- @SelectJson("securitygroup")
- @Consumes(MediaType.APPLICATION_JSON)
- SecurityGroup createSecurityGroup(@QueryParam("name") String name);
-
- /**
- * Authorizes a particular TCP or UDP ingress rule for this security group
- *
- * @param securityGroupId
- * The ID of the security group
- * @param protocol
- * tcp or udp
- * @param startPort
- * start port for this ingress rule
- * @param endPort
- * end port for this ingress rule
- * @param cidrList
- * the cidr list associated
- * @return response relating to the creation of this ingress rule
- */
- @Named("authorizeSecurityGroupIngress")
- @GET
- @QueryParams(keys = "command", values = "authorizeSecurityGroupIngress")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String authorizeIngressPortsToCIDRs(@QueryParam("securitygroupid") String securityGroupId,
- @QueryParam("protocol") String protocol, @QueryParam("startport") int startPort,
- @QueryParam("endport") int endPort,
- @BinderParam(BindCIDRsToCommaDelimitedQueryParam.class) Iterable<String> cidrList,
- AccountInDomainOptions... options);
-
- /**
- * Authorizes a particular TCP or UDP ingress rule for this security group
- *
- * @param securityGroupId
- * The ID of the security group
- * @param protocol
- * tcp or udp
- * @param startPort
- * start port for this ingress rule
- * @param endPort
- * end port for this ingress rule
- * @param accountToGroup
- * mapping of account names to security groups you wish to
- * authorize
- * @return response relating to the creation of this ingress rule
- */
- @Named("authorizeSecurityGroupIngress")
- @GET
- @QueryParams(keys = "command", values = "authorizeSecurityGroupIngress")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String authorizeIngressPortsToSecurityGroups(@QueryParam("securitygroupid") String securityGroupId,
- @QueryParam("protocol") String protocol, @QueryParam("startport") int startPort,
- @QueryParam("endport") int endPort,
- @BinderParam(BindAccountSecurityGroupPairsToIndexedQueryParams.class) Multimap<String, String> accountToGroup,
- AccountInDomainOptions... options);
-
- /**
- * Authorizes a particular ICMP ingress rule for this security group
- *
- * @param securityGroupId
- * The ID of the security group
- * @param ICMPCode
- * type of the icmp message being sent
- * @param ICMPType
- * error code for this icmp message
- * @param cidrList
- * the cidr list associated
- * @return response relating to the creation of this ingress rule
- */
- @Named("authorizeSecurityGroupIngress")
- @GET
- @QueryParams(keys = { "command", "protocol" }, values = { "authorizeSecurityGroupIngress", "ICMP" })
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String authorizeIngressICMPToCIDRs(@QueryParam("securitygroupid") String securityGroupId,
- @QueryParam("icmpcode") int ICMPCode, @QueryParam("icmptype") int ICMPType,
- @BinderParam(BindCIDRsToCommaDelimitedQueryParam.class) Iterable<String> cidrList,
- AccountInDomainOptions... options);
-
- /**
- * Authorizes a particular ICMP ingress rule for this security group
- *
- * @param securityGroupId
- * The ID of the security group
- * @param ICMPCode
- * type of the icmp message being sent
- * @param ICMPType
- * error code for this icmp message
- * @param accountToGroup
- * mapping of account names to security groups you wish to
- * authorize
- * @return response relating to the creation of this ingress rule
- */
- @Named("authorizeSecurityGroupIngress")
- @GET
- @QueryParams(keys = { "command", "protocol" }, values = { "authorizeSecurityGroupIngress", "ICMP" })
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String authorizeIngressICMPToSecurityGroups(@QueryParam("securitygroupid") String securityGroupId,
- @QueryParam("icmpcode") int ICMPCode, @QueryParam("icmptype") int ICMPType,
- @BinderParam(BindAccountSecurityGroupPairsToIndexedQueryParams.class) Multimap<String, String> accountToGroup,
- AccountInDomainOptions... options);
-
- /**
- * Deletes a particular ingress rule from this security group
- *
- * @param id
- * The ID of the ingress rule
- * @param options
- * scope of the rule.
- */
- @Named("revokeSecurityGroupIngress")
- @GET
- @QueryParams(keys = "command", values = "revokeSecurityGroupIngress")
- @Fallback(VoidOnNotFoundOr404.class)
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String revokeIngressRule(@QueryParam("id") String id, AccountInDomainOptions... options);
-
- /**
- * delete a specific security group by id
- *
- * @param id
- * group to delete
- */
- @Named("deleteSecurityGroup")
- @GET
- @QueryParams(keys = "command", values = "deleteSecurityGroup")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteSecurityGroup(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SessionApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SessionApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SessionApi.java
deleted file mode 100644
index 0dae2da..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SessionApi.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.functions.ParseLoginResponseFromHttpResponse;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.ResponseParser;
-
-/**
- * Provides synchronous access to Cloudstack Sessions
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@QueryParams(keys = "response", values = "json")
-public interface SessionApi {
-
- /**
- * Logs a user into Cloudstack. A successful login attempt will generate a JSESSIONID
- * cookie value that can be passed in subsequent Query command calls until the "logout"
- * command has been issued or the session has expired.
- *
- *
- *
- * @param userName
- * user account name
- * @param domain
- * domain name, if empty defaults to ROOT
- * @param hashedPassword
- * hashed password (by default MD5)
- * @return
- * login response with session key or null
- */
- @Named("login")
- @GET
- @QueryParams(keys = "command", values = "login")
- @ResponseParser(ParseLoginResponseFromHttpResponse.class)
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- LoginResponse loginUserInDomainWithHashOfPassword(@QueryParam("username") String userName,
- @QueryParam("domain") String domain, @QueryParam("password") String hashedPassword);
-
- /**
- * Logs out the user by invalidating the session key
- *
- * @param sessionKey
- * user session key
- */
- @Named("logout")
- @GET
- @QueryParams(keys = "command", values = "logout")
- @Fallback(VoidOnNotFoundOr404.class)
- void logoutUser(@QueryParam("sessionkey") String sessionKey);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java
deleted file mode 100644
index de93bbf..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.binders.BindIdListToCommaDelimitedQueryParam;
-import org.jclouds.cloudstack.binders.BindSnapshotPolicyScheduleToQueryParam;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.Snapshot;
-import org.jclouds.cloudstack.domain.SnapshotPolicy;
-import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateSnapshotOptions;
-import org.jclouds.cloudstack.options.ListSnapshotPoliciesOptions;
-import org.jclouds.cloudstack.options.ListSnapshotsOptions;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to CloudStack Snapshot features.
- * <p/>
- *
- * @see http://download.cloud.com/releases/2.2.0/api/TOC_User.html
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface SnapshotApi {
-
- /**
- * Creates an instant snapshot of a volume.
- *
- * @param volumeId The ID of the disk volume
- * @param options optional arguments
- * @return an asynchronous job structure
- */
- @Named("createSnapshot")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "createSnapshot")
- @Unwrap
- AsyncCreateResponse createSnapshot(@QueryParam("volumeid") String volumeId, CreateSnapshotOptions... options);
-
- /**
- * Lists all available snapshots for the account, matching the query described by the options.
- *
- * @param options optional arguments
- * @return the snapshots matching the query
- */
- @Named("listSnapshots")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = { "command", "listAll" }, values = { "listSnapshots", "true" })
- @SelectJson("snapshot")
- @Unwrap
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Snapshot> listSnapshots(ListSnapshotsOptions... options);
-
- /**
- * Gets a snapshot by its ID.
- *
- * @param id the snapshot ID
- * @return the snapshot with the requested ID
- */
- @Named("listSnapshots")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = { "command", "listAll" }, values = { "listSnapshots", "true" })
- @SelectJson("snapshot")
- @OnlyElement
- @Fallback(NullOnNotFoundOr404.class)
- Snapshot getSnapshot(@QueryParam("id") String id);
-
- /**
- * Deletes a snapshot of a disk volume.
- *
- * @param id The ID of the snapshot
- * @return an asynchronous job structure
- */
- @Named("deleteSnapshot")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "deleteSnapshot")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteSnapshot(@QueryParam("id") String id);
-
- /**
- * Creates a snapshot policy for the account.
- *
- * @param schedule how to schedule snapshots
- * @param numberToRetain maximum number of snapshots to retain
- * @param timezone Specifies a timezone for this command. For more information on the timezone parameter, see Time Zone Format.
- * @param volumeId the ID of the disk volume
- * @return the newly-created snapshot policy
- */
- @Named("createSnapshotPolicy")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Unwrap
- @QueryParams(keys = "command", values = "createSnapshotPolicy")
- SnapshotPolicy createSnapshotPolicy(@BinderParam(BindSnapshotPolicyScheduleToQueryParam.class) SnapshotPolicySchedule schedule, @QueryParam("maxsnaps") String numberToRetain, @QueryParam("timezone") String timezone, @QueryParam("volumeid") String volumeId);
-
- /**
- * Deletes a snapshot policy for the account.
- *
- * @param id The ID of the snapshot policy
- * @return
- */
- @Named("deleteSnapshotPolicies")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "deleteSnapshotPolicies")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteSnapshotPolicy(@QueryParam("id") String id);
-
- /**
- * Deletes snapshot policies for the account.
- *
- * @param id IDs of snapshot policies
- * @return
- */
- @Named("deleteSnapshotPolicies")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "deleteSnapshotPolicies")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteSnapshotPolicies(@BinderParam(BindIdListToCommaDelimitedQueryParam.class) Iterable<String> id);
-
- /**
- * Lists snapshot policies.
- *
- * @param volumeId the ID of the disk volume
- * @param options optional arguments
- * @return the snapshot policies matching the query
- */
- @Named("listSnapshotPolicies")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = { "command", "listAll" }, values = { "listSnapshotPolicies", "true" })
- @Unwrap
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<SnapshotPolicy> listSnapshotPolicies(@QueryParam("volumeid") String volumeId, ListSnapshotPoliciesOptions... options);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java
deleted file mode 100644
index 7a3d490..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.binders.BindTemplateMetadataToQueryParams;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.ExtractMode;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateMetadata;
-import org.jclouds.cloudstack.domain.TemplatePermission;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.CreateTemplateOptions;
-import org.jclouds.cloudstack.options.DeleteTemplateOptions;
-import org.jclouds.cloudstack.options.ExtractTemplateOptions;
-import org.jclouds.cloudstack.options.ListTemplatesOptions;
-import org.jclouds.cloudstack.options.RegisterTemplateOptions;
-import org.jclouds.cloudstack.options.UpdateTemplateOptions;
-import org.jclouds.cloudstack.options.UpdateTemplatePermissionsOptions;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface TemplateApi {
-
- /**
- * Creates a template of a virtual machine. The virtual machine must be in a
- * STOPPED state. A template created from this command is automatically
- * designated as a private template visible to the account that created it.
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/createTemplate
- * .html
- * @param templateMetadata
- * overall description of the template
- * @param options
- * optional arguments
- * @return an asynchronous job response
- */
- @Named("createTemplate")
- @GET
- @QueryParams(keys = "command", values = "createTemplate")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createTemplate(
- @BinderParam(BindTemplateMetadataToQueryParams.class) TemplateMetadata templateMetadata,
- CreateTemplateOptions... options);
-
- /**
- * Registers an existing template into the Cloud.com cloud.
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/registerTemplate
- * .html
- * @param templateMetadata
- * overall description of the template
- * @param format
- * the format for the template. Possible values include QCOW2, RAW,
- * and VHD.
- *
- * @param url
- * the URL of where the template is hosted. Possible URL include
- * http:// and https://
- * @param zoneId
- * the ID of the zone the template is to be hosted on
- * @param options
- * optional arguments
- * @return data about the newly-registered template
- */
- @Named("registerTemplate")
- @GET
- @QueryParams(keys = "command", values = "registerTemplate")
- @SelectJson("template")
- @Consumes(MediaType.APPLICATION_JSON)
- Set<Template> registerTemplate(
- @BinderParam(BindTemplateMetadataToQueryParams.class) TemplateMetadata templateMetadata,
- @QueryParam("format") String format, @QueryParam("hypervisor") String hypervisor,
- @QueryParam("url") String url, @QueryParam("zoneid") String zoneId, RegisterTemplateOptions... options);
-
- /**
- * Updates attributes of a template.
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/updateTemplate
- * .html
- * @param id
- * the ID of the image file
- * @param options
- * optional arguments
- * @return updated data about the template
- */
- @Named("updateTemplate")
- @GET
- @QueryParams(keys = "command", values = "updateTemplate")
- @SelectJson("template")
- @Consumes(MediaType.APPLICATION_JSON)
- Template updateTemplate(@QueryParam("id") String id, UpdateTemplateOptions... options);
-
- /**
- * Copies a template from one zone to another.
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/copyTemplate.html
- * @param id
- * Template ID.
- * @param sourceZoneId
- * ID of the zone the template is currently hosted on.
- * @param destZoneId
- * ID of the zone the template is being copied to.
- * @return an asynchronous job response
- */
- @Named("copyTemplate")
- @GET
- @QueryParams(keys = "command", values = "copyTemplate")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse copyTemplateToZone(@QueryParam("id") String id,
- @QueryParam("sourcezoneid") String sourceZoneId, @QueryParam("destzoneid") String destZoneId);
-
- /**
- * Deletes a template from the system. All virtual machines using the deleted
- * template will not be affected.
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/deleteTemplate
- * .html
- * @param id
- * the ID of the template
- * @param options
- * optional arguments
- */
- @Named("deleteTemplate")
- @GET
- @QueryParams(keys = "command", values = "deleteTemplate")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse deleteTemplate(@QueryParam("id") String id, DeleteTemplateOptions... options);
-
- /**
- * List all executable templates.
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/listTemplates.
- * html
- * @return all executable templates, or empty set, if no templates are found
- */
- @Named("listTemplates")
- @GET
- @QueryParams(keys = { "command", "listAll", "templatefilter" }, values = { "listTemplates", "true", "executable" })
- @SelectJson("template")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Template> listTemplates();
-
- /**
- * List all public, private, and privileged templates.
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/listTemplates.
- * html
- * @param options
- * if present, how to constrain the list, defaults to all
- * executable templates
- * @return templates matching query, or empty set, if no templates are found
- * @see TemplateFilter
- */
- @Named("listTemplates")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listTemplates", "true" })
- @SelectJson("template")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Template> listTemplates(ListTemplatesOptions options);
-
- /**
- * get a specific template by id
- *
- *
- * @param templateId
- * @param zoneId
- * zone template is defined in
- * @return template or null if not found
- */
- @Named("listTemplates")
- @GET
- // templatefilter required in at least 2.2.8 version
- @QueryParams(keys = { "command", "listAll", "templatefilter" }, values = { "listTemplates", "true", "executable" })
- @SelectJson("template")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Template getTemplateInZone(@QueryParam("id") String templateId, @QueryParam("zoneid") String zoneId);
-
- /**
- * Updates a template visibility permissions. A public template is visible to
- * all accounts within the same domain. A private template is visible only to
- * the owner of the template. A privileged template is a private template
- * with account permissions added. Only accounts specified under the template
- * permissions are visible to them.
- *
- * @see http://download.cloud.com/releases/2.2.0/api_2.2.8/user/
- * updateTemplatePermissions.html
- * @param id
- * the template ID
- * @param options
- * optional arguments
- */
- @Named("updateTemplatePermissions")
- @GET
- @QueryParams(keys = "command", values = "updateTemplatePermissions")
- void updateTemplatePermissions(@QueryParam("id") String id,
- UpdateTemplatePermissionsOptions... options);
-
- /**
- * List template visibility and all accounts that have permissions to view
- * this template.
- *
- * @see http://download.cloud.com/releases/2.2.0/api_2.2.8/user/
- * listTemplatePermissions.html
- * @param id
- * the template ID
- * @param options
- * optional arguments
- * @return the list of permissions that apply to the template
- */
- @Named("listTemplatePermissions")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listTemplatePermissions", "true" })
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- Set<TemplatePermission> listTemplatePermissions(@QueryParam("id") String id,
- AccountInDomainOptions... options);
-
- /**
- *
- * @see http
- * ://download.cloud.com/releases/2.2.0/api_2.2.8/user/extractTemplate
- * .html
- * @param id
- * the ID of the template
- * @param mode
- * FIXME the mode of extraction - HTTP_DOWNLOAD or FTP_UPLOAD
- * @param zoneId
- * the ID of the zone where the ISO is originally located
- * @param options
- * optional arguments
- * @return an asynchronous job response
- */
- @Named("extractTemplate")
- @GET
- @QueryParams(keys = "command", values = "extractTemplate")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse extractTemplate(@QueryParam("id") String id,
- @QueryParam("mode") ExtractMode mode, @QueryParam("zoneid") String zoneId, ExtractTemplateOptions... options);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java
deleted file mode 100644
index bf2be0d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.VMGroup;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateVMGroupOptions;
-import org.jclouds.cloudstack.options.ListVMGroupsOptions;
-import org.jclouds.cloudstack.options.UpdateVMGroupOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack VM group features.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface VMGroupApi {
- /**
- * Lists VM groups
- *
- * @param options if present, how to constrain the list.
- * @return VM groups matching query, or empty set, if no zones are found
- */
- @Named("listInstanceGroups")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listInstanceGroups", "true" })
- @SelectJson("instancegroup")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<VMGroup> listInstanceGroups(ListVMGroupsOptions... options);
-
- /**
- * @see VMGroupApi#getInstanceGroup
- */
- @Named("listInstanceGroups")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listInstanceGroups", "true" })
- @SelectJson("instancegroup")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- VMGroup getInstanceGroup(@QueryParam("id") String id);
-
- /**
- * Creates a VM group
- *
- * @param name the name of the VM group
- * @param options optional parameters
- * @return the new VMGroup
- */
- @Named("createInstanceGroup")
- @GET
- @QueryParams(keys = "command", values = "createInstanceGroup")
- @SelectJson("instancegroup")
- @Consumes(MediaType.APPLICATION_JSON)
- VMGroup createInstanceGroup(@QueryParam("name") String name, CreateVMGroupOptions... options);
-
- /**
- * Modify a VM group
- *
- * @param name the new name of the group
- * @return the modified VMGroup
- */
- @Named("updateInstanceGroup")
- @GET
- @QueryParams(keys = "command", values = "updateInstanceGroup")
- @SelectJson("instancegroup")
- @Consumes(MediaType.APPLICATION_JSON)
- VMGroup updateInstanceGroup(@QueryParam("id") String id, UpdateVMGroupOptions... options);
-
- /**
- * Delete a VM group
- *
- * @param id the ID of the VM group
- * @return a future with a void data type
- */
- @Named("deleteInstanceGroup")
- @GET
- @QueryParams(keys = "command", values = "deleteInstanceGroup")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteInstanceGroup(@QueryParam("id") String id);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java
deleted file mode 100644
index 413bfc5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.AssignVirtualMachineOptions;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-import org.jclouds.cloudstack.options.ListVirtualMachinesOptions;
-import org.jclouds.cloudstack.options.StopVirtualMachineOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface VirtualMachineApi {
-
- /**
- * Lists VirtualMachines
- *
- * @param options
- * if present, how to constrain the list.
- * @return VirtualMachines matching query, or empty set, if no
- * VirtualMachines are found
- */
- @Named("listVirtualMachines")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listVirtualMachines", "true" })
- @SelectJson("virtualmachine")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<VirtualMachine> listVirtualMachines(ListVirtualMachinesOptions... options);
-
- /**
- * get a specific VirtualMachine by id
- *
- * @param id
- * VirtualMachine to get
- * @return VirtualMachine or null if not found
- */
- @Named("listVirtualMachines")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listVirtualMachines", "true" })
- @SelectJson("virtualmachine")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- VirtualMachine getVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Creates and automatically starts a virtual machine based on a service
- * offering, disk offering, and template.
- *
- * @param zoneId
- * availability zone for the virtual machine
- * @param serviceOfferingId
- * the ID of the service offering for the virtual machine
- * @param templateId
- * the ID of the template for the virtual machine
- *
- * @return virtual machine
- */
- @Named("deployVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "deployVirtualMachine")
- @SelectJson({ "deployvirtualmachine", "deployvirtualmachineresponse" })
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse deployVirtualMachineInZone(@QueryParam("zoneid") String zoneId,
- @QueryParam("serviceofferingid") String serviceOfferingId, @QueryParam("templateid") String templateId,
- DeployVirtualMachineOptions... options);
-
- /**
- * Reboots a virtual machine.
- *
- * @param id
- * The ID of the virtual machine
- * @return job id related to destroying the VM
- */
- @Named("rebootVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "rebootVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String rebootVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Starts a virtual machine.
- *
- * @param id
- * The ID of the virtual machine
- * @return job id related to destroying the VM
- */
- @Named("startVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "startVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String startVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Stops a virtual machine.
- *
- * @param id
- * The ID of the virtual machine
- * @return job id related to destroying the VM
- */
- @Named("stopVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "stopVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String stopVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Stops a virtual machine.
- *
- * @param id
- * The ID of the virtual machine
- * @param options
- * If present, whether to force stop.
- * @return job id related to destroying the VM
- */
- @GET
- @QueryParams(keys = "command", values = "stopVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String stopVirtualMachine(@QueryParam("id") String id,
- StopVirtualMachineOptions options);
-
- /**
- * Resets the password for virtual machine. The virtual machine must be in a
- * "Stopped" state and the template must already support this feature for
- * this command to take effect.
- *
- * @param id
- * The ID of the virtual machine
- * @return job id related to destroying the VM
- */
- @Named("resetPasswordForVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "resetPasswordForVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String resetPasswordForVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Return an encrypted password for the virtual machine. The command
- * is asynchronous.
- *
- * @param id
- * the ID of the virtual machine
- * @return encrypted password
- */
- @Named("getVMPassword")
- @GET
- @QueryParams(keys = "command", values = "getVMPassword")
- @SelectJson("encryptedpassword")
- @Consumes(MediaType.APPLICATION_JSON)
- String getEncryptedPasswordForVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Changes the service offering for a virtual machine. The virtual machine
- * must be in a "Stopped" state for this command to take effect.
- *
- * @param id
- * The ID of the virtual machine
- * @return job id related to destroying the VM
- */
- @Named("changeServiceForVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "changeServiceForVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String changeServiceForVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Updates parameters of a virtual machine.
- *
- * @param id
- * The ID of the virtual machine
- * @return job id related to destroying the VM
- */
- @Named("updateVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "updateVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String updateVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Destroys a virtual machine. Once destroyed, only the administrator can
- * recover it.
- *
- * @param id
- * vm to destroy
- * @return job id related to destroying the VM, or null if resource was not
- * found
- */
- @Named("destroyVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "destroyVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- String destroyVirtualMachine(@QueryParam("id") String id);
-
- /**
- * Re-assign a virtual machine to a different account/domain.
- *
- * @param virtualMachineId
- * VirtualMachine to re-assign
- * @param options
- * AssignVirtualMachineOptions specifying account and domain to transfer to, and optional network and security group IDs.
- * @return VirtualMachine or null if not found
- */
- @Named("assignVirtualMachine")
- @GET
- @QueryParams(keys = "command", values = "assignVirtualMachine")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- VirtualMachine assignVirtualMachine(@QueryParam("virtualmachineid") String virtualMachineId,
- AssignVirtualMachineOptions... options);
-
-}
[36/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java
deleted file mode 100644
index 2f601e9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListVolumesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface VolumeApi {
- /**
- * Create a volume with given name and diskOfferingId
- *
- * @param name name of the volume
- * @param diskOfferingId the ID of the disk offering.
- * @param zoneId the ID of the availability zone
- * @return AsyncCreateResponse job response used to track creation
- */
- @Named("listVolumes")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listVolumes", "true" })
- @SelectJson("volume")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Volume> listVolumes(ListVolumesOptions... options);
-
- /**
- * Create a volume with given name, size and diskOfferingId
- *
- * @param name name of the volume
- * @param diskOfferingId the ID of the disk offering (the offering should have the custom disk size flag set)
- * @param zoneId the ID of the availability zone
- * @param size the size of volume required (in GB)
- * @return AsyncCreateResponse job response used to track creation
- */
- @Named("listVolumes")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = { "command", "listAll" }, values = { "listVolumes", "true" })
- @SelectJson("volume")
- @OnlyElement
- @Fallback(NullOnNotFoundOr404.class)
- Volume getVolume(@QueryParam("id") String id);
-
-
- /**
- * Create a volume with given name and snapshotId
- *
- * @param name name of the volume
- * @param snapshotId Snapshot id to be used while creating the volume
- * @param zoneId the ID of the availability zone
- * @return AsyncCreateResponse job response used to track creation
- */
- @Named("createVolume")
- @GET
- @QueryParams(keys = "command", values = "createVolume")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createVolumeFromDiskOfferingInZone(@QueryParam("name") String name,
- @QueryParam("diskofferingid") String diskOfferingId,
- @QueryParam("zoneid") String zoneId);
-
- /**
- * List volumes
- *
- * @return volume list, empty if not found
- */
- @GET
- @QueryParams(keys = "command", values = "createVolume")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createVolumeFromCustomDiskOfferingInZone(@QueryParam("name") String name,
- @QueryParam("diskofferingid") String diskOfferingId,
- @QueryParam("zoneid") String zoneId,
- @QueryParam("size") int size);
-
- /**
- * Get volume by id
- *
- * @param id the volume id to retrieve
- * @return volume or null if not found
- */
- @Named("createVolume")
- @GET
- @QueryParams(keys = "command", values = "createVolume")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createVolumeFromSnapshotInZone(@QueryParam("name") String name,
- @QueryParam("snapshotid") String snapshotId,
- @QueryParam("zoneid") String zoneId);
-
- /**
- * Deletes a attached disk volume
- *
- * @param id id of the volume
- */
- @Named("attachVolume")
- @GET
- @QueryParams(keys = "command", values = "attachVolume")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse attachVolume(@QueryParam("id") String volumeId,
- @QueryParam("virtualmachineid") String virtualMachineId);
-
- /**
- * Attaches a disk volume to a virtual machine.
- *
- * @param volumeId the ID of the disk volume
- * @param virtualMachineId the ID of the virtual machine
- * @return AsyncCreateResponse job response used to track creation
- */
- @Named("detachVolume")
- @GET
- @QueryParams(keys = "command", values = "detachVolume")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse detachVolume(@QueryParam("id") String volumeId);
-
- /**
- * Detaches a disk volume to a virtual machine.
- *
- * @param volumeId the ID of the disk volume
- * @return AsyncCreateResponse job response used to track creation
- */
- @Named("deleteVolume")
- @GET
- @QueryParams(keys = "command", values = "deleteVolume")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteVolume(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java
deleted file mode 100644
index d7e8ff3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListZonesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface ZoneApi {
-
- /**
- * Lists zones
- *
- * @param options
- * if present, how to constrain the list.
- * @return zones matching query, or empty set, if no zones are found
- */
- @Named("listZones")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listZones", "true" })
- @SelectJson("zone")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Zone> listZones(ListZonesOptions... options);
-
- /**
- * get a specific zone by id
- *
- * @param id
- * zone to get
- * @return zone or null if not found
- */
- @Named("listZones")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listZones", "true" })
- @SelectJson("zone")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Zone getZone(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java
deleted file mode 100644
index f08c0e8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.filters;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.http.HttpException;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpRequest.Builder;
-
-import com.google.common.base.Supplier;
-import com.google.common.net.HttpHeaders;
-
-/**
- *
- * @see <a href="http://docs.cloud.com/CloudStack_Documentation/Customizing_the_CloudStack_UI#Cross_Site_Request_Forgery_%28CSRF%29"
- * />
- */
-@Singleton
-public class AddSessionKeyAndJSessionIdToRequest implements AuthenticationFilter {
-
- private final Supplier<LoginResponse> loginResponseSupplier;
-
- @Inject
- public AddSessionKeyAndJSessionIdToRequest(Supplier<LoginResponse> loginResponseSupplier) {
- this.loginResponseSupplier = loginResponseSupplier;
- }
-
- @Override
- public HttpRequest filter(HttpRequest request) throws HttpException {
- LoginResponse loginResponse = loginResponseSupplier.get();
- Builder<?> builder = request.toBuilder();
- builder.replaceHeader(HttpHeaders.COOKIE, "JSESSIONID=" + loginResponse.getJSessionId());
- builder.replaceQueryParam("sessionkey", loginResponse.getSessionKey());
- return builder.build();
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AuthenticationFilter.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AuthenticationFilter.java
deleted file mode 100644
index 1e567a6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/AuthenticationFilter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.filters;
-
-import org.jclouds.http.HttpRequestFilter;
-
-import com.google.inject.ImplementedBy;
-
-/**
- * Marker interface that determines how we authenticate http requests in cloudstack. default to sign
- * requests as opposed to login.
- */
-@ImplementedBy(QuerySigner.class)
-public interface AuthenticationFilter extends HttpRequestFilter {
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java
deleted file mode 100644
index 04610cc..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.filters;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Throwables.propagate;
-import static com.google.common.io.BaseEncoding.base64;
-import static com.google.common.io.ByteStreams.readBytes;
-import static org.jclouds.Constants.LOGGER_SIGNATURE;
-import static org.jclouds.crypto.Macs.asByteProcessor;
-import static org.jclouds.http.Uris.uriBuilder;
-import static org.jclouds.http.utils.Queries.queryParser;
-import static org.jclouds.util.Strings2.toInputStream;
-
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import com.google.common.base.Joiner;
-import org.jclouds.crypto.Crypto;
-import org.jclouds.domain.Credentials;
-import org.jclouds.http.HttpException;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpUtils;
-import org.jclouds.http.internal.SignatureWire;
-import org.jclouds.location.Provider;
-import org.jclouds.logging.Logger;
-import org.jclouds.rest.RequestSigner;
-import org.jclouds.util.Strings2;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Multimap;
-import com.google.common.io.ByteProcessor;
-
-/**
- *
- * @see <a href= "http://download.cloud.com/releases/2.2.0/api/user/2.2api_security_details.html" />
- */
-@Singleton
-public class QuerySigner implements AuthenticationFilter, RequestSigner {
-
- private final SignatureWire signatureWire;
- private final Supplier<Credentials> creds;
- private final Crypto crypto;
- private final HttpUtils utils;
-
- @Resource
- @Named(LOGGER_SIGNATURE)
- private Logger signatureLog = Logger.NULL;
-
- @Inject
- public QuerySigner(SignatureWire signatureWire, @Provider Supplier<Credentials> creds, Crypto crypto, HttpUtils utils) {
- this.signatureWire = signatureWire;
- this.creds = creds;
- this.crypto = crypto;
- this.utils = utils;
- }
-
- public HttpRequest filter(HttpRequest request) throws HttpException {
- checkNotNull(request, "request must be present");
- Multimap<String, String> decodedParams = queryParser().apply(request.getEndpoint().getRawQuery());
- addSigningParams(decodedParams);
- String stringToSign = createStringToSign(request, decodedParams);
- String signature = sign(stringToSign);
- addSignature(decodedParams, signature);
- request = request.toBuilder().endpoint(uriBuilder(request.getEndpoint()).query(decodedParams).build()).build();
- utils.logRequest(signatureLog, request, "<<");
- return request;
- }
-
- @VisibleForTesting
- void addSignature(Multimap<String, String> params, String signature) {
- params.replaceValues("signature", ImmutableList.of(signature));
- }
-
- @VisibleForTesting
- public String sign(String toSign) {
- String signature;
- try {
- ByteProcessor<byte[]> hmacSHA1 = asByteProcessor(crypto.hmacSHA1(creds.get().credential.getBytes()));
- signature = base64().encode(readBytes(toInputStream(toSign), hmacSHA1));
- if (signatureWire.enabled())
- signatureWire.input(toInputStream(signature));
- return signature;
- } catch (InvalidKeyException e) {
- throw propagate(e);
- } catch (IOException e) {
- throw propagate(e);
- }
- }
-
- @VisibleForTesting
- public String createStringToSign(HttpRequest request, Multimap<String, String> decodedParams) {
- utils.logRequest(signatureLog, request, ">>");
- // encode each parameter value first,
- ImmutableSortedSet.Builder<String> builder = ImmutableSortedSet.naturalOrder();
- for (Map.Entry<String, String> entry : decodedParams.entries())
- builder.add(entry.getKey() + "=" + Strings2.urlEncode(entry.getValue()));
- // then, lower case the entire query string
- String stringToSign = Joiner.on('&').join(builder.build()).toLowerCase();
- if (signatureWire.enabled())
- signatureWire.output(stringToSign);
-
- return stringToSign;
- }
-
- @VisibleForTesting
- void addSigningParams(Multimap<String, String> params) {
- params.replaceValues("apiKey", ImmutableList.of(creds.get().identity));
- params.removeAll("signature");
- }
-
- public String createStringToSign(HttpRequest input) {
- Multimap<String, String> decodedParams = queryParser().apply(input.getEndpoint().getQuery());
- addSigningParams(decodedParams);
- return createStringToSign(input, decodedParams);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CloudStackFallbacks.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CloudStackFallbacks.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CloudStackFallbacks.java
deleted file mode 100644
index 50185ed..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CloudStackFallbacks.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.util.concurrent.Futures.immediateFuture;
-import static org.jclouds.Fallbacks.valOnNotFoundOr404;
-import static org.jclouds.util.Throwables2.getFirstThrowableOfType;
-
-import org.jclouds.Fallback;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-public final class CloudStackFallbacks {
- private CloudStackFallbacks() {
- }
-
- /**
- * CloudStack is currently sending 431 errors with the text "Unable to find account owner for ip ". In this case, we
- * have to ignore as there's no means for us to avoid the problem, or action to take.
- */
- public static final class VoidOnNotFoundOr404OrUnableToFindAccountOwner implements Fallback<Void> {
- @Override
- public ListenableFuture<Void> create(Throwable t) throws Exception {
- return immediateFuture(createOrPropagate(t));
- }
-
- @Override
- public Void createOrPropagate(Throwable t) throws Exception {
- IllegalStateException e = getFirstThrowableOfType(checkNotNull(t, "throwable"), IllegalStateException.class);
- if (e != null && e.getMessage().indexOf("Unable to find account owner for") != -1) {
- return null;
- } else {
- return valOnNotFoundOr404(null, t);
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java
deleted file mode 100644
index dd15e19..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateFirewallRulesForIP.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.options.CreateFirewallRuleOptions;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.ImmutableSet.Builder;
-
-@Singleton
-public class CreateFirewallRulesForIP {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final CloudStackApi client;
- private final BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult;
- private final LoadingCache<String, Set<FirewallRule>> getFirewallRulesByVirtualMachine;
-
- @Inject
- public CreateFirewallRulesForIP(CloudStackApi client,
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult,
- LoadingCache<String, Set<FirewallRule>> getFirewallRulesByVirtualMachine) {
- this.client = checkNotNull(client, "client");
- this.blockUntilJobCompletesAndReturnResult = checkNotNull(blockUntilJobCompletesAndReturnResult,
- "blockUntilJobCompletesAndReturnResult");
- this.getFirewallRulesByVirtualMachine = checkNotNull(getFirewallRulesByVirtualMachine,
- "getFirewallRulesByVirtualMachine");
- }
-
- public Set<FirewallRule> apply(PublicIPAddress ip, Iterable<Integer> ports) {
- return apply(ip, "tcp", ports);
- }
-
- public Set<FirewallRule> apply(PublicIPAddress ip, String protocol, Iterable<Integer> ports) {
- checkState(ip.getVirtualMachineId() != null,
- "ip %s should be static NATed to a virtual machine before applying rules", ip);
- if (Iterables.isEmpty(ports))
- return ImmutableSet.<FirewallRule> of();
- Builder<AsyncCreateResponse> responses = ImmutableSet.builder();
- for (int port : ports) {
- AsyncCreateResponse response = client.getFirewallApi().createFirewallRuleForIpAndProtocol(ip.getId(), FirewallRule.Protocol.fromValue(protocol),
- CreateFirewallRuleOptions.Builder.startPort(port).endPort(port));
- logger.debug(">> creating firewall rule IPAddress(%s) for protocol(%s), port(%s); response(%s)",
- ip.getId(), protocol, port, response);
- responses.add(response);
- }
- Builder<FirewallRule> rules = ImmutableSet.builder();
- for (AsyncCreateResponse response : responses.build()) {
- FirewallRule rule = blockUntilJobCompletesAndReturnResult.<FirewallRule> apply(response);
- rules.add(rule);
- getFirewallRulesByVirtualMachine.asMap().put(ip.getVirtualMachineId(), ImmutableSet.of(rule));
- }
- return rules.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java
deleted file mode 100644
index dd09f77..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreatePortForwardingRulesForIP.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.ImmutableSet.Builder;
-
-@Singleton
-public class CreatePortForwardingRulesForIP {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final CloudStackApi client;
- private final BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult;
- private final LoadingCache<String, Set<IPForwardingRule>> getIPForwardingRulesByVirtualMachine;
-
- @Inject
- public CreatePortForwardingRulesForIP(CloudStackApi client,
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult,
- LoadingCache<String, Set<IPForwardingRule>> getIPForwardingRulesByVirtualMachine) {
- this.client = checkNotNull(client, "client");
- this.blockUntilJobCompletesAndReturnResult = checkNotNull(blockUntilJobCompletesAndReturnResult,
- "blockUntilJobCompletesAndReturnResult");
- this.getIPForwardingRulesByVirtualMachine = checkNotNull(getIPForwardingRulesByVirtualMachine,
- "getIPForwardingRulesByVirtualMachine");
- }
-
- public Set<IPForwardingRule> apply(PublicIPAddress ip, Iterable<Integer> ports) {
- return apply(ip, "tcp", ports);
- }
-
- public Set<IPForwardingRule> apply(PublicIPAddress ip, String protocol, Iterable<Integer> ports) {
- checkState(ip.getVirtualMachineId() != null,
- "ip %s should be static NATed to a virtual machine before applying rules", ip);
- if (Iterables.isEmpty(ports))
- return ImmutableSet.<IPForwardingRule> of();
- Builder<AsyncCreateResponse> responses = ImmutableSet.builder();
- for (int port : ports) {
- AsyncCreateResponse response = client.getNATApi().createIPForwardingRule(ip.getId(), protocol, port);
- logger.debug(">> creating IP forwarding rule IPAddress(%s) for protocol(%s), port(%s); response(%s)",
- ip.getId(), protocol, port, response);
- responses.add(response);
- }
- Builder<IPForwardingRule> rules = ImmutableSet.builder();
- for (AsyncCreateResponse response : responses.build()) {
- IPForwardingRule rule = blockUntilJobCompletesAndReturnResult.<IPForwardingRule> apply(response);
- rules.add(rule);
- getIPForwardingRulesByVirtualMachine.asMap().put(ip.getVirtualMachineId(), ImmutableSet.of(rule));
- }
- return rules.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
deleted file mode 100644
index 8360977..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.portInRangeForCidr;
-import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityGroups;
-
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-
-@Singleton
-public class CreateSecurityGroupIfNeeded implements Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup> {
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
- protected final CloudStackApi client;
- protected final Supplier<LoadingCache<String, Zone>> zoneIdToZone;
- protected final Predicate<String> jobComplete;
-
- @Inject
- public CreateSecurityGroupIfNeeded(CloudStackApi client,
- Predicate<String> jobComplete,
- Supplier<LoadingCache<String, Zone>> zoneIdToZone) {
- this.client = checkNotNull(client, "client");
- this.jobComplete = checkNotNull(jobComplete, "jobComplete");
- this.zoneIdToZone = zoneIdToZone;
- }
-
- @Override
- public SecurityGroup apply(ZoneSecurityGroupNamePortsCidrs input) {
- checkNotNull(input, "input");
-
- String zoneId = input.getZone();
- Zone zone = zoneIdToZone.get().getUnchecked(zoneId);
-
- checkArgument(supportsSecurityGroups().apply(zone),
- "Security groups are required, but the zone %s does not support security groups", zoneId);
- logger.debug(">> creating securityGroup %s", input);
- try {
-
- SecurityGroup securityGroup = client.getSecurityGroupApi().createSecurityGroup(input.getName());
-
- logger.debug("<< created securityGroup(%s)", securityGroup);
- ImmutableSet<String> cidrs;
- if (!input.getCidrs().isEmpty()) {
- cidrs = ImmutableSet.copyOf(input.getCidrs());
- } else {
- cidrs = ImmutableSet.of("0.0.0.0/0");
- }
- for (int port : input.getPorts()) {
- authorizeGroupToItselfAndToTCPPortAndCidr(client, securityGroup, port, cidrs);
- }
- return securityGroup;
- } catch (IllegalStateException e) {
- logger.trace("<< trying to find securityGroup(%s): %s", input, e.getMessage());
- SecurityGroup group = client.getSecurityGroupApi().getSecurityGroupByName(input.getName());
- logger.debug("<< reused securityGroup(%s)", group.getId());
- return group;
- }
- }
-
- private void authorizeGroupToItselfAndToTCPPortAndCidr(CloudStackApi client,
- SecurityGroup securityGroup,
- int port,
- Set<String> cidrs) {
- for (String cidr : cidrs) {
- logger.debug(">> authorizing securityGroup(%s) permission to %s on port %d", securityGroup, cidr, port);
- if (!portInRangeForCidr(port, cidr).apply(securityGroup)) {
- jobComplete.apply(client.getSecurityGroupApi().authorizeIngressPortsToCIDRs(securityGroup.getId(),
- "TCP",
- port,
- port,
- ImmutableSet.of(cidr)));
- logger.debug("<< authorized securityGroup(%s) permission to %s on port %d", securityGroup, cidr, port);
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java
deleted file mode 100644
index cddb19d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.google.common.base.Function;
-
-/**
- * Convert a Date object into a "yyyy-MM-dd" String
- */
-public class DateToYyyyMmDd implements Function<Object, String> {
-
- public String apply(Object input) {
- checkNotNull(input, "input cannot be null");
- checkArgument(input instanceof Date, "input must be a Date");
-
- return new SimpleDateFormat("yyyy-MM-dd").format((Date)input);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java
deleted file mode 100644
index 3fc73ab..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.cache.CacheLoader;
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.options.ListFirewallRulesOptions;
-
-@Singleton
-public class GetFirewallRulesByVirtualMachine extends CacheLoader<String, Set<FirewallRule>> {
- private final CloudStackApi client;
-
- @Inject
- public GetFirewallRulesByVirtualMachine(CloudStackApi client) {
- this.client = checkNotNull(client, "client");
- }
-
- /**
- * @throws org.jclouds.rest.ResourceNotFoundException
- * when there is no ip forwarding rule available for the VM
- */
- @Override
- public Set<FirewallRule> load(String input) {
- String publicIPId = client.getVirtualMachineApi().getVirtualMachine(input).getPublicIPId();
- Set<FirewallRule> rules = client.getFirewallApi()
- .listFirewallRules(ListFirewallRulesOptions.Builder.ipAddressId(publicIPId));
- return rules != null ? rules : ImmutableSet.<FirewallRule>of();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java
deleted file mode 100644
index 02e6fa1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-
-import com.google.common.cache.CacheLoader;
-
-@Singleton
-public class GetIPForwardingRulesByVirtualMachine extends CacheLoader<String, Set<IPForwardingRule>> {
- private final CloudStackApi client;
-
- @Inject
- public GetIPForwardingRulesByVirtualMachine(CloudStackApi client) {
- this.client = checkNotNull(client, "client");
- }
-
- /**
- * @throws org.jclouds.rest.ResourceNotFoundException
- * when there is no ip forwarding rule available for the VM
- */
- @Override
- public Set<IPForwardingRule> load(String input) {
- return client.getNATApi().getIPForwardingRulesForVirtualMachine(input);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java
deleted file mode 100644
index 3095729..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.domain.JsonBall;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-
-import com.google.common.base.Function;
-import com.google.inject.Inject;
-
-@Singleton
-public class ParseAsyncJobFromHttpResponse implements Function<HttpResponse, AsyncJob<?>> {
- private final UnwrapOnlyJsonValue<AsyncJob<Map<String, JsonBall>>> parser;
- private final ParseTypedAsyncJob parseTyped;
-
- @Inject
- public ParseAsyncJobFromHttpResponse(ParseTypedAsyncJob parseTyped,
- UnwrapOnlyJsonValue<AsyncJob<Map<String, JsonBall>>> parser) {
- this.parseTyped = checkNotNull(parseTyped, "parseTyped");
- this.parser = checkNotNull(parser, "parser");
- }
-
- public AsyncJob<?> apply(HttpResponse response) {
- checkNotNull(response, "response");
- AsyncJob<Map<String, JsonBall>> toParse = parser.apply(response);
- checkNotNull(toParse, "parsed result from %s", response);
- return parseTyped.apply(toParse);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java
deleted file mode 100644
index 59f479f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.domain.JsonBall;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.json.internal.GsonWrapper;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
-import com.google.inject.TypeLiteral;
-
-@Singleton
-public class ParseAsyncJobsFromHttpResponse implements Function<HttpResponse, Set<AsyncJob<?>>> {
- private final ParseFirstJsonValueNamed<Set<AsyncJob<Map<String, JsonBall>>>> parser;
- private final ParseTypedAsyncJob parseTyped;
-
- @Inject
- public ParseAsyncJobsFromHttpResponse(ParseTypedAsyncJob parseTyped, GsonWrapper gsonView) {
- this.parseTyped = checkNotNull(parseTyped, "parseTyped");
- this.parser = new ParseFirstJsonValueNamed<Set<AsyncJob<Map<String, JsonBall>>>>(
- checkNotNull(gsonView, "gsonView"),
- new TypeLiteral<Set<AsyncJob<Map<String, JsonBall>>>>() { },
- "asyncjobs");
- }
-
- public Set<AsyncJob<?>> apply(HttpResponse response) {
- checkNotNull(response, "response");
- Set<AsyncJob<Map<String, JsonBall>>> toParse = parser.apply(response);
- checkNotNull(toParse, "parsed result from %s", response);
- return ImmutableSet.copyOf(Iterables.transform(toParse, parseTyped));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java
deleted file mode 100644
index 552a6e8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.json.internal.GsonWrapper;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.inject.Inject;
-import com.google.inject.TypeLiteral;
-
-@Singleton
-public class ParseEventTypesFromHttpResponse implements Function<HttpResponse, Set<String>> {
- private final ParseFirstJsonValueNamed<Set<EventType>> parser;
-
- private static class EventType {
- private String name;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- EventType that = (EventType) o;
-
- if (!Objects.equal(name, that.name)) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name);
- }
- }
-
- @Inject
- public ParseEventTypesFromHttpResponse(GsonWrapper gsonView) {
- this.parser = new ParseFirstJsonValueNamed<Set<EventType>>(checkNotNull(gsonView, "gsonView"),
- new TypeLiteral<Set<EventType>>() {
- }, "eventtype");
- }
-
- public Set<String> apply(HttpResponse response) {
- checkNotNull(response, "response");
- Set<EventType> toParse = parser.apply(response);
- checkNotNull(toParse, "parsed result from %s", response);
- Builder<String> builder = ImmutableSet.builder();
- for (EventType entry : toParse)
- builder.add(entry.name);
- return builder.build();
- }
-}
-
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java
deleted file mode 100644
index 936e5aa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
-
-@Singleton
-public class ParseIdToNameEntryFromHttpResponse implements Function<HttpResponse, Map.Entry<String, String>> {
- private final ParseIdToNameFromHttpResponse parser;
-
- @Inject
- public ParseIdToNameEntryFromHttpResponse(ParseIdToNameFromHttpResponse parser) {
- this.parser = checkNotNull(parser, "parser");
- }
-
- public Map.Entry<String, String> apply(HttpResponse response) {
- checkNotNull(response, "response");
- Map<String, String> toParse = parser.apply(response);
- checkNotNull(toParse, "parsed result from %s", response);
- return Iterables.getFirst(toParse.entrySet(), null);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java
deleted file mode 100644
index d2ba0a7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.json.internal.GsonWrapper;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import com.google.inject.Inject;
-import com.google.inject.TypeLiteral;
-
-@Singleton
-public class ParseIdToNameFromHttpResponse implements Function<HttpResponse, Map<String, String>> {
- private final ParseFirstJsonValueNamed<Set<IdName>> parser;
-
- private static class IdName {
- private String id;
- private String name;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- IdName that = (IdName) o;
-
- if (!Objects.equal(id, that.id)) return false;
- if (!Objects.equal(name, that.name)) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name);
- }
- }
-
- @Inject
- public ParseIdToNameFromHttpResponse(GsonWrapper gsonView) {
- this.parser = new ParseFirstJsonValueNamed<Set<IdName>>(checkNotNull(gsonView, "gsonView"),
- new TypeLiteral<Set<IdName>>() {
- }, "oscategory");
- }
-
- public Map<String, String> apply(HttpResponse response) {
- checkNotNull(response, "response");
- Set<IdName> toParse = parser.apply(response);
- checkNotNull(toParse, "parsed result from %s", response);
- Builder<String, String> builder = ImmutableSortedMap.naturalOrder();
- for (IdName entry : toParse)
- builder.put(entry.id, entry.name);
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java
deleted file mode 100644
index 317aa28..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.get;
-import static com.google.common.collect.Iterables.getOnlyElement;
-
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.json.internal.GsonWrapper;
-
-import com.google.common.base.Function;
-import com.google.common.base.Splitter;
-import com.google.inject.Inject;
-import com.google.inject.TypeLiteral;
-
-public class ParseLoginResponseFromHttpResponse implements Function<HttpResponse, LoginResponse> {
-
- private ParseFirstJsonValueNamed<LoginResponse> parser;
-
- @Inject
- ParseLoginResponseFromHttpResponse(GsonWrapper gson) {
- this.parser = new ParseFirstJsonValueNamed<LoginResponse>(checkNotNull(gson, "gsonView"),
- new TypeLiteral<LoginResponse>(){}, "loginresponse");
- }
-
- @Override
- public LoginResponse apply(HttpResponse response) {
- checkNotNull(response, "response");
-
- LoginResponse login = parser.apply(response);
- checkNotNull(login, "loginResponse");
-
- String jSessionId = get(Splitter.on("=").split(get(Splitter.on(";").trimResults().split(
- getOnlyElement(response.getHeaders().get("Set-Cookie"))), 0)), 1);
-
- return LoginResponse.builder().fromLoginResponse(login).jSessionId(jSessionId).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java
deleted file mode 100644
index f30c6a4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.json.internal.GsonWrapper;
-
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.inject.Inject;
-import com.google.inject.TypeLiteral;
-
-@Singleton
-public class ParseNamesFromHttpResponse implements Function<HttpResponse, Set<String>> {
- private final ParseFirstJsonValueNamed<Set<Name>> parser;
-
- private static class Name {
- private String name;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Name that = (Name) o;
-
- if (!Objects.equal(name, that.name)) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name);
- }
- }
-
- @Inject
- public ParseNamesFromHttpResponse(GsonWrapper gsonView) {
- this.parser = new ParseFirstJsonValueNamed<Set<Name>>(checkNotNull(gsonView, "gsonView"),
- new TypeLiteral<Set<Name>>() {
- }, "hypervisor");
- }
-
- public Set<String> apply(HttpResponse response) {
- checkNotNull(response, "response");
- Set<Name> toParse = parser.apply(response);
- checkNotNull(toParse, "parsed result from %s", response);
- Builder<String> builder = ImmutableSet.builder();
- for (Name entry : toParse)
- builder.add(entry.name);
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java
deleted file mode 100644
index 0082ea8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.Resource;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.AsyncJobError;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.LoadBalancerRule;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.PortForwardingRule;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.Snapshot;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateExtraction;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.domain.AsyncJob.Builder;
-import org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode;
-import org.jclouds.domain.JsonBall;
-import org.jclouds.json.Json;
-import org.jclouds.logging.Logger;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
-
-@Singleton
-public class ParseTypedAsyncJob implements Function<AsyncJob<Map<String, JsonBall>>, AsyncJob<?>> {
- @Resource
- protected Logger logger = Logger.NULL;
-
- @Inject(optional = true)
- @VisibleForTesting
- @Named("jclouds.cloudstack.jobresult-type-map")
- Map<String, Class<?>> typeMap = ImmutableMap.<String, Class<?>>builder()
- .put("user", User.class)
- .put("account", Account.class)
- .put("securitygroup", SecurityGroup.class)
- .put("portforwardingrule", PortForwardingRule.class)
- .put("ipforwardingrule", IPForwardingRule.class)
- .put("firewallrule", FirewallRule.class)
- .put("network", Network.class)
- .put("ipaddress", PublicIPAddress.class)
- .put("virtualmachine", VirtualMachine.class)
- .put("loadbalancer", LoadBalancerRule.class)
- .put("snapshot", Snapshot.class)
- .put("template", Template.class)
- .put("volume", Volume.class).build();
- private final Json json;
-
- @Inject
- public ParseTypedAsyncJob(Json json) {
- this.json = checkNotNull(json, "json");
- }
-
- public AsyncJob<?> apply(AsyncJob<Map<String, JsonBall>> toParse) {
- AsyncJob<?> result = toParse;
- if (toParse.getResult() != null) {
- if (toParse.getResult().size() == 1) {
- @SuppressWarnings({"unchecked", "rawtypes"})
- Builder<?, Object> builder = AsyncJob.Builder.fromAsyncJobUntyped((AsyncJob) toParse);
- if (toParse.getResult().containsKey("success")) {
- builder.result(null);
- } else {
- Entry<String, JsonBall> entry = Iterables.get(toParse.getResult().entrySet(), 0);
- if ("template".equals(entry.getKey())) {
- // Sometimes Cloudstack will say 'template' and the payload is a Template object.
- // Sometimes Cloudstack will say 'template' and the payload is a TemplateExtraction object.
- // The 'state' field only exists on TemplateExtraction, so we can test this to work out what we have actually been given.
- Template template = json.fromJson(entry.getValue().toString(), Template.class);
- TemplateExtraction templateExtraction = json.fromJson(entry.getValue().toString(), TemplateExtraction.class);
- boolean isTemplate = Strings.isNullOrEmpty(templateExtraction.getState());
- builder.result(isTemplate ? template : templateExtraction);
- } else if (typeMap.containsKey(entry.getKey())) {
- builder.result(json.fromJson(entry.getValue().toString(), typeMap.get(entry.getKey())));
- } else {
- logger.warn(
- "type key %s not configured. please override default for Map<String, Class<?>> bound to name jclouds.cloudstack.jobresult-type-map",
- entry.getKey());
- builder.result(entry.getValue().toString());
- }
- }
- result = builder.build();
- } else if (toParse.getResult().containsKey("errorcode")) {
- @SuppressWarnings({"unchecked", "rawtypes"})
- Builder<?, Object> builder = AsyncJob.Builder.fromAsyncJobUntyped((AsyncJob) toParse);
- builder.result(null); // avoid classcastexceptions
- builder.error(AsyncJobError.builder().errorCode(ErrorCode.fromValue(toParse.getResult().get("errorcode").toString()))
- .errorText(toParse.getResult().containsKey("errortext") ? toParse.getResult().get("errortext").toString().replace("\"", "") : null)
- .build());
- result = builder.build();
- } else if (toParse.getResult().size() > 1) {
- logger.warn("unexpected size of async job result; expecting a map with a single element",
- toParse.getResult());
- }
- }
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java
deleted file mode 100644
index 7ea19b2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.and;
-import static com.google.common.collect.Iterables.find;
-import static org.jclouds.cloudstack.options.AssociateIPAddressOptions.Builder.networkId;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.allocatedOnly;
-import static org.jclouds.cloudstack.predicates.PublicIPAddressPredicates.associatedWithNetwork;
-import static org.jclouds.cloudstack.predicates.PublicIPAddressPredicates.available;
-import static org.jclouds.compute.reference.ComputeServiceConstants.COMPUTE_LOGGER;
-
-import java.util.NoSuchElementException;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.features.AddressApi;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Function;
-
-@Singleton
-public class ReuseOrAssociateNewPublicIPAddress implements Function<Network, PublicIPAddress> {
- private final CloudStackApi client;
- private final BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult;
- @Resource
- @Named(COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- @Inject
- public ReuseOrAssociateNewPublicIPAddress(CloudStackApi client,
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult) {
- this.client = checkNotNull(client, "client");
- this.blockUntilJobCompletesAndReturnResult = checkNotNull(blockUntilJobCompletesAndReturnResult,
- "blockUntilJobCompletesAndReturnResult");
- }
-
- /**
- * Finds existing addresses who are ready for use and not assigned to a
- * machine.
- *
- * @param networkId
- * network id to search
- * @param client
- * address client
- * @return address to use
- * @throws NoSuchElementException
- * if there's no existing ip address that is free for use
- */
- public static PublicIPAddress findAvailableAndAssociatedWithNetwork(String networkId, AddressApi client) {
- return find(client.listPublicIPAddresses(allocatedOnly(true).networkId(networkId)),
- and(associatedWithNetwork(networkId), available()));
- }
-
- public static PublicIPAddress associateIPAddressInNetwork(Network network, CloudStackApi client,
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult) {
- AsyncCreateResponse job = client.getAddressApi().associateIPAddressInZone(network.getZoneId(),
- networkId(network.getId()));
- PublicIPAddress ip = blockUntilJobCompletesAndReturnResult.<PublicIPAddress> apply(job);
- assert ip.getZoneId().equals(network.getZoneId());
- return ip;
- }
-
- @Override
- public PublicIPAddress apply(Network input) {
- try {
- logger.debug(">> looking for existing address in network(%s)", input.getId());
- PublicIPAddress returnVal = findAvailableAndAssociatedWithNetwork(input.getId(), client.getAddressApi());
- logger.debug("<< reused address(%s)", returnVal.getId());
- return returnVal;
- } catch (NoSuchElementException e) {
- logger.debug(">> associating new address in network(%s)", input.getId());
- PublicIPAddress returnVal = associateIPAddressInNetwork(input, client, blockUntilJobCompletesAndReturnResult);
- logger.debug("<< associated address(%s)", returnVal.getId());
- return returnVal;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java
deleted file mode 100644
index 87fc128..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Function;
-import com.google.inject.assistedinject.Assisted;
-
-@Singleton
-public class StaticNATVirtualMachineInNetwork implements Function<VirtualMachine, PublicIPAddress> {
- public interface Factory {
- StaticNATVirtualMachineInNetwork create(Network in);
- }
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final CloudStackApi client;
- private final ReuseOrAssociateNewPublicIPAddress reuseOrAssociate;
- private final Network network;
-
- @Inject
- public StaticNATVirtualMachineInNetwork(CloudStackApi client,
- ReuseOrAssociateNewPublicIPAddress reuseOrAssociate, @Assisted Network network) {
- this.client = checkNotNull(client, "client");
- this.reuseOrAssociate = checkNotNull(reuseOrAssociate, "reuseOrAssociate");
- this.network = checkNotNull(network, "network");
- }
-
- public PublicIPAddress apply(VirtualMachine vm) {
- PublicIPAddress ip;
- for (ip = reuseOrAssociate.apply(network); !ip.isStaticNAT() || ip.getVirtualMachineId() != vm.getId(); ip = reuseOrAssociate
- .apply(network)) {
- // check to see if someone already grabbed this ip
- if (ip.getVirtualMachineId() != null && ip.getVirtualMachineId() != vm.getId())
- continue;
- try {
- logger.debug(">> static NATing IPAddress(%s) to virtualMachine(%s)", ip.getId(), vm.getId());
- client.getNATApi().enableStaticNATForVirtualMachine(vm.getId(), ip.getId());
- ip = client.getAddressApi().getPublicIPAddress(ip.getId());
- if (ip.isStaticNAT() && ip.getVirtualMachineId().equals(vm.getId()))
- break;
- } catch (IllegalStateException e) {
- // very likely an ip conflict, so retry;
- }
- return ip;
- }
- return ip;
- }
-}
[27/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java
deleted file mode 100644
index 6c29f83..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.options;
-
-import com.google.common.collect.ImmutableSet;
-import org.jclouds.compute.options.TemplateOptions;
-import org.testng.annotations.Test;
-import org.testng.collections.Maps;
-
-import java.util.Map;
-
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.account;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.dataDiskSize;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.diskOfferingId;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.domainId;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.generateKeyPair;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.generateSecurityGroup;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.ipOnDefaultNetwork;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.ipsToNetworks;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.keyPair;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.networks;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.securityGroupId;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.securityGroupIds;
-import static org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions.Builder.setupStaticNat;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-/**
- * Tests possible uses of {@code CloudStackTemplateOptions} and
- * {@code CloudStackTemplateOptions.Builder.*}.
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "CloudStackTemplateOptionsTest")
-public class CloudStackTemplateOptionsTest {
- //TODO: test clone();
-
- @Test
- public void testAs() {
- TemplateOptions options = new CloudStackTemplateOptions();
- assertEquals(options.as(CloudStackTemplateOptions.class), options);
- }
-
- @Test
- public void testDefaultSecurityGroupIds() {
- TemplateOptions options = new CloudStackTemplateOptions();
- assertEquals(options.as(CloudStackTemplateOptions.class).getSecurityGroupIds(), ImmutableSet.of());
- }
-
- @Test
- public void testSecurityGroupId() {
- TemplateOptions options = new CloudStackTemplateOptions().securityGroupId("3");
- assertEquals(options.as(CloudStackTemplateOptions.class).getSecurityGroupIds(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testSecurityGroupIdStatic() {
- TemplateOptions options = securityGroupId("3");
- assertEquals(options.as(CloudStackTemplateOptions.class).getSecurityGroupIds(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testSecurityGroupIds() {
- TemplateOptions options = new CloudStackTemplateOptions().securityGroupIds(ImmutableSet.of("3"));
- assertEquals(options.as(CloudStackTemplateOptions.class).getSecurityGroupIds(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testSecurityGroupIdsStatic() {
- TemplateOptions options = securityGroupIds(ImmutableSet.of("3"));
- assertEquals(options.as(CloudStackTemplateOptions.class).getSecurityGroupIds(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testGenerateSecurityGroupDefaultsFalse() {
- TemplateOptions options = new CloudStackTemplateOptions();
- assertFalse(options.as(CloudStackTemplateOptions.class)
- .shouldGenerateSecurityGroup());
- }
-
- @Test
- public void testGenerateSecurityGroup() {
- TemplateOptions options = new CloudStackTemplateOptions().generateSecurityGroup(true);
- assertTrue(options.as(CloudStackTemplateOptions.class)
- .shouldGenerateSecurityGroup());
- }
-
- @Test
- public void testGenerateSecurityGroupStatic() {
- TemplateOptions options = generateSecurityGroup(true);
- assertTrue(options.as(CloudStackTemplateOptions.class)
- .shouldGenerateSecurityGroup());
- }
-
- @Test
- public void testDefaultNetworkIds() {
- TemplateOptions options = new CloudStackTemplateOptions();
- assertEquals(options.as(CloudStackTemplateOptions.class).getNetworks(), ImmutableSet.of());
- }
-
- @Test
- public void testNetworkId() {
- TemplateOptions options = new CloudStackTemplateOptions().networks("3");
- assertEquals(options.as(CloudStackTemplateOptions.class).getNetworks(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testNetworkIdStatic() {
- TemplateOptions options = networks(ImmutableSet.of("3"));
- assertEquals(options.as(CloudStackTemplateOptions.class).getNetworks(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testNetworkIds() {
- TemplateOptions options = new CloudStackTemplateOptions().networks(ImmutableSet.of("3"));
- assertEquals(options.as(CloudStackTemplateOptions.class).getNetworks(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testNetworkIdsStatic() {
- TemplateOptions options = networks(ImmutableSet.of("3"));
- assertEquals(options.as(CloudStackTemplateOptions.class).getNetworks(), ImmutableSet.of("3"));
- }
-
- @Test
- public void testIpOnDefaultNetwork() {
- TemplateOptions options = new CloudStackTemplateOptions().ipOnDefaultNetwork("10.0.0.1");
- assertEquals(options.as(CloudStackTemplateOptions.class).getIpOnDefaultNetwork(), "10.0.0.1");
- }
-
- @Test
- public void testIpOnDefaultNetworkStatic() {
- TemplateOptions options = ipOnDefaultNetwork("10.0.0.1");
- assertEquals(options.as(CloudStackTemplateOptions.class).getIpOnDefaultNetwork(), "10.0.0.1");
- }
-
- @Test
- public void testIpsToNetwork() {
- Map<String, String> ipsToNetworks = Maps.newHashMap();
- ipsToNetworks.put("10.0.0.1", "5");
-
- TemplateOptions options = new CloudStackTemplateOptions().ipsToNetworks(ipsToNetworks);
- assertEquals(options.as(CloudStackTemplateOptions.class)
- .getIpsToNetworks().get("10.0.0.1"), "5");
- }
-
- @Test
- public void testIpsToNetworkStatic() {
- Map<String, String> ipsToNetworks = Maps.newHashMap();
- ipsToNetworks.put("10.0.0.1", "5");
-
- TemplateOptions options = ipsToNetworks(ipsToNetworks);
- assertEquals(options.as(CloudStackTemplateOptions.class)
- .getIpsToNetworks().get("10.0.0.1"), "5");
- }
-
- @Test
- public void testSetupStaticNatDefaultsTrue() {
- TemplateOptions options = new CloudStackTemplateOptions();
- assertTrue(options.as(CloudStackTemplateOptions.class)
- .shouldSetupStaticNat());
- }
-
- @Test
- public void testSetupStaticNat() {
- TemplateOptions options = new CloudStackTemplateOptions().setupStaticNat(false);
- assertFalse(options.as(CloudStackTemplateOptions.class)
- .shouldSetupStaticNat());
- }
-
- @Test
- public void testSetupStaticNatStatic() {
- TemplateOptions options = setupStaticNat(false);
- assertFalse(options.as(CloudStackTemplateOptions.class)
- .shouldSetupStaticNat());
- }
-
- @Test
- public void testGenerateKeyPairDefaultsFalse() {
- TemplateOptions options = new CloudStackTemplateOptions();
- assertFalse(options.as(CloudStackTemplateOptions.class)
- .shouldGenerateKeyPair());
- }
-
- @Test
- public void testGenerateKeyPair() {
- TemplateOptions options = new CloudStackTemplateOptions().generateKeyPair(true);
- assertTrue(options.as(CloudStackTemplateOptions.class)
- .shouldGenerateKeyPair());
- }
-
- @Test
- public void testGenerateKeyPairStatic() {
- TemplateOptions options = generateKeyPair(true);
- assertTrue(options.as(CloudStackTemplateOptions.class)
- .shouldGenerateKeyPair());
- }
-
- @Test
- public void testKeyPair() {
- TemplateOptions options = keyPair("test");
- assertEquals(options.as(CloudStackTemplateOptions.class).getKeyPair(), "test");
- }
-
- @Test
- public void testDiskOfferingId() {
- TemplateOptions options = diskOfferingId("test");
- assertEquals(options.as(CloudStackTemplateOptions.class).getDiskOfferingId(), "test");
- }
-
- @Test
- public void testDataDiskSizeDefault() {
- TemplateOptions options = new CloudStackTemplateOptions();
- assertEquals(options.as(CloudStackTemplateOptions.class).getDataDiskSize(), 0);
- }
-
- @Test
- public void testDataDiskSize() {
- TemplateOptions options = dataDiskSize(10);
- assertEquals(options.as(CloudStackTemplateOptions.class).getDataDiskSize(), 10);
- }
-
- @Test
- public void testAccount() {
- TemplateOptions options = account("test");
- assertEquals(options.as(CloudStackTemplateOptions.class).getAccount(), "test");
- }
-
- @Test
- public void testDomainId() {
- TemplateOptions options = domainId("test");
- assertEquals(options.as(CloudStackTemplateOptions.class).getDomainId(), "test");
- }
-
- @Test
- public void testSecurityGroupIdsNullHasDecentMessage() {
- try {
- new CloudStackTemplateOptions().securityGroupIds(null);
- fail("should NPE");
- } catch (NullPointerException e) {
- assertEquals(e.getMessage(), "securityGroupIds was null");
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java
deleted file mode 100644
index d44ba77..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.strategy;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkService;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-import org.testng.annotations.Test;
-
-import java.util.Map;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-@Test(singleThreaded = true, testName = "OptionsConverterTest")
-public class OptionsConverterTest {
-
- private static final Map<String, Network> EMPTY_NETWORKS_MAP = ImmutableMap.<String, Network>of();
- private static final String ZONE_ID = "2";
- private final NetworkService firewallServiceWithStaticNat
- = NetworkService.builder().name("Firewall").capabilities(ImmutableMap.of("StaticNat", "true")).build();
-
- @Test
- public void testBasicNetworkOptionsConverter() {
- BasicNetworkOptionsConverter converter = new BasicNetworkOptionsConverter();
-
- CloudStackTemplateOptions optionsIn = CloudStackTemplateOptions.Builder.securityGroupId("42").networks("46");
- DeployVirtualMachineOptions optionsOut = new DeployVirtualMachineOptions();
-
- DeployVirtualMachineOptions optionsOut2 = converter.apply(optionsIn, EMPTY_NETWORKS_MAP, ZONE_ID, optionsOut);
- assertEquals(optionsOut, optionsOut2);
-
- DeployVirtualMachineOptions optionsExpected = DeployVirtualMachineOptions.Builder.securityGroupId("42").networkId("46");
- assertEquals(optionsOut, optionsExpected);
- }
-
- @Test
- public void testAdvancedSecurityGroupsNotAllowed() {
- boolean exceptionThrown = false;
- AdvancedNetworkOptionsConverter converter = new AdvancedNetworkOptionsConverter();
- CloudStackTemplateOptions optionsIn = CloudStackTemplateOptions.Builder.securityGroupId("42");
-
- try {
- converter.apply(optionsIn, EMPTY_NETWORKS_MAP, ZONE_ID, DeployVirtualMachineOptions.NONE);
- } catch (IllegalArgumentException e) {
- exceptionThrown = true;
- }
-
- assertTrue(exceptionThrown, "IllegalArgumentException should have been thrown");
- }
-
- @Test
- public void testAdvancedExplicitNetworkSelection() {
- AdvancedNetworkOptionsConverter converter = new AdvancedNetworkOptionsConverter();
- DeployVirtualMachineOptions optionsActual = converter.apply(CloudStackTemplateOptions.Builder.networks("42"),
- EMPTY_NETWORKS_MAP, ZONE_ID, DeployVirtualMachineOptions.NONE);
- DeployVirtualMachineOptions optionsExpected = DeployVirtualMachineOptions.Builder.networkId("42");
- assertEquals(optionsActual, optionsExpected);
- }
-
- @Test
- public void testAdvancedAutoDetectNetwork() {
- AdvancedNetworkOptionsConverter converter = new AdvancedNetworkOptionsConverter();
-
- Network eligibleNetwork = Network.builder()
- .id("25").zoneId(ZONE_ID).isDefault(true).services(ImmutableSet.of(firewallServiceWithStaticNat))
- .build();
- DeployVirtualMachineOptions optionsActual = converter.apply(CloudStackTemplateOptions.NONE,
- ImmutableMap.of(eligibleNetwork.getId(), eligibleNetwork), ZONE_ID, DeployVirtualMachineOptions.NONE);
- DeployVirtualMachineOptions optionsExpected = DeployVirtualMachineOptions.Builder.networkId("25");
- assertEquals(optionsActual, optionsExpected);
- }
-
- @Test
- public void testAdvancedWhenNoNetworkGiven() {
- AdvancedNetworkOptionsConverter converter = new AdvancedNetworkOptionsConverter();
- boolean exceptionThrown = false;
- try {
- converter.apply(CloudStackTemplateOptions.NONE, EMPTY_NETWORKS_MAP, ZONE_ID, DeployVirtualMachineOptions.NONE);
- } catch (IllegalArgumentException e) {
- exceptionThrown = true;
- }
- assertTrue(exceptionThrown);
- }
-
- @Test
- public void testAdvancedWhenNoNetworkEligible() {
- AdvancedNetworkOptionsConverter converter = new AdvancedNetworkOptionsConverter();
- Network unsuitableNetwork = Network.builder()
- .id("25").zoneId(ZONE_ID)
- .build();
-
- boolean exceptionThrown = false;
- try {
- converter.apply(CloudStackTemplateOptions.NONE, ImmutableMap.of(unsuitableNetwork.getId(), unsuitableNetwork), ZONE_ID, DeployVirtualMachineOptions.NONE);
- } catch (IllegalArgumentException e) {
- exceptionThrown = true;
- }
- assertTrue(exceptionThrown);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java
deleted file mode 100644
index 8276b03..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
-
-import org.testng.annotations.Test;
-
-/**
- * Tests for the VirtualMachine class.
- */
-@Test(groups = "unit", testName = "VirtualMachineTest")
-public class VirtualMachineTest {
-
- @Test(groups = "unit", enabled = true)
- public void testCpuUsed() {
- // Class under test should detect if the % is missing off the end
- try {
- VirtualMachine.builder().id("1").cpuUsed("23.4").build();
- fail("Should have thrown an exception due to % being missing!");
- } catch (Exception e) {
- }
-
- // If CpuUsed is not specified at all, that's OK
- VirtualMachine vm = VirtualMachine.builder().id("2").build();
- assertEquals(vm.getCpuUsed(), 0.0f);
-
- // Retrieving CpuUsed should just give us a straightforward float
- vm = VirtualMachine.builder().id("3").cpuUsed("23.4%").build();
- assertEquals(vm.getCpuUsed(), 23.4, 0.01);
-
- //Allow ',' as decimal separator
- vm = VirtualMachine.builder().id("4").cpuUsed("23,4%").build();
- assertEquals(vm.getCpuUsed(), 23.4, 0.01);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java
deleted file mode 100644
index 385f221..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack AccountApi
- */
-@Test(groups = "unit", testName = "AccountApiExpectTest")
-public class AccountApiExpectTest extends BaseCloudStackExpectTest<AccountApi> {
-
-
- public void testListAccountsWhenResponseIs2xx() {
-
- AccountApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=listAccounts&listAll=true&apiKey=identity&signature=yMZYMZxzFlaUsbfxtuppMwNhpXI%3D")
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listaccountsresponse.json"))
- .build());
-
- Set<User> users = ImmutableSet.of(
- User.builder()
- .id("505")
- .name("jclouds")
- .firstName("Adrian")
- .lastName("Cole")
- .email("adrian@jclouds.org")
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-04-19T01:57:24+0000"))
- .state(User.State.ENABLED)
- .account("jclouds")
- .accountType(Account.Type.USER)
- .domainId("457")
- .domain("AA000062-jclouds-dev")
- .apiKey("APIKEY")
- .secretKey("SECRETKEY").build());
-
- assertEquals(client.listAccounts(),
- ImmutableSet.of(Account.builder()
- .id("505")
- .name("jclouds")
- .type(Account.Type.USER)
- .domainId("457")
- .domain("AA000062-jclouds-dev")
- .receivedBytes(318900216)
- .sentBytes(23189677)
- .VMLimit(15l)
- .VMs(1)
- .IPsAvailable(14l)
- .IPLimit(15l)
- .IPs(0)
- .IPsAvailable(15l)
- .volumeLimit(90l)
- .volumes(2)
- .volumesAvailable(88l)
- .snapshotLimit(250l)
- .snapshots(0)
- .snapshotsAvailable(250l)
- .templateLimit(15l)
- .templates(0)
- .templatesAvailable(15l)
- .VMsAvailable(14l)
- .VMsStopped(0)
- .VMsRunning(1)
- .state(Account.State.ENABLED)
- .users(users).build()));
- }
-
- @Override
- protected AccountApi clientFrom(CloudStackContext context) {
- return context.getApi().getAccountApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiLiveTest.java
deleted file mode 100644
index b394ce0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiLiveTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code AccountApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "AccountApiLiveTest")
-public class AccountApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testListAccounts() throws Exception {
- for (Account securityAccount : client.getAccountApi().listAccounts())
- checkAccount(securityAccount);
- }
-
- protected void checkAccount(Account account) {
- assert account.getId() != null : account;
- assertEquals(account.toString(), client.getAccountApi().getAccount(account.getId()).toString());
- assert account.getName() != null : account;
- assert account.getType() != null && account.getType() != Account.Type.UNRECOGNIZED : account;
- assert account.getDomain() != null : account;
- assert account.getDomainId() != null : account;
- assert account.getUsers() != null : account;
- for (User user : account.getUsers()) {
- assert user.getName() != null : user;
- assert user.getAccountType().equals(account.getType()) : user;
- assert user.getDomain().equals(account.getDomain()) : user;
- assert user.getDomainId().equals(account.getDomainId()) : user;
- assert user.getCreated() != null : user;
- assert user.getEmail() != null : user;
- assert user.getLastName() != null : user;
- assert user.getFirstName() != null : user;
- assert user.getId() != null : user;
- assert user.getState() != null : user;
- }
- assert account.getIPsAvailable() == null || account.getIPsAvailable() >= 0 : account;
- assert account.getIPLimit() == null || account.getIPLimit() >= 0 : account;
- assert account.getIPs() >= 0 : account;
- assert account.getReceivedBytes() >= 0 : account;
- assert account.getSentBytes() >= 0 : account;
- assert account.getSnapshotsAvailable() == null || account.getSnapshotsAvailable() >= 0 : account;
- assert account.getSnapshotLimit() == null || account.getSnapshotLimit() >= 0 : account;
- assert account.getSnapshots() >= 0 : account;
- assert account.getState() != null && account.getState() != Account.State.UNRECOGNIZED : account;
- assert account.getTemplatesAvailable() == null || account.getTemplatesAvailable() >= 0 : account;
- assert account.getTemplateLimit() == null || account.getTemplateLimit() >= 0 : account;
- assert account.getTemplates() >= 0 : account;
- assert account.getVMsAvailable() == null || account.getVMsAvailable() >= 0 : account;
- assert account.getVMLimit() == null || account.getVMLimit() >= 0 : account;
- assert account.getVMsRunning() >= 0 : account;
- assert account.getVMsStopped() >= 0 : account;
- assert account.getVMs() >= 0 : account;
- assert account.getVolumesAvailable() == null || account.getVolumesAvailable() >= 0 : account;
- assert account.getVolumeLimit() == null || account.getVolumeLimit() >= 0 : account;
- assert account.getVolumes() >= 0 : account;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiTest.java
deleted file mode 100644
index ffaec22..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AccountApiTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListAccountsOptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-
-/**
- * Tests behavior of {@code AccountApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "AccountApiTest")
-public class AccountApiTest extends BaseCloudStackApiTest<AccountApi> {
-
- public void testListAccounts() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AccountApi.class, "listAccounts", ListAccountsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listAccounts&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListAccountsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AccountApi.class, "listAccounts", ListAccountsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ListAccountsOptions.Builder.accountInDomain("jclouds", "123")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listAccounts&listAll=true&account=jclouds&domainid=123 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetAccount() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AccountApi.class, "getAccount", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("3"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listAccounts&listAll=true&id=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiLiveTest.java
deleted file mode 100644
index dc685a6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiLiveTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code AddressApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "AddressApiLiveTest")
-public class AddressApiLiveTest extends BaseCloudStackApiLiveTest {
- private boolean networksEnabled;
-
- @BeforeGroups(groups = "live")
- void networksEnabled() {
- networksEnabled = !client.getNetworkApi().listNetworks().isEmpty();
- }
-
- private PublicIPAddress ip = null;
-
- public void testAssociateDisassociatePublicIPAddress() throws Exception {
- if (!networksEnabled)
- return;
- AsyncCreateResponse job = client.getAddressApi().associateIPAddressInZone(
- Iterables.get(client.getNetworkApi().listNetworks(), 0).getZoneId());
- checkState(jobComplete.apply(job.getJobId()), "job %s failed to complete", job.getJobId());
- ip = client.getAsyncJobApi().<PublicIPAddress> getAsyncJob(job.getJobId()).getResult();
- checkIP(ip);
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (ip != null) {
- client.getAddressApi().disassociateIPAddress(ip.getId());
- }
- super.tearDownContext();
- }
-
- public void testListPublicIPAddresss() throws Exception {
- if (!networksEnabled)
- return;
- Set<PublicIPAddress> response = client.getAddressApi().listPublicIPAddresses();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (PublicIPAddress ip : response) {
- PublicIPAddress newDetails = getOnlyElement(client.getAddressApi().listPublicIPAddresses(
- ListPublicIPAddressesOptions.Builder.id(ip.getId())));
- assertEquals(ip.getId(), newDetails.getId());
- checkIP(ip);
- }
- }
-
- protected void checkIP(PublicIPAddress ip) {
- assertEquals(ip.getId(), client.getAddressApi().getPublicIPAddress(ip.getId()).getId());
- assert ip.getId() != null : ip;
- assert ip.getAccount() != null : ip;
- assert ip.getDomain() != null : ip;
- assert ip.getDomainId() != null : ip;
- assert ip.getState() != null : ip;
- assert ip.getZoneId() != null : ip;
- assert ip.getZoneName() != null : ip;
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiTest.java
deleted file mode 100644
index fdff2cb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AddressApiTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.functions.CloudStackFallbacks.VoidOnNotFoundOr404OrUnableToFindAccountOwner;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.AssociateIPAddressOptions;
-import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code AddressApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "AddressApiTest")
-public class AddressApiTest extends BaseCloudStackApiTest<AddressApi> {
- public void testListPublicIPAddresses() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AddressApi.class, "listPublicIPAddresses", ListPublicIPAddressesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listPublicIpAddresses&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListPublicIPAddressesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AddressApi.class, "listPublicIPAddresses", ListPublicIPAddressesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ListPublicIPAddressesOptions.Builder.accountInDomain("adrian", "6").usesVirtualNetwork(true)));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listPublicIpAddresses&listAll=true&account=adrian&domainid=6&forvirtualnetwork=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetPublicIPAddress() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AddressApi.class, "getPublicIPAddress", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listPublicIpAddresses&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testAssociateIPAddressInZone() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AddressApi.class, "associateIPAddressInZone", String.class,
- AssociateIPAddressOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(6));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=associateIpAddress&zoneid=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDisassociateIPAddress() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AddressApi.class, "disassociateIPAddress", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=disassociateIpAddress&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404OrUnableToFindAccountOwner.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiLiveTest.java
deleted file mode 100644
index 5cb6011..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiLiveTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.AsyncJob.ResultCode;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code AsyncJobApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "AsyncJobApiLiveTest")
-public class AsyncJobApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(enabled = true)
- public void testListAsyncJobs() throws Exception {
- Set<AsyncJob<?>> response = client.getAsyncJobApi().listAsyncJobs();
- assert null != response;
-
- long asyncJobCount = response.size();
- assertTrue(asyncJobCount >= 0);
-
- for (AsyncJob<?> asyncJob : response) {
- assert asyncJob.getCmd() != null : asyncJob;
- assert asyncJob.getUserId() != null : asyncJob;
- checkJob(asyncJob);
-
- AsyncJob<?> query = client.getAsyncJobApi().getAsyncJob(asyncJob.getId());
- assertEquals(query.getId(), asyncJob.getId());
-
- assert query.getResultType() != null : query;
- checkJob(query);
- }
- }
-
- private void checkJob(AsyncJob<?> query) {
- assert query.getStatus().code() >= 0 : query;
- assert query.getResultCode().code() >= 0 : query;
- assert query.getProgress() >= 0 : query;
- if (query.getResultCode() == ResultCode.SUCCESS) {
- if (query.getResult() != null) {
- assertEquals(query.getResult().getClass().getPackage(), AsyncJob.class.getPackage());
- }
- } else if (query.getResultCode() == ResultCode.FAIL) {
- assert query.getResult() == null : query;
- assert query.getError() != null : query;
- } else {
- assert query.getResult() == null : query;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java
deleted file mode 100644
index a61d4e0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.functions.ParseAsyncJobFromHttpResponse;
-import org.jclouds.cloudstack.functions.ParseAsyncJobsFromHttpResponse;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListAsyncJobsOptions;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-
-/**
- * Tests behavior of {@code AsyncJobApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "AsyncJobApiTest")
-public class AsyncJobApiTest extends BaseCloudStackApiTest<AsyncJobApi> {
-
- public void testGetAsyncJob() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AsyncJobApi.class, "getAsyncJob", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11l));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=queryAsyncJobResult&jobid=11 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseAsyncJobFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListAsyncJobs() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AsyncJobApi.class, "listAsyncJobs", ListAsyncJobsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listAsyncJobs&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseAsyncJobsFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListAsyncJobsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(AsyncJobApi.class, "listAsyncJobs", ListAsyncJobsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ListAsyncJobsOptions.Builder.accountInDomain("adrian", "5")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listAsyncJobs&listAll=true&account=adrian&domainid=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseAsyncJobsFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiLiveTest.java
deleted file mode 100644
index b072571..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiLiveTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import org.jclouds.cloudstack.domain.Capabilities;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code ConfigurationApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "ConfigurationApiLiveTest")
-public class ConfigurationApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public void testListCapabilities() throws Exception {
- Capabilities response = client.getConfigurationApi().listCapabilities();
- assert null != response;
- assert null != response.getCloudStackVersion();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiTest.java
deleted file mode 100644
index 0d169b2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ConfigurationApiTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code ConfigurationApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "ConfigurationApiTest")
-public class ConfigurationApiTest extends BaseCloudStackApiTest<ConfigurationApi> {
-
- public void testListCapabilities() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ConfigurationApi.class, "listCapabilities");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&listAll=true&command=listCapabilities HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiLiveTest.java
deleted file mode 100644
index 7f2cee0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiLiveTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.features.GlobalAccountApiLiveTest.createTestAccount;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code DomainAccountApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "DomainAccountApiLiveTest")
-public class DomainAccountApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testEnableDisableAccount() {
- skipIfNotGlobalAdmin();
-
- Account testAccount = null;
- try {
- testAccount = createTestAccount(globalAdminClient, prefix);
-
- AsyncCreateResponse response = domainAdminClient.getAccountApi()
- .disableAccount(testAccount.getName(), testAccount.getDomainId(), false);
- assertNotNull(response);
- assertTrue(adminJobComplete.apply(response.getJobId()));
-
- AsyncJob<Account> job = domainAdminClient.getAsyncJobApi().getAsyncJob(response.getJobId());
- assertEquals(job.getResult().getState(), Account.State.DISABLED);
-
- Account updated = domainAdminClient.getAccountApi()
- .enableAccount(testAccount.getName(), testAccount.getDomainId());
- assertNotNull(updated);
- assertEquals(updated.getState(), Account.State.ENABLED);
-
- } finally {
- if (testAccount != null) {
- globalAdminClient.getAccountApi().deleteAccount(testAccount.getId());
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiTest.java
deleted file mode 100644
index afab941..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainAccountApiTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code DomainAccountApi}
- */
-@Test(groups = "unit", testName = "DomainAccountApiTest")
-public class DomainAccountApiTest extends BaseCloudStackApiTest<DomainAccountApi> {
-
- public void testEnableAccount() throws Exception {
- Invokable<?, ?> method = method(DomainAccountApi.class, "enableAccount", String.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("goo", "2"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=enableAccount&account=goo&domainid=2 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDisableAccount() throws Exception {
- Invokable<?, ?> method = method(DomainAccountApi.class, "disableAccount", String.class, String.class, boolean.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("1", "2", true));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=disableAccount&account=1&domainid=2&lock=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiExpectTest.java
deleted file mode 100644
index 23d6824..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiExpectTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.ListDomainChildrenOptions.Builder.parentDomainId;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.Domain;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack DomainDomainApi
- */
-@Test(groups = "unit", testName = "DomainDomainApiExpectTest")
-public class DomainDomainApiExpectTest extends BaseCloudStackExpectTest<DomainDomainApi> {
-
- public void testListDomainsWhenResponseIs2xx() {
- DomainDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listDomains&listAll=true&apiKey=identity&signature=sVFaGTu0DNSTVtWy3wtRt7KTx0w%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listdomainsresponse.json"))
- .build());
-
- assertEquals(client.listDomains(),
- ImmutableSet.of(
- Domain.builder().id("1").name("ROOT").level(0).hasChild(true).build(),
- Domain.builder().id("2").name("jclouds1").level(1).parentDomainId("1")
- .parentDomainName("ROOT").hasChild(false).build()
- ));
- }
-
- public void testListDomainsWhenResponseIs404() {
- DomainDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listDomains&listAll=true&apiKey=identity&signature=sVFaGTu0DNSTVtWy3wtRt7KTx0w%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listDomains(), ImmutableSet.of());
- }
-
- public void testGetDomainWhenResponseIs2xx() {
- DomainDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listDomains&listAll=true&id=1&apiKey=identity&signature=M16YxHWKST/cIRUHvWhfWovJugU%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/getdomainresponse.json"))
- .build());
-
- assertEquals(client.getDomainById("1"),
- Domain.builder().id("1").name("ROOT").level(0).hasChild(true).build());
- }
-
- public void testGetDomainWhenResponseIs404() {
- DomainDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listDomains&listAll=true&id=1&apiKey=identity&signature=M16YxHWKST/cIRUHvWhfWovJugU%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.getDomainById("1"));
- }
-
- public void testListDomainChildrenWhenResponseIs2xx() {
- DomainDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listDomainChildren&listAll=true&id=1&isrecursive=true&apiKey=identity&signature=Jn6kFkloRvfaaivlJiHd0F5J3Jk%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listdomainchildrenresponse.json"))
- .build());
-
- assertEquals(client.listDomainChildren(parentDomainId("1").isRecursive(true)),
- ImmutableSet.of(
- Domain.builder().id("2").name("jclouds1").level(1).parentDomainId("1")
- .parentDomainName("ROOT").hasChild(false).build(),
- Domain.builder().id("3").name("jclouds2").level(1).parentDomainId("1")
- .parentDomainName("ROOT").hasChild(false).build()
- ));
- }
-
- public void testListDomainChildrenWhenResponseIs404() {
- DomainDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listDomainChildren&listAll=true&id=1&isrecursive=true&apiKey=identity&" +
- "signature=Jn6kFkloRvfaaivlJiHd0F5J3Jk%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listDomainChildren(parentDomainId("1").isRecursive(true)), ImmutableSet.of());
- }
-
- @Override
- protected DomainDomainApi clientFrom(CloudStackContext context) {
- return context.getDomainApi().getDomainClient();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiLiveTest.java
deleted file mode 100644
index aa9ed44..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainDomainApiLiveTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Sets.newHashSet;
-import static org.jclouds.cloudstack.options.ListDomainChildrenOptions.Builder.parentDomainId;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Domain;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-/**
- * Tests behavior of {@code DomainDomainApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "DomainDomainApiLiveTest")
-public class DomainDomainApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testListDomains() {
- skipIfNotDomainAdmin();
-
- Set<Domain> domains = domainAdminClient.getDomainClient().listDomains();
- for (Domain candidate : domains) {
- checkDomain(candidate);
- }
- }
-
- private void checkDomain(Domain domain) {
- assertNotNull(domain.getId());
- if (domain.getLevel() == 0 /* global ROOT */) {
- assertNull(domain.getParentDomainName());
- assertNull(domain.getParentDomainId());
- } else {
- assertNotNull(domain.getParentDomainName());
- assertNotNull(domain.getParentDomainId());
- }
- }
-
- @Test
- public void testListDomainChildren() {
- skipIfNotDomainAdmin();
-
- Set<Domain> domains = domainAdminClient.getDomainClient().listDomains();
- Domain root = findRootOfVisibleTree(domains);
- if (domains.size() > 1) {
- assertTrue(root.hasChild());
- }
-
- Set<Domain> children = domainAdminClient.getDomainClient()
- .listDomainChildren(parentDomainId(root.getId()).isRecursive(true));
- assertEquals(domains.size() - 1, children.size());
- assertTrue(Sets.difference(domains, children).contains(root));
- }
-
- private Domain findRootOfVisibleTree(Set<Domain> domains) {
- final Set<String> names = newHashSet(Iterables.transform(domains,
- new Function<Domain, String>() {
- @Override
- public String apply(Domain domain) {
- return domain.getName();
- }
- }));
-
- for (Domain candidate : domains) {
- if (candidate.getParentDomainId() == null ||
- !names.contains(candidate.getParentDomainName())) {
- return candidate;
- }
- }
- throw new NoSuchElementException("No root node found in this tree");
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiLiveTest.java
deleted file mode 100644
index e616a88..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiLiveTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code DomainLimitApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "DomainLimitApiLiveTest")
-public class DomainLimitApiLiveTest extends BaseCloudStackApiLiveTest {
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiTest.java
deleted file mode 100644
index 26cba6f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainLimitApiTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.cloudstack.domain.ResourceLimit;
-import org.jclouds.cloudstack.domain.ResourceLimit.ResourceType;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code DomainLimitApi}
- */
-@Test(groups = "unit", testName = "DomainLimitApiTest")
-public class DomainLimitApiTest extends BaseCloudStackApiTest<DomainLimitApi> {
-
- public void testUpdateResourceLimit() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(DomainLimitApi.class, "updateResourceLimit", ResourceLimit.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ResourceLimit.builder().resourceType(ResourceType.SNAPSHOT).account("foo").domainId("100").max(101).build()));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateResourceLimit&resourcetype=3&account=foo&domainid=100&max=101 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainUserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainUserApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainUserApiLiveTest.java
deleted file mode 100644
index 2deb76c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/DomainUserApiLiveTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.features.GlobalAccountApiLiveTest.createTestAccount;
-import static org.jclouds.cloudstack.features.GlobalUserApiLiveTest.createTestUser;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code DomainUserApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "DomainUserApiLiveTest")
-public class DomainUserApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testListUsers() {
- skipIfNotDomainAdmin();
-
- Set<User> users = domainAdminClient.getUserClient().listUsers();
-
- assert !users.isEmpty();
- assert users.contains(user); // contains the current user
-
- for (User user : users) {
- checkUser(user);
- }
- }
-
- private void checkUser(User user) {
- assert user.getId() != null;
- assert user.getAccount() != null;
- assert user.getDomain() != null;
- }
-
- @Test
- public void testEnableDisableUser() {
- skipIfNotGlobalAdmin();
-
- Account testAccount = null;
- User testUser = null;
- try {
- testAccount = createTestAccount(globalAdminClient, prefix);
- testUser = createTestUser(globalAdminClient, testAccount, prefix);
-
- AsyncCreateResponse response = domainAdminClient.getUserClient().disableUser(testUser.getId());
- assertNotNull(response);
- assertTrue(adminJobComplete.apply(response.getJobId()));
-
- AsyncJob<User> job = domainAdminClient.getAsyncJobApi().getAsyncJob(response.getJobId());
- assertNotNull(job);
- assertEquals(job.getResult().getState(), User.State.DISABLED);
-
- User updated = domainAdminClient.getUserClient().enableUser(testUser.getId());
- assertNotNull(updated);
- assertEquals(updated.getState(), User.State.ENABLED);
-
- } finally {
- if (testUser != null) {
- globalAdminClient.getUserClient().deleteUser(testUser.getId());
- }
- if (testAccount != null) {
- globalAdminClient.getAccountApi().deleteAccount(testAccount.getId());
- }
- }
- }
-}
[26/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiLiveTest.java
deleted file mode 100644
index 2f4cdef..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiLiveTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Event;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code EventApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "EventApiLiveTest")
-public class EventApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public void testlistEventTypes() throws Exception {
- final Set<String> response = client.getEventApi().listEventTypes();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (String type : response) {
- checkEventType(type);
- }
- }
-
- public void testlistEvents() throws Exception {
- final Set<Event> response = client.getEventApi().listEvents();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (Event event : response) {
- checkEvent(event);
- }
- }
-
- private void checkEvent(Event event) {
- assert event.getAccount() != null : event;
- assert event.getCreated() != null : event;
- assert event.getDescription() != null : event;
- assert event.getDomain() != null : event;
- assert event.getId() != null : event;
- assert event.getLevel() != null : event;
- assert event.getState() != null : event;
- assert event.getType() != null : event;
- assert event.getUsername() != null : event;
- }
-
- protected void checkEventType(String eventType) {
- assert eventType != null : eventType;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiTest.java
deleted file mode 100644
index 3f70d9d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/EventApiTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.functions.ParseEventTypesFromHttpResponse;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListEventsOptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code EventApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "EventApiTest")
-public class EventApiTest extends BaseCloudStackApiTest<EventApi> {
-
- public void testListEventTypes() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(EventApi.class, "listEventTypes");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&listAll=true&command=listEventTypes HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseEventTypesFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListEvents() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(EventApi.class, "listEvents", ListEventsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&listAll=true&command=listEvents HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testEventsListOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(EventApi.class, "listEvents", ListEventsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListEventsOptions.Builder.account("jclouds")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&listAll=true&command=listEvents&account=jclouds HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java
deleted file mode 100644
index fdc2544..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.net.URI;
-import java.util.Set;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.domain.PortForwardingRule;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack FirewallApi
- */
-@Test(groups = "unit", testName = "FirewallApiExpectTest")
-public class FirewallApiExpectTest extends BaseCloudStackExpectTest<FirewallApi> {
-
- public void testListFirewallRulesWhenResponseIs2xx() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listFirewallRules&listAll=true&" +
- "apiKey=identity&signature=9%2BtdTXe2uYLzAexPNgrMy5Tq8hE%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listfirewallrulesresponse.json"))
- .build());
-
- Set<String> CIDRs = ImmutableSet.of("0.0.0.0/0");
- assertEquals(client.listFirewallRules(),
- ImmutableSet.of(
- FirewallRule.builder().id("2017").protocol(FirewallRule.Protocol.TCP).startPort(30)
- .endPort(35).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE)
- .CIDRs(CIDRs).build(),
- FirewallRule.builder().id("2016").protocol(FirewallRule.Protocol.TCP).startPort(22)
- .endPort(22).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE)
- .CIDRs(CIDRs).build(),
- FirewallRule.builder().id("10").protocol(FirewallRule.Protocol.TCP).startPort(22)
- .endPort(22).ipAddressId("8").ipAddress("10.27.27.57").state(FirewallRule.State.ACTIVE)
- .CIDRs(CIDRs).build()
- ));
- }
-
- public void testListFirewallRulesWhenReponseIs404() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listFirewallRules&listAll=true&" +
- "apiKey=identity&signature=9%2BtdTXe2uYLzAexPNgrMy5Tq8hE%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listFirewallRules(), ImmutableSet.of());
- }
-
- public void testGetFirewallRuleWhenResponseIs2xx() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listFirewallRules&listAll=true&" +
- "id=2017&apiKey=identity&signature=6coh9Qdwla94TN1Dl008WlhzZUY%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/getfirewallrulesresponse.json"))
- .build());
-
- assertEquals(client.getFirewallRule("2017"),
- FirewallRule.builder().id("2017").protocol(FirewallRule.Protocol.TCP).startPort(30)
- .endPort(35).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE)
- .CIDRs(ImmutableSet.of("0.0.0.0/0")).build()
- );
- }
-
- public void testGetFirewallRuleWhenResponseIs404() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listFirewallRules&listAll=true&" +
- "id=4&apiKey=identity&signature=rYd8gr7ptdSZlIehBEMQEKsm07Q%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.getFirewallRule("4"));
- }
-
- public void testCreateFirewallRuleForIpAndProtocol() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=createFirewallRule&" +
- "ipaddressid=2&protocol=TCP&apiKey=identity&signature=d0MZ/yhQPAaV%2BYQmfZsQtQL2C28%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createfirewallrulesresponse.json"))
- .build());
-
- AsyncCreateResponse response = client.createFirewallRuleForIpAndProtocol("2", FirewallRule.Protocol.TCP);
- assertEquals(response.getJobId(), "2036");
- assertEquals(response.getId(), "2017");
- }
-
- public void testDeleteFirewallRule() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=deleteFirewallRule&id=2015&apiKey=identity&signature=/T5FAO2yGPctaPmg7TEtIEFW3EU%3D"))
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/deletefirewallrulesresponse.json"))
- .build());
-
- client.deleteFirewallRule("2015");
- }
-
- public void testListPortForwardingRulesWhenResponseIs2xx() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listPortForwardingRules&listAll=true&apiKey=identity&signature=8SXGJZWdcJfVz4V90Pyod12x9dM%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listportforwardingrulesresponse.json"))
- .build());
-
- Set<String> cidrs = ImmutableSet.of("0.0.0.0/1", "128.0.0.0/1");
-
- assertEquals(client.listPortForwardingRules(),
- ImmutableSet.<PortForwardingRule>of(
- PortForwardingRule.builder().id("15").privatePort(22).protocol(PortForwardingRule.Protocol.TCP)
- .publicPort(2022).virtualMachineId("3").virtualMachineName("i-3-3-VM").IPAddressId("3")
- .IPAddress("72.52.126.32").state(PortForwardingRule.State.ACTIVE).CIDRs(cidrs).build(),
- PortForwardingRule.builder().id("18").privatePort(22).protocol(PortForwardingRule.Protocol.TCP)
- .publicPort(22).virtualMachineId("89").virtualMachineName("i-3-89-VM").IPAddressId("34")
- .IPAddress("72.52.126.63").state(PortForwardingRule.State.ACTIVE).build())
- );
- }
-
- public void testListPortForwardingRulesWhenReponseIs404() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listPortForwardingRules&listAll=true&apiKey=identity&signature=8SXGJZWdcJfVz4V90Pyod12x9dM%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listPortForwardingRules(), ImmutableSet.of());
- }
-
- public void testGetPortForwardingRuleWhenResponseIs2xx() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listPortForwardingRules&listAll=true&id=15&apiKey=identity&signature=JL63p6cJzbb9vaffeV4u60IGlWE%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/getportforwardingrulesresponse.json"))
- .build());
-
- Set<String> cidrs = ImmutableSet.of("0.0.0.0/1", "128.0.0.0/1");
-
- assertEquals(client.getPortForwardingRule("15"),
- PortForwardingRule.builder().id("15").privatePort(22).protocol(PortForwardingRule.Protocol.TCP)
- .publicPort(2022).virtualMachineId("3").virtualMachineName("i-3-3-VM").IPAddressId("3")
- .IPAddress("72.52.126.32").state(PortForwardingRule.State.ACTIVE).CIDRs(cidrs).build());
- }
-
- public void testGetPortForwardingRuleWhenResponseIs404() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listPortForwardingRules&listAll=true&id=4&apiKey=identity&signature=4blbBVn2%2BZfF8HwoglbmtYoDAjs%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.getPortForwardingRule("4"));
- }
-
- public void testCreatePortForwardingRuleForVirtualMachine() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createPortForwardingRule")
- .addQueryParam("ipaddressid", "2")
- .addQueryParam("protocol", "tcp")
- .addQueryParam("publicport", "22")
- .addQueryParam("virtualmachineid", "1234")
- .addQueryParam("privateport", "22")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "84dtGzQp0G6k3z3Gkc3F/HBNS2Y%3D")
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createportforwardingrulesresponse.json"))
- .build());
-
- AsyncCreateResponse response = client.createPortForwardingRuleForVirtualMachine(
- "2", PortForwardingRule.Protocol.TCP, 22, "1234", 22);
- assertEquals(response.getJobId(), "2035");
- assertEquals(response.getId(), "2015");
- }
-
- public void testDeletePortForwardingRule() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=deletePortForwardingRule&id=2015&apiKey=identity&signature=2UE7KB3wm5ocmR%2BGMNFKPKfiDo8%3D"))
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/deleteportforwardingrulesresponse.json"))
- .build());
-
- client.deletePortForwardingRule("2015");
- }
-
- public void testListEgressFirewallRulesWhenResponseIs2xx() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listEgressFirewallRules&listAll=true&" +
- "apiKey=identity&signature=j3OpRXs7mEwVKs9KIb4ncRKVO9A%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listegressfirewallrulesresponse.json"))
- .build());
-
- Set<String> CIDRs = ImmutableSet.of("0.0.0.0/0");
- assertEquals(client.listEgressFirewallRules(),
- ImmutableSet.of(
- FirewallRule.builder().id("2017").protocol(FirewallRule.Protocol.TCP).startPort(30)
- .endPort(35).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE)
- .CIDRs(CIDRs).build(),
- FirewallRule.builder().id("2016").protocol(FirewallRule.Protocol.TCP).startPort(22)
- .endPort(22).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE)
- .CIDRs(CIDRs).build(),
- FirewallRule.builder().id("10").protocol(FirewallRule.Protocol.TCP).startPort(22)
- .endPort(22).ipAddressId("8").ipAddress("10.27.27.57").state(FirewallRule.State.ACTIVE)
- .CIDRs(CIDRs).build()
- ));
- }
-
- public void testListEgressFirewallRulesWhenReponseIs404() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listEgressFirewallRules&listAll=true&" +
- "apiKey=identity&signature=j3OpRXs7mEwVKs9KIb4ncRKVO9A%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listEgressFirewallRules(), ImmutableSet.of());
- }
-
- public void testGetEgressFirewallRuleWhenResponseIs2xx() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listEgressFirewallRules&listAll=true&" +
- "id=2017&apiKey=identity&signature=Hi1K5VA3yd3mk0AmgJ2F6y%2BVzMo%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/getegressfirewallrulesresponse.json"))
- .build());
-
- assertEquals(client.getEgressFirewallRule("2017"),
- FirewallRule.builder().id("2017").protocol(FirewallRule.Protocol.TCP).startPort(30)
- .endPort(35).ipAddressId("2").ipAddress("10.27.27.51").state(FirewallRule.State.ACTIVE)
- .CIDRs(ImmutableSet.of("0.0.0.0/0")).build()
- );
- }
-
- public void testGetEgressFirewallRuleWhenResponseIs404() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listEgressFirewallRules&listAll=true&" +
- "id=4&apiKey=identity&signature=dzb5azKxXZsuGrNRJbRHfna7FMo%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.getEgressFirewallRule("4"));
- }
-
- public void testCreateEgressFirewallRuleForNetworkAndProtocol() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=createEgressFirewallRule&" +
- "networkid=2&protocol=TCP&apiKey=identity&signature=I/OJEqiLp8ZHlZskKUiT5uTRE3M%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createegressfirewallrulesresponse.json"))
- .build());
-
- AsyncCreateResponse response = client.createEgressFirewallRuleForNetworkAndProtocol("2", FirewallRule.Protocol.TCP);
- assertEquals(response.getJobId(), "2036");
- assertEquals(response.getId(), "2017");
- }
-
- public void testDeleteEgressFirewallRule() {
- FirewallApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=deleteEgressFirewallRule&id=2015&apiKey=identity&signature=S119WNmamKwc5d9qvvkIJznXytg%3D"))
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/deleteegressfirewallrulesresponse.json"))
- .build());
-
- client.deleteEgressFirewallRule("2015");
- }
- @Override
- protected FirewallApi clientFrom(CloudStackContext context) {
- return context.getApi().getFirewallApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiLiveTest.java
deleted file mode 100644
index a96fad8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiLiveTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.find;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsPortForwarding;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.PortForwardingRule;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.CreateFirewallRuleOptions;
-import org.jclouds.logging.Logger;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.net.HostAndPort;
-
-/**
- * Tests behavior of {@code FirewallApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "FirewallApiLiveTest")
-public class FirewallApiLiveTest extends BaseCloudStackApiLiveTest {
- private PublicIPAddress ip = null;
- private VirtualMachine vm;
-
- private FirewallRule firewallRule;
- private FirewallRule egressFirewallRule;
- private PortForwardingRule portForwardingRule;
-
- private Network network;
- private boolean networksDisabled;
-
- @BeforeGroups(groups = "live")
- public void setupContext() {
- super.setupContext();
- prefix += "rule";
- try {
- network = find(client.getNetworkApi().listNetworks(), Predicates.and(supportsPortForwarding(),
- new Predicate<Network>() {
- @Override
- public boolean apply(Network network) {
- return network.isDefault()
- && !network.isSecurityGroupEnabled()
- && network.getAccount().equals(user.getAccount());
- }
- }));
-
- String defaultTemplate = template != null ? template.getImageId() : null;
-
- vm = VirtualMachineApiLiveTest.createVirtualMachineInNetwork(network,
- defaultTemplateOrPreferredInZone(defaultTemplate, client, network.getZoneId()),
- client, jobComplete, virtualMachineRunning);
-
- if (vm.getPassword() != null && !loginCredentials.getOptionalPassword().isPresent())
- loginCredentials = loginCredentials.toBuilder().password(vm.getPassword()).build();
-
- } catch (NoSuchElementException e) {
- networksDisabled = true;
- }
- }
-
- public void testCreatePortForwardingRule() throws Exception {
- if (networksDisabled)
- return;
- while (portForwardingRule == null) {
- ip = reuseOrAssociate.apply(network);
- try {
- AsyncCreateResponse job = client.getFirewallApi()
- .createPortForwardingRuleForVirtualMachine(ip.getId(), PortForwardingRule.Protocol.TCP, 22, vm.getId(), 22);
- assertTrue(jobComplete.apply(job.getJobId()));
- portForwardingRule = client.getFirewallApi().getPortForwardingRule(job.getId());
-
- } catch (IllegalStateException e) {
- Logger.CONSOLE.error("Failed while trying to allocate ip: " + e);
- // very likely an ip conflict, so retry;
- }
- }
-
- assertEquals(portForwardingRule.getIPAddressId(), ip.getId());
- assertEquals(portForwardingRule.getVirtualMachineId(), vm.getId());
- assertEquals(portForwardingRule.getPublicPort(), 22);
- assertEquals(portForwardingRule.getProtocol(), PortForwardingRule.Protocol.TCP);
-
- checkPortForwardingRule(portForwardingRule);
- checkSSH(HostAndPort.fromParts(ip.getIPAddress(), 22));
- }
-
- @Test(dependsOnMethods = "testCreatePortForwardingRule")
- public void testListPortForwardingRules() throws Exception {
- Set<PortForwardingRule> response = client.getFirewallApi().listPortForwardingRules();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (final PortForwardingRule rule : response) {
- checkPortForwardingRule(rule);
- }
- }
-
- @Test(dependsOnMethods = "testCreatePortForwardingRule")
- public void testCreateFirewallRule() {
- if (networksDisabled)
- return;
-
- AsyncCreateResponse job = client.getFirewallApi().createFirewallRuleForIpAndProtocol(
- ip.getId(), FirewallRule.Protocol.TCP, CreateFirewallRuleOptions.Builder.startPort(30).endPort(35));
- assertTrue(jobComplete.apply(job.getJobId()));
- firewallRule = client.getFirewallApi().getFirewallRule(job.getId());
-
- assertEquals(firewallRule.getStartPort(), 30);
- assertEquals(firewallRule.getEndPort(), 35);
- assertEquals(firewallRule.getProtocol(), FirewallRule.Protocol.TCP);
-
- checkFirewallRule(firewallRule);
- }
-
- @Test(dependsOnMethods = "testCreateFirewallRule")
- public void testListFirewallRules() {
- Set<FirewallRule> rules = client.getFirewallApi().listFirewallRules();
-
- assert rules != null;
- assertTrue(!rules.isEmpty());
-
- for (FirewallRule rule : rules) {
- checkFirewallRule(rule);
- }
- }
-
- @Test(dependsOnMethods = "testCreatePortForwardingRule")
- public void testCreateEgressFirewallRule() {
- if (networksDisabled)
- return;
-
- AsyncCreateResponse job = client.getFirewallApi().createEgressFirewallRuleForNetworkAndProtocol(
- network.getId(), FirewallRule.Protocol.TCP, CreateFirewallRuleOptions.Builder.startPort(30).endPort(35));
- assertTrue(jobComplete.apply(job.getJobId()));
- egressFirewallRule = client.getFirewallApi().getEgressFirewallRule(job.getId());
-
- assertEquals(egressFirewallRule.getStartPort(), 30);
- assertEquals(egressFirewallRule.getEndPort(), 35);
- assertEquals(egressFirewallRule.getProtocol(), FirewallRule.Protocol.TCP);
-
- checkEgressFirewallRule(egressFirewallRule);
- }
-
- @Test(dependsOnMethods = "testCreateEgressFirewallRule")
- public void testListEgressFirewallRules() {
- Set<FirewallRule> rules = client.getFirewallApi().listEgressFirewallRules();
-
- assert rules != null;
- assertTrue(!rules.isEmpty());
-
- for (FirewallRule rule : rules) {
- checkEgressFirewallRule(rule);
- }
- }
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (firewallRule != null) {
- client.getFirewallApi().deleteFirewallRule(firewallRule.getId());
- }
- if (egressFirewallRule != null) {
- client.getFirewallApi().deleteEgressFirewallRule(egressFirewallRule.getId());
- }
- if (portForwardingRule != null) {
- client.getFirewallApi().deletePortForwardingRule(portForwardingRule.getId());
- }
- if (vm != null) {
- jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vm.getId()));
- }
- if (ip != null) {
- client.getAddressApi().disassociateIPAddress(ip.getId());
- }
- super.tearDownContext();
- }
-
- protected void checkFirewallRule(FirewallRule rule) {
- assertEquals(rule,
- client.getFirewallApi().getFirewallRule(rule.getId()));
- assert rule.getId() != null : rule;
- assert rule.getStartPort() > 0 : rule;
- assert rule.getEndPort() >= rule.getStartPort() : rule;
- assert rule.getProtocol() != null;
- }
-
- protected void checkEgressFirewallRule(FirewallRule rule) {
- assertEquals(rule,
- client.getFirewallApi().getEgressFirewallRule(rule.getId()));
- assert rule.getId() != null : rule;
- assert rule.getStartPort() > 0 : rule;
- assert rule.getEndPort() >= rule.getStartPort() : rule;
- assert rule.getProtocol() != null;
- }
-
- protected void checkPortForwardingRule(PortForwardingRule rule) {
- assertEquals(rule,
- client.getFirewallApi().getPortForwardingRule(rule.getId()));
- assert rule.getId() != null : rule;
- assert rule.getIPAddress() != null : rule;
- assert rule.getIPAddressId() != null : rule;
- assert rule.getPrivatePort() > 0 : rule;
- assert rule.getProtocol() != null : rule;
- assert rule.getPublicPort() > 0 : rule;
- assert rule.getState() != null : rule;
- assert rule.getVirtualMachineId() != null : rule;
- assert rule.getVirtualMachineName() != null : rule;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiTest.java
deleted file mode 100644
index 229e390..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/FirewallApiTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.PortForwardingRule;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListPortForwardingRulesOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code FirewallApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "FirewallApiTest")
-public class FirewallApiTest extends BaseCloudStackApiTest<FirewallApi> {
- public void testListPortForwardingRules() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(FirewallApi.class, "listPortForwardingRules",
- ListPortForwardingRulesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listPortForwardingRules&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListPortForwardingRulesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(FirewallApi.class, "listPortForwardingRules",
- ListPortForwardingRulesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListPortForwardingRulesOptions.Builder.ipAddressId("3")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listPortForwardingRules&listAll=true&ipaddressid=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testCreatePortForwardingRuleForVirtualMachine() throws SecurityException, NoSuchMethodException,
- IOException {
- Invokable<?, ?> method = method(FirewallApi.class, "createPortForwardingRuleForVirtualMachine", String.class,
- PortForwardingRule.Protocol.class, int.class, String.class, int.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("6", PortForwardingRule.Protocol.TCP, 22, "7", 22));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=createPortForwardingRule&ipaddressid=6&protocol=tcp&publicport=22&virtualmachineid=7&privateport=22 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDeletePortForwardingRule() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(FirewallApi.class, "deletePortForwardingRule", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deletePortForwardingRule&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiLiveTest.java
deleted file mode 100644
index d965fd6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiLiveTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.hash.Hashing.md5;
-import static com.google.common.io.BaseEncoding.base16;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.cloudstack.CloudStackGlobalApi;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code GlobalAccountApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalAccountApiLiveTest")
-public class GlobalAccountApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public static Account createTestAccount(CloudStackGlobalApi client, String prefix) {
- return client.getAccountApi().createAccount(prefix + "-account", Account.Type.USER, "dummy@example.com",
- "First", "Last", base16().lowerCase().encode(md5().hashString("password", UTF_8).asBytes()));
- }
-
- @Test
- public void testCreateAndRemoveAccount() {
- skipIfNotGlobalAdmin();
-
- Account account = null;
- try {
- account = createTestAccount(globalAdminClient, prefix);
-
- assertNotNull(account);
- assertEquals(account.getName(), prefix + "-account");
- assertEquals(account.getType(), Account.Type.USER);
-
- Account updated = globalAdminClient.getAccountApi().updateAccount(
- account.getName(), account.getDomainId(), prefix + "-account-2");
-
- assertNotNull(updated);
- assertEquals(updated.getName(), prefix + "-account-2");
-
- } finally {
- if (account != null) {
- globalAdminClient.getAccountApi().deleteAccount(account.getId());
- }
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiTest.java
deleted file mode 100644
index ea176a1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAccountApiTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateAccountOptions;
-import org.jclouds.cloudstack.options.UpdateAccountOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GlobalAccountApi}
- */
-@Test(groups = "unit", testName = "GlobalAccountApiTest")
-public class GlobalAccountApiTest extends BaseCloudStackApiTest<GlobalAccountApi> {
-
- HttpRequest create = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createAccount")
- .addQueryParam("username", "user")
- .addQueryParam("accounttype", "0")
- .addQueryParam("email", "email@example.com")
- .addQueryParam("firstname", "FirstName")
- .addQueryParam("lastname", "LastName")
- .addQueryParam("password", "hashed-password")
- .build();
-
- public void testCreateAccount() throws Exception {
- Invokable<?, ?> method = method(GlobalAccountApi.class, "createAccount", String.class, Account.Type.class,
- String.class, String.class, String.class, String.class, CreateAccountOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("user", Account.Type.USER, "email@example.com",
- "FirstName", "LastName", "hashed-password"));
-
- assertRequestLineEquals(httpRequest, create.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest update = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "updateAccount")
- .addQueryParam("account", "account")
- .addQueryParam("domainid", "42")
- .addQueryParam("newname", "new-account-name")
- .build();
-
- public void testUpdateAccount() throws Exception {
- Invokable<?, ?> method = method(GlobalAccountApi.class, "updateAccount", String.class, String.class,
- String.class, UpdateAccountOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("account", 42L, "new-account-name"));
-
- assertRequestLineEquals(httpRequest, update.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteAccount() throws Exception {
- Invokable<?, ?> method = method(GlobalAccountApi.class, "deleteAccount", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(42L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteAccount&id=42 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java
deleted file mode 100644
index 84b4602..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Alert;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code GlobalAlertsClient}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalAlertApiLiveTest")
-public class GlobalAlertApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(groups = "live", enabled = true)
- public void testListAlerts() throws Exception {
- skipIfNotGlobalAdmin();
-
- final Set<Alert> response = globalAdminClient.getAlertClient().listAlerts();
- assert null != response;
- assertTrue(response.size() >= 0);
- int count = 0;
- for (Alert alert : response) {
- assertNotNull(alert.getDescription());
- assertNotSame(alert.getId(), 0);
- assertNotNull(alert.getType());
- assertNotNull(alert.getSent());
- count++;
- }
- assertTrue(count > 0, "No alerts were returned, so I couldn't test");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiTest.java
deleted file mode 100644
index fe87440..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListAlertsOptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GlobalAlertsClient}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "GlobalAlertApiTest")
-public class GlobalAlertApiTest extends BaseCloudStackApiTest<GlobalAlertApi> {
-
- public void testListAlerts() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GlobalAlertApi.class, "listAlerts", ListAlertsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listAlerts&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListAlertsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GlobalAlertApi.class, "listAlerts", ListAlertsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListAlertsOptions.Builder.id("42").keyword("jclouds").type("TEMPLATE")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listAlerts&listAll=true&id=42&keyword=jclouds&type=TEMPLATE HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiLiveTest.java
deleted file mode 100644
index 5207a8f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiLiveTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Capacity;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code GlobalCapacityApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalCapacityApiLiveTest")
-public class GlobalCapacityApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(groups = "live", enabled = true)
- public void testListCapacity() throws Exception {
- skipIfNotGlobalAdmin();
-
- final Set<Capacity> response = globalAdminClient.getCapacityClient().listCapacity();
- assertNotNull(response);
- assertNotEquals(0, response.size());
- int count = 0;
- for (Capacity capacity : response) {
- assertTrue(capacity.getCapacityTotal() >= 0);
- assertTrue(capacity.getCapacityUsed() >= 0);
- assertTrue(capacity.getPercentUsed() >= 0);
- assertNotEquals(Capacity.Type.UNRECOGNIZED, capacity.getType());
- assertNotNull(capacity.getZoneName());
- count++;
- }
- assertTrue(count > 0, "No capacities were returned, so I couldn't test");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiTest.java
deleted file mode 100644
index 8ca53d4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityApiTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Capacity;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListCapacityOptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GlobalCapacityApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "GlobalCapacityApiTest")
-public class GlobalCapacityApiTest extends BaseCloudStackApiTest<GlobalCapacityApi> {
-
- public void testListCapacity() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GlobalCapacityApi.class, "listCapacity", ListCapacityOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listCapacity&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListCapacityOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GlobalCapacityApi.class, "listCapacity", ListCapacityOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListCapacityOptions.Builder.hostId("3").keyword("fred").podId("4").type(Capacity.Type.CPU_ALLOCATED_MHZ).zoneId("6")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listCapacity&listAll=true&hostid=3&keyword=fred&podid=4&type=1&zoneid=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiExpectTest.java
deleted file mode 100644
index 71830ea..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiExpectTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.ConfigurationEntry;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack GlobalConfigurationApi
- */
-@Test(groups = "unit", testName = "GlobalConfigurationApiExpectTest")
-public class GlobalConfigurationApiExpectTest extends BaseCloudStackExpectTest<GlobalConfigurationApi> {
-
- @Test
- public void testListConfigurationEntriesWhenResponseIs2xx() {
- GlobalConfigurationApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listConfigurations&listAll=true&apiKey=identity&signature=%2BJ9mTuw%2BZXaumzMAJAXgZQaO2cc%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listconfigurationsresponse.json"))
- .build());
-
- assertEquals(client.listConfigurationEntries(),
- ImmutableSet.of(
- ConfigurationEntry.builder().category("Advanced").name("account.cleanup.interval").value("86400")
- .description("The interval (in seconds) between cleanup for removed accounts").build(),
- ConfigurationEntry.builder().category("Advanced").name("agent.lb.enabled").value("true")
- .description("If agent load balancing enabled in cluster setup").build()
- ));
- }
-
- @Test
- public void testListConfigurationEntriesEmptyOn404() {
- GlobalConfigurationApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listConfigurations&listAll=true&apiKey=identity&signature=%2BJ9mTuw%2BZXaumzMAJAXgZQaO2cc%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listConfigurationEntries(), ImmutableSet.of());
- }
-
- @Test
- public void testUpdateConfigurationEntryWhenResponseIs2xx() {
- GlobalConfigurationApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=updateConfiguration&name=expunge.delay&value=11&" +
- "apiKey=identity&signature=I2yG35EhfgIXYObeLfU3cvf%2BPeE%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/updateconfigurationsresponse.json"))
- .build());
-
- assertEquals(client.updateConfigurationEntry("expunge.delay", "11"),
- ConfigurationEntry.builder().category("Advanced").name("expunge.delay").value("11")
- .description("Determines how long (in seconds) to wait before actually expunging " +
- "destroyed vm. The default value = the default value of expunge.interval").build()
- );
- }
-
- @Test
- public void testUpdateConfigurationEntryNullOn404() {
- GlobalConfigurationApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=updateConfiguration&name=expunge.delay&value=11&" +
- "apiKey=identity&signature=I2yG35EhfgIXYObeLfU3cvf%2BPeE%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.updateConfigurationEntry("expunge.delay", "11"));
- }
-
- @Override
- protected GlobalConfigurationApi clientFrom(CloudStackContext context) {
- return context.getGlobalApi().getConfigurationApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiLiveTest.java
deleted file mode 100644
index dce9614..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationApiLiveTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.jclouds.cloudstack.options.ListConfigurationEntriesOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ConfigurationEntry;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-import org.testng.collections.Sets;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code GlobalConfigurationApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalConfigurationApiLiveTest")
-public class GlobalConfigurationApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testListConfigurationEntries() {
- skipIfNotGlobalAdmin();
-
- Set<ConfigurationEntry> entries = globalAdminClient
- .getConfigurationApi().listConfigurationEntries();
-
- Set<String> categories = Sets.newHashSet();
- for (ConfigurationEntry entry : entries) {
- checkConfigurationEntry(entry);
- categories.add(entry.getCategory());
- }
-
- assert categories.containsAll(ImmutableSet.<Object>of("Network", "Advanced",
- "Storage", "Usage", "Snapshots", "Account Defaults", "Console Proxy", "Alert"));
- }
-
- @Test
- public void testUpdateConfigurationEntry() {
- skipIfNotGlobalAdmin();
-
- Set<ConfigurationEntry> entries = globalAdminClient
- .getConfigurationApi().listConfigurationEntries();
-
- long expungeDelay = Long.parseLong(getValueByName(entries, "expunge.delay"));
- assert expungeDelay > 0;
-
- globalAdminClient.getConfigurationApi()
- .updateConfigurationEntry("expunge.delay", "" + (expungeDelay + 1));
-
- long newDelay = Long.parseLong(getOnlyElement(globalAdminClient.getConfigurationApi()
- .listConfigurationEntries(name("expunge.delay"))).getValue());
- assertEquals(newDelay, expungeDelay + 1);
-
- globalAdminClient.getConfigurationApi()
- .updateConfigurationEntry("expunge.delay", "" + expungeDelay);
- }
-
- private void checkConfigurationEntry(ConfigurationEntry entry) {
- assertEquals(entry, getEntryByName(globalAdminClient.getConfigurationApi()
- .listConfigurationEntries(name(entry.getName())), entry.getName()));
- assert entry.getCategory() != null : entry;
- // Description apparently can be null, so ... assert entry.getDescription() != null : entry;
- assert entry.getName() != null : entry;
- }
-
- private String getValueByName(Set<ConfigurationEntry> entries, String name) {
- return getEntryByName(entries, name).getValue();
- }
-
- private ConfigurationEntry getEntryByName(Set<ConfigurationEntry> entries, final String name) {
- return Iterables.find(entries, new Predicate<ConfigurationEntry>() {
- @Override
- public boolean apply(ConfigurationEntry entry) {
- return entry != null && Objects.equal(name, entry.getName());
- }
- });
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiExpectTest.java
deleted file mode 100644
index cd79b31..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiExpectTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.UpdateDomainOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.Domain;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-/**
- * Test the CloudStack GlobalDomainApi
- */
-@Test(groups = "unit", testName = "GlobalDomainApiExpectTest")
-public class GlobalDomainApiExpectTest extends BaseCloudStackExpectTest<GlobalDomainApi> {
-
- public void testCreateDomainWhenResponseIs2xx() {
- GlobalDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=createDomain&" +
- "name=test&apiKey=identity&signature=6cxzEo7h63G0hgTTMLm4lGsSDK8%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createdomainresponse.json"))
- .build());
-
- assertEquals(client.createDomain("test"),
- Domain.builder().id("10").name("test").level(1).parentDomainId("1")
- .parentDomainName("ROOT").hasChild(false).build());
- }
-
- public void testCreateDomainWhenResponseIs404() {
- GlobalDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=createDomain&" +
- "name=test&apiKey=identity&signature=6cxzEo7h63G0hgTTMLm4lGsSDK8%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.createDomain("test"));
- }
-
- public void testUpdateDomainWhenResponseIs2xx() {
- GlobalDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=updateDomain&id=10&name=test-2&apiKey=identity&signature=5t1eUf2Eyf/aB6qt%2BqIj%2BmcwFIo%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/updatedomainresponse.json"))
- .build());
-
- assertEquals(client.updateDomain("10", name("test-2")),
- Domain.builder().id("10").name("test-2").level(1).parentDomainId("1")
- .parentDomainName("ROOT").hasChild(false).build());
- }
-
- public void testUpdateDomainWhenResponseIs404() {
- GlobalDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=updateDomain&id=10&name=test-2&apiKey=identity&signature=5t1eUf2Eyf/aB6qt%2BqIj%2BmcwFIo%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.updateDomain("10", name("test-2")));
- }
-
- public void testDeleteOnlyDomain() {
- GlobalDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=deleteDomain&cleanup=false&id=1&apiKey=identity&signature=/5aLbigg612t9IrZi0JZO7CyiOU%3D"))
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/deletedomainresponse.json"))
- .build());
-
- client.deleteOnlyDomain("1");
- }
-
- public void testDeleteDomainAndAttachedResources() {
- GlobalDomainApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=deleteDomain&cleanup=true&id=1&apiKey=identity&signature=grL7JStvtYUT89Jr0D8FgwMyJpU%3D"))
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/deletedomainresponse.json"))
- .build());
-
- client.deleteDomainAndAttachedResources("1");
- }
-
- @Override
- protected GlobalDomainApi clientFrom(CloudStackContext context) {
- return context.getGlobalApi().getDomainClient();
- }
-}
[13/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listasyncjobsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listasyncjobsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listasyncjobsresponse.json
deleted file mode 100644
index 26215e4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listasyncjobsresponse.json
+++ /dev/null
@@ -1,3119 +0,0 @@
-{
- "listasyncjobsresponse": {
- "count": 77,
- "asyncjobs": [{
- "jobid": 1084,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 218,
- "name": "i-3-218-VM",
- "displayname": "i-3-218-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:39:10-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "dD7jwajkh",
- "nic": [{
- "id": 250,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.195",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:39:10-0800"
- }, {
- "jobid": 1085,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 219,
- "name": "i-3-219-VM",
- "displayname": "i-3-219-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:40:33-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "eJ9zqwtsk",
- "nic": [{
- "id": 251,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.118",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:40:34-0800"
- }, {
- "jobid": 1086,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "yD3vwdcic",
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:46:23-0800"
- }, {
- "jobid": 1087,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StopVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Stopped",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:49:42-0800"
- }, {
- "jobid": 1088,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.ResetVMPasswordCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Stopped",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "fR3aipcsa",
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:50:24-0800"
- }, {
- "jobid": 1089,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StopVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Stopped",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:52:58-0800"
- }, {
- "jobid": 1090,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:53:27-0800"
- }, {
- "jobid": 1091,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.RebootVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:53:43-0800"
- }, {
- "jobid": 1092,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:54:04-0800"
- }, {
- "jobid": 1093,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:55:42-0800"
- }, {
- "jobid": 1094,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.RebootVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T08:56:59-0800"
- }, {
- "jobid": 1095,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:58:53-0800"
- }, {
- "jobid": 1096,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 220,
- "name": "i-3-220-VM",
- "displayname": "i-3-220-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:46:23-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "3.96%",
- "networkkbsread": 2,
- "networkkbswrite": 10,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 252,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.78",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:00:19-0800"
- }, {
- "jobid": 1098,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "uT4gfgmxn",
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:08:02-0800"
- }, {
- "jobid": 1099,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StopVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Stopped",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:08:20-0800"
- }, {
- "jobid": 1100,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.ResetVMPasswordCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Stopped",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "sX8mwzrwp",
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:09:02-0800"
- }, {
- "jobid": 1101,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:09:03-0800"
- }, {
- "jobid": 1102,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.RebootVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:09:19-0800"
- }, {
- "jobid": 1103,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T09:09:38-0800"
- }, {
- "jobid": 1104,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StopVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Stopping",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:11:19-0800"
- }, {
- "jobid": 1105,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 222,
- "name": "i-3-222-VM",
- "displayname": "i-3-222-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:11:33-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "kH6qvmvpz",
- "nic": [{
- "id": 254,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.249",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:11:33-0800"
- }, {
- "jobid": 1106,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.RebootVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T09:13:59-0800"
- }, {
- "jobid": 1107,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.RebootVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T09:15:09-0800"
- }, {
- "jobid": 1108,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:16:44-0800"
- }, {
- "jobid": 1109,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:21:52-0800"
- }, {
- "jobid": 1110,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.ResetVMPasswordCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 221,
- "name": "i-3-221-VM",
- "displayname": "i-3-221-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:08:02-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 253,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.133",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:22:15-0800"
- }, {
- "jobid": 1111,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "mN8ymgqtz",
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:28:23-0800"
- }, {
- "jobid": 1112,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StopVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Stopped",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:28:41-0800"
- }, {
- "jobid": 1113,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.ResetVMPasswordCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Stopped",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "pP5vkjkeu",
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:29:22-0800"
- }, {
- "jobid": 1114,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:29:23-0800"
- }, {
- "jobid": 1115,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.RebootVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:29:41-0800"
- }, {
- "jobid": 1116,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 224,
- "name": "i-3-224-VM",
- "displayname": "i-3-224-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:29:47-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "jN9jgsmcg",
- "nic": [{
- "id": 256,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.162",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:29:47-0800"
- }, {
- "jobid": 1117,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T09:30:05-0800"
- }, {
- "jobid": 1118,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StopVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Stopping",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:30:40-0800"
- }, {
- "jobid": 1119,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.RebootVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T09:31:31-0800"
- }, {
- "jobid": 1120,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:31:35-0800"
- }, {
- "jobid": 1121,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T09:37:20-0800"
- }, {
- "jobid": 1122,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.ResetVMPasswordCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Stopping",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:37:55-0800"
- }, {
- "jobid": 1123,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.ResetVMPasswordCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 223,
- "name": "i-3-223-VM",
- "displayname": "i-3-223-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T09:28:23-0800",
- "state": "Stopping",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 255,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.32",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T09:38:32-0800"
- }, {
- "jobid": 1124,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StartVMCmd",
- "jobstatus": 2,
- "jobprocstatus": 0,
- "jobresultcode": 530,
- "jobresult": {
- "errorcode": 530,
- "errortext": "Internal error executing command, please contact your system administrator"
- },
- "created": "2011-02-27T09:39:12-0800"
- }, {
- "jobid": 1126,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.AssociateIPAddrCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "ipaddress": {
- "id": 36,
- "ipaddress": "72.52.126.65",
- "allocated": "2011-02-27T10:15:06-0800",
- "zoneid": 1,
- "zonename": "San Jose 1",
- "issourcenat": false,
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "forvirtualnetwork": true,
- "isstaticnat": false,
- "associatednetworkid": 204,
- "networkid": 200,
- "state": "Allocating"
- }
- },
- "created": "2011-02-27T10:15:06-0800"
- }, {
- "jobid": 1127,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.AssociateIPAddrCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "ipaddress": {
- "id": 37,
- "ipaddress": "72.52.126.66",
- "allocated": "2011-02-27T10:15:07-0800",
- "zoneid": 1,
- "zonename": "San Jose 1",
- "issourcenat": false,
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "forvirtualnetwork": true,
- "isstaticnat": false,
- "associatednetworkid": 204,
- "networkid": 200,
- "state": "Allocating"
- }
- },
- "created": "2011-02-27T10:15:07-0800"
- }, {
- "jobid": 1128,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 225,
- "name": "i-3-225-VM",
- "displayname": "i-3-225-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T10:15:07-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "hM3yhakcf",
- "nic": [{
- "id": 257,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.199",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T10:15:07-0800"
- }, {
- "jobid": 1129,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.AssociateIPAddrCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "ipaddress": {
- "id": 39,
- "ipaddress": "72.52.126.68",
- "allocated": "2011-02-27T10:15:08-0800",
- "zoneid": 1,
- "zonename": "San Jose 1",
- "issourcenat": false,
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "forvirtualnetwork": true,
- "isstaticnat": false,
- "associatednetworkid": 204,
- "networkid": 200,
- "state": "Allocated"
- }
- },
- "created": "2011-02-27T10:15:08-0800"
- }, {
- "jobid": 1130,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 226,
- "name": "i-3-226-VM",
- "displayname": "i-3-226-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T10:15:22-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "pU6tpixty",
- "nic": [{
- "id": 258,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.165",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T10:15:22-0800"
- }, {
- "jobid": 1131,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.StopVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 225,
- "name": "i-3-225-VM",
- "displayname": "i-3-225-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T10:15:07-0800",
- "state": "Stopping",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 257,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.199",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T10:15:23-0800"
- }, {
- "jobid": 1132,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.AssociateIPAddrCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "ipaddress": {
- "id": 14,
- "ipaddress": "72.52.126.43",
- "allocated": "2011-02-27T10:15:26-0800",
- "zoneid": 1,
- "zonename": "San Jose 1",
- "issourcenat": false,
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "forvirtualnetwork": true,
- "isstaticnat": false,
- "associatednetworkid": 204,
- "networkid": 200,
- "state": "Allocated"
- }
- },
- "created": "2011-02-27T10:15:26-0800"
- }, {
- "jobid": 1133,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.CreateIpForwardingRuleCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "ipforwardingrule": {
- "id": 109,
- "protocol": "tcp",
- "virtualmachineid": 226,
- "virtualmachinename": "i-3-226-VM",
- "ipaddressid": 36,
- "ipaddress": "72.52.126.65",
- "startport": 22,
- "endport": 22,
- "state": "Active"
- }
- },
- "created": "2011-02-27T10:15:39-0800"
- }, {
- "jobid": 1134,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 227,
- "name": "i-3-227-VM",
- "displayname": "i-3-227-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T10:15:49-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "aV5iybwch",
- "nic": [{
- "id": 259,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.176",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T10:15:49-0800"
- }, {
- "jobid": 1135,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 228,
- "name": "i-3-228-VM",
- "displayname": "i-3-228-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T10:15:50-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "cN7rmnqzc",
- "nic": [{
- "id": 260,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.95",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T10:15:50-0800"
- }, {
- "jobid": 1136,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 226,
- "name": "i-3-226-VM",
- "displayname": "i-3-226-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T10:15:22-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "cpuused": "0%",
- "networkkbsread": 0,
- "networkkbswrite": 0,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "nic": [{
- "id": 258,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.165",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T10:16:00-0800"
- }, {
- "jobid": 1137,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.CreatePortForwardingRuleCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "portforwardingrule": {
- "id": 110,
- "privateport": "22",
- "protocol": "tcp",
- "publicport": "22",
- "virtualmachineid": 227,
- "virtualmachinename": "i-3-227-VM",
- "ipaddressid": 37,
- "ipaddress": "72.52.126.66",
- "state": "Active"
- }
- },
- "created": "2011-02-27T10:16:05-0800"
- }, {
- "jobid": 1138,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.AssignToLoadBalancerRuleCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "success": true
- },
- "created": "2011-02-27T10:16:34-0800"
- }, {
- "jobid": 1139,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeletePortForwardingRuleCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "success": true
- },
- "created": "2011-02-27T10:16:45-0800"
- }, {
- "jobid": 1140,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DestroyVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 227,
- "name": "i-3-227-VM",
- "displayname": "i-3-227-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T10:15:49-0800",
- "state": "Destroyed",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203
<TRUNCATED>
[31/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java
deleted file mode 100644
index fb11c3b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.Volume;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what volume
- */
-public class ListVolumesOptions extends AccountInDomainOptions {
-
- public static final ListVolumesOptions NONE = new ListVolumesOptions();
-
- /**
- * List volumes on specified host
- *
- * @param hostId hostId.
- */
- public ListVolumesOptions hostId(String hostId) {
- this.queryParameters.replaceValues("hostid", ImmutableSet.of(hostId + ""));
- return this;
- }
-
- /**
- * @param id the ID of the volume
- */
- public ListVolumesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param recursive defaults to false, but if true, lists all volumes from the parent specified by the domain id till leaves.
- */
- public ListVolumesOptions isRecursive(boolean recursive) {
- this.queryParameters.replaceValues("isrecursive", ImmutableSet.of(String.valueOf(recursive)));
- return this;
- }
-
-
- /**
- * @param keyword List by keyword
- */
- public ListVolumesOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param name the name of the disk volume
- */
- public ListVolumesOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param podId the pod id the disk volume belongs to
- */
- public ListVolumesOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
-
- }
-
- /**
- * @param type the type of the disk volume
- */
- public ListVolumesOptions type(Volume.Type type) {
- this.queryParameters.replaceValues("type", ImmutableSet.of(type .toString()));
- return this;
- }
-
- /**
- * @param virtualMachineId list volumes by id virtual machine.
- */
- public ListVolumesOptions virtualMachineId(String virtualMachineId) {
- this.queryParameters.replaceValues("virtualmachineid", ImmutableSet.of(virtualMachineId + ""));
- return this;
-
- }
-
- /**
- * @param zoneId list volumes by zoneId.
- */
- public ListVolumesOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
-
- }
-
- /**
- * @param projectId list volumes by projectId.
- */
- public ListVolumesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
-
- }
-
-
- public static class Builder {
-
- /**
- * @see ListVolumesOptions#accountInDomain
- */
- public static ListVolumesOptions accountInDomain(String account, String domain) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListVolumesOptions#domainId
- */
- public static ListVolumesOptions domainId(String id) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListVolumesOptions#hostId
- */
- public static ListVolumesOptions hostId(String id) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.hostId(id);
- }
-
- /**
- * @see ListVolumesOptions#id
- */
- public static ListVolumesOptions id(String id) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListVolumesOptions#isRecursive(boolean)
- */
- public static ListVolumesOptions isRecursive(boolean recursive) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.isRecursive(recursive);
- }
-
- /**
- * @see ListVolumesOptions#name
- */
- public static ListVolumesOptions keyword(String keyword) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListVolumesOptions#name
- */
- public static ListVolumesOptions name(String name) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.name(name);
- }
-
-
- /**
- * @see ListVolumesOptions#podId
- */
- public static ListVolumesOptions podId(String id) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.podId(id);
- }
-
- /**
- * @see ListVolumesOptions#type
- */
- public static ListVolumesOptions type(Volume.Type type) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.type(type);
- }
-
- /**
- * @see ListVolumesOptions#virtualMachineId(String)
- */
- public static ListVolumesOptions virtualMachineId(String virtualMachineId) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.virtualMachineId(virtualMachineId);
- }
-
- /**
- * @see ListVolumesOptions#zoneId
- */
- public static ListVolumesOptions zoneId(String id) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.zoneId(id);
- }
-
- /**
- * @see ListVolumesOptions#projectId(String)
- */
- public static ListVolumesOptions projectId(String id) {
- ListVolumesOptions options = new ListVolumesOptions();
- return options.projectId(id);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListVolumesOptions accountInDomain(String account, String domain) {
- return ListVolumesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListVolumesOptions domainId(String domainId) {
- return ListVolumesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java
deleted file mode 100644
index db7dfb2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what zones information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api/user/listZones.html"
- * />
- */
-public class ListZonesOptions extends BaseHttpRequestOptions {
-
- public static final ListZonesOptions NONE = new ListZonesOptions();
-
- /**
- * @param id
- * the ID of the zone
- */
- public ListZonesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param domainId
- * the ID of the domain associated with the zone
- */
- public ListZonesOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
-
- }
-
- /**
- * @param available
- * true if you want to retrieve all available Zones. False if you
- * only want to return the Zones from which you have at least one
- * VM. Default is false.
- */
- public ListZonesOptions available(boolean available) {
- this.queryParameters.replaceValues("available", ImmutableSet.of(available + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListZonesOptions#available
- */
- public static ListZonesOptions available(boolean available) {
- ListZonesOptions options = new ListZonesOptions();
- return options.available(available);
- }
-
- /**
- * @see ListZonesOptions#domainId
- */
- public static ListZonesOptions domainId(String id) {
- ListZonesOptions options = new ListZonesOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListZonesOptions#id
- */
- public static ListZonesOptions id(String id) {
- ListZonesOptions options = new ListZonesOptions();
- return options.id(id);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java
deleted file mode 100644
index 16a923f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the ISO registerISO method.
- *
- * @see org.jclouds.cloudstack.features.ISOApi#registerISO
- * @see org.jclouds.cloudstack.features.ISOApi#registerISO
- */
-public class RegisterISOOptions extends AccountInDomainOptions {
-
- public static final RegisterISOOptions NONE = new RegisterISOOptions();
-
- /**
- * @param bootable true if this ISO is bootable
- */
- public RegisterISOOptions bootable(boolean bootable) {
- this.queryParameters.replaceValues("bootable", ImmutableSet.of(bootable + ""));
- return this;
- }
-
- /**
- * @param isExtractable true if the iso or its derivatives are extractable; default is false
- */
- public RegisterISOOptions isExtractable(boolean isExtractable) {
- this.queryParameters.replaceValues("isextractable", ImmutableSet.of(isExtractable + ""));
- return this;
- }
-
- /**
- * @param isFeatured true if you want this ISO to be featured
- */
- public RegisterISOOptions isFeatured(boolean isFeatured) {
- this.queryParameters.replaceValues("isfeatured", ImmutableSet.of(isFeatured + ""));
- return this;
- }
-
- /**
- * @param isPublic true if you want to register the ISO to be publicly available to all users, false otherwise.
- */
- public RegisterISOOptions isPublic(boolean isPublic) {
- this.queryParameters.replaceValues("ispublic", ImmutableSet.of(isPublic + ""));
- return this;
- }
-
- /**
- * @param osTypeId the ID of the OS Type that best represents the OS of this ISO
- */
- public RegisterISOOptions osTypeId(String osTypeId) {
- this.queryParameters.replaceValues("ostypeid", ImmutableSet.of(osTypeId + ""));
- return this;
- }
-
- /**
- * @param projectId the project this ISO will be in.
- */
- public RegisterISOOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param account an optional account name. Must be used with domainId.
- */
- public static RegisterISOOptions accountInDomain(String account, String domainId) {
- return (RegisterISOOptions) new RegisterISOOptions().accountInDomain(account, domainId);
- }
-
- /**
- * @param bootable true if this ISO is bootable
- */
- public static RegisterISOOptions bootable(boolean bootable) {
- return new RegisterISOOptions().bootable(bootable);
- }
-
- /**
- * @param domainId an optional domainId. If the account parameter is used, domainId must also be used.
- */
- public static RegisterISOOptions domainId(String domainId) {
- return (RegisterISOOptions) new RegisterISOOptions().domainId(domainId);
- }
-
- /**
- * @param isExtractable true if the iso or its derivatives are extractable; default is false
- */
- public static RegisterISOOptions isExtractable(boolean isExtractable) {
- return new RegisterISOOptions().isExtractable(isExtractable);
- }
-
- /**
- * @param isFeatured true if you want this ISO to be featured
- */
- public static RegisterISOOptions isFeatured(boolean isFeatured) {
- return new RegisterISOOptions().isFeatured(isFeatured);
- }
-
- /**
- * @param isPublic true if you want to register the ISO to be publicly available to all users, false otherwise.
- */
- public static RegisterISOOptions isPublic(boolean isPublic) {
- return new RegisterISOOptions().isPublic(isPublic);
- }
-
- /**
- * @param osTypeId the ID of the OS Type that best represents the OS of this ISO
- */
- public static RegisterISOOptions osTypeId(String osTypeId) {
- return new RegisterISOOptions().osTypeId(osTypeId);
- }
-
- /**
- * @param projectId the project this ISO will be in.
- */
- public static RegisterISOOptions projectId(String projectId) {
- return new RegisterISOOptions().projectId(projectId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java
deleted file mode 100644
index 60462c7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a template is registered.
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.8/api/user/registerTemplate.html"
- * />
- */
-public class RegisterTemplateOptions extends AccountInDomainOptions {
-
- public static final RegisterTemplateOptions NONE = new RegisterTemplateOptions();
-
- /**
- * 32 or 64 bits support. 64 by default
- */
- public RegisterTemplateOptions bits(int bits) {
- this.queryParameters.replaceValues("bits", ImmutableSet.of(bits + ""));
- return this;
- }
-
- /**
- * the MD5 checksum value of this template
- */
- public RegisterTemplateOptions checksum(String checksum) {
- this.queryParameters.replaceValues("checksum", ImmutableSet.of(checksum));
- return this;
- }
-
- /**
- * the project for this template.
- */
- public RegisterTemplateOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- /**
- * true if the template or its derivatives are extractable; default is true
- */
- public RegisterTemplateOptions isExtractable(boolean isExtractable) {
- this.queryParameters.replaceValues("isextractable", ImmutableSet.of(isExtractable + ""));
- return this;
- }
-
- /**
- * true if this template is a featured template, false otherwise
- */
- public RegisterTemplateOptions isFeatured(boolean isFeatured) {
- this.queryParameters.replaceValues("isfeatured", ImmutableSet.of(isFeatured + ""));
- return this;
- }
-
- /**
- * true if the template is available to all accounts; default is true
- */
- public RegisterTemplateOptions isPublic(boolean isPublic) {
- this.queryParameters.replaceValues("ispublic", ImmutableSet.of(isPublic + ""));
- return this;
- }
-
- /**
- * true if the template supports the password reset feature; default is false
- */
- public RegisterTemplateOptions passwordEnabled(boolean passwordEnabled) {
- this.queryParameters.replaceValues("passwordenabled", ImmutableSet.of(passwordEnabled + ""));
- return this;
- }
-
- /**
- * true if this template requires HVM
- */
- public RegisterTemplateOptions requiresHVM(boolean requiresHVM) {
- this.queryParameters.replaceValues("requireshvm", ImmutableSet.of(requiresHVM + ""));
- return this;
- }
-
- public static class Builder {
-
- public static RegisterTemplateOptions bits(int bits) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.bits(bits);
- }
-
- public static RegisterTemplateOptions checksum(String checksum) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.checksum(checksum);
- }
-
- public static RegisterTemplateOptions projectId(String projectId) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.projectId(projectId);
- }
-
- public static RegisterTemplateOptions isExtractable(boolean isExtractable) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.isExtractable(isExtractable);
- }
-
- public static RegisterTemplateOptions isFeatured(boolean isFeatured) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.isFeatured(isFeatured);
- }
-
- public static RegisterTemplateOptions isPublic(boolean isPublic) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.isPublic(isPublic);
- }
-
- public static RegisterTemplateOptions passwordEnabled(boolean passwordEnabled) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.passwordEnabled(passwordEnabled);
- }
-
- public static RegisterTemplateOptions requiresHVM(boolean requiresHVM) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return options.requiresHVM(requiresHVM);
- }
-
- /**
- * @see AccountInDomainOptions#accountInDomain
- */
- public static RegisterTemplateOptions accountInDomain(String account, String domain) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return (RegisterTemplateOptions)options.accountInDomain(account, domain);
- }
-
- /**
- * @see AccountInDomainOptions#domainId
- */
- public static RegisterTemplateOptions domainId(String domainId) {
- RegisterTemplateOptions options = new RegisterTemplateOptions();
- return (RegisterTemplateOptions)options.domainId(domainId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/StopVirtualMachineOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/StopVirtualMachineOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/StopVirtualMachineOptions.java
deleted file mode 100644
index e716ae5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/StopVirtualMachineOptions.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for stopping virtual machines.
- *
- * @see <a
- * href="http://download.cloud.com/releases/3.0.3/api_3.0.3/root_admin/stopVirtualMachine.html"
- * />
- */
-public class StopVirtualMachineOptions extends BaseHttpRequestOptions {
-
- public static final StopVirtualMachineOptions NONE = new StopVirtualMachineOptions();
-
- /**
- * @param forced
- * Whether to force stop the virtual machine. Defaults to false.
- */
- public StopVirtualMachineOptions forced(boolean forced) {
- this.queryParameters.replaceValues("forced", ImmutableSet.of(forced + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see StopVirtualMachineOptions#forced
- */
- public static StopVirtualMachineOptions forced(boolean forced) {
- StopVirtualMachineOptions options = new StopVirtualMachineOptions();
- return options.forced(forced);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java
deleted file mode 100644
index fb29827..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Optional arguments for updating an Account
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/updateAccount.html"
- * />
- */
-public class UpdateAccountOptions extends BaseHttpRequestOptions {
-
- public static final UpdateAccountOptions NONE = new UpdateAccountOptions();
-
- /**
- * @param networkDomain
- * network domain for the account's networks
- */
- public UpdateAccountOptions networkDomain(String networkDomain) {
- this.queryParameters.replaceValues("networkdomain", ImmutableSet.<String>of(networkDomain));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see UpdateAccountOptions#networkDomain
- */
- public static UpdateAccountOptions networkDomain(String networkDomain) {
- UpdateAccountOptions options = new UpdateAccountOptions();
- return options.networkDomain(networkDomain);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java
deleted file mode 100644
index 3112120..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the GlobalHostApi.updateCluster() API call.
- */
-public class UpdateClusterOptions extends BaseHttpRequestOptions {
-
- public static final UpdateClusterOptions NONE = new UpdateClusterOptions();
-
- /**
- * @param allocationState Allocation state of this cluster for allocation of new resources
- */
- public UpdateClusterOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.<String>of(allocationState.toString()));
- return this;
- }
-
- /**
- * @param clusterName the cluster name
- */
- public UpdateClusterOptions clusterName(String clusterName) {
- this.queryParameters.replaceValues("clustername", ImmutableSet.<String>of(clusterName));
- return this;
- }
-
- /**
- * @param clusterType type of the cluster
- */
- public UpdateClusterOptions clusterType(Host.ClusterType clusterType) {
- this.queryParameters.replaceValues("clustertype", ImmutableSet.<String>of(clusterType.toString()));
- return this;
- }
-
- /**
- * @param hypervisor hypervisor type of the cluster
- */
- public UpdateClusterOptions hypervisor(String hypervisor) {
- this.queryParameters.replaceValues("hypervisor", ImmutableSet.<String>of(hypervisor));
- return this;
- }
-
- /**
- * @param managedState whether this cluster is managed by cloudstack
- */
- public UpdateClusterOptions managedState(Cluster.ManagedState managedState) {
- this.queryParameters.replaceValues("managedstate", ImmutableSet.<String>of(managedState.toString()));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param allocationState Allocation state of this cluster for allocation of new resources
- */
- public static UpdateClusterOptions allocationState(AllocationState allocationState) {
- return new UpdateClusterOptions().allocationState(allocationState);
- }
-
- /**
- * @param clusterName the cluster name
- */
- public static UpdateClusterOptions clusterName(String clusterName) {
- return new UpdateClusterOptions().clusterName(clusterName);
- }
-
- /**
- * @param clusterType type of the cluster
- */
- public static UpdateClusterOptions clusterType(Host.ClusterType clusterType) {
- return new UpdateClusterOptions().clusterType(clusterType);
- }
-
- /**
- * @param hypervisor hypervisor type of the cluster
- */
- public static UpdateClusterOptions hypervisor(String hypervisor) {
- return new UpdateClusterOptions().hypervisor(hypervisor);
- }
-
- /**
- * @param managedState whether this cluster is managed by cloudstack
- */
- public static UpdateClusterOptions managedState(Cluster.ManagedState managedState) {
- return new UpdateClusterOptions().managedState(managedState);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptions.java
deleted file mode 100644
index 4bf03e7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptions.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to control how disk offerings are created
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/updateDiskOffering.html"
- * />
- */
-public class UpdateDiskOfferingOptions extends AccountInDomainOptions {
-
- public static final UpdateDiskOfferingOptions NONE = new UpdateDiskOfferingOptions();
-
- /**
- * @param name
- * service offering name
- */
- public UpdateDiskOfferingOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.<String>of(name));
- return this;
- }
-
- /**
- * @param displayText
- * service offering display text
- */
- public UpdateDiskOfferingOptions displayText(String displayText) {
- this.queryParameters.replaceValues("displaytext", ImmutableSet.<String>of(displayText));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see org.jclouds.cloudstack.options.UpdateDiskOfferingOptions#name
- */
- public static UpdateDiskOfferingOptions name(String name) {
- UpdateDiskOfferingOptions options = new UpdateDiskOfferingOptions();
- return options.name(name);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.UpdateDiskOfferingOptions#displayText
- */
- public static UpdateDiskOfferingOptions displayText(String displayText) {
- UpdateDiskOfferingOptions options = new UpdateDiskOfferingOptions();
- return options.displayText(displayText);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.UpdateDiskOfferingOptions#accountInDomain
- */
- public static UpdateDiskOfferingOptions accountInDomain(String account, String domain) {
- UpdateDiskOfferingOptions options = new UpdateDiskOfferingOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.UpdateDiskOfferingOptions#domainId
- */
- public static UpdateDiskOfferingOptions domainId(String domainId) {
- UpdateDiskOfferingOptions options = new UpdateDiskOfferingOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public UpdateDiskOfferingOptions accountInDomain(String account, String domain) {
- return UpdateDiskOfferingOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public UpdateDiskOfferingOptions domainId(String domainId) {
- return UpdateDiskOfferingOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java
deleted file mode 100644
index a2c2562..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a domain is created
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createDomain.html"
- * />
- */
-public class UpdateDomainOptions extends BaseHttpRequestOptions {
-
- public static final UpdateDomainOptions NONE = new UpdateDomainOptions();
-
- /**
- * @param name
- * the new name for this domain
- */
- public UpdateDomainOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param networkDomain
- * network domain for networks in the domain
- */
- public UpdateDomainOptions networkDomain(String networkDomain) {
- this.queryParameters.replaceValues("networkdomain", ImmutableSet.of(networkDomain));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see UpdateDomainOptions#name
- */
- public static UpdateDomainOptions name(String name) {
- UpdateDomainOptions options = new UpdateDomainOptions();
- return options.name(name);
- }
-
- /**
- * @see UpdateDomainOptions#networkDomain
- */
- public static UpdateDomainOptions networkDomain(String networkDomain) {
- UpdateDomainOptions options = new UpdateDomainOptions();
- return options.networkDomain(networkDomain);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java
deleted file mode 100644
index 8c58e53..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalHostApi.addHost() API call
- */
-public class UpdateHostOptions extends BaseHttpRequestOptions {
-
-
- public static final UpdateHostOptions NONE = new UpdateHostOptions();
-
- /**
- * @param allocationState Allocation state of this Host for allocation of new resources
- */
- public UpdateHostOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- /**
- * @param hostTags list of tags to be added to the host
- */
- public UpdateHostOptions hostTags(Set<String> hostTags) {
- this.queryParameters.replaceValues("hosttags", ImmutableSet.of(Joiner.on(',').join(hostTags)));
- return this;
- }
-
- /**
- * @param osCategoryId the id of Os category to update the host with
- */
- public UpdateHostOptions osCategoryId(String osCategoryId) {
- this.queryParameters.replaceValues("oscategoryid", ImmutableSet.of(osCategoryId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param allocationState Allocation state of this Host for allocation of new resources
- */
- public static UpdateHostOptions allocationState(AllocationState allocationState) {
- return new UpdateHostOptions().allocationState(allocationState);
- }
-
- /**
- * @param hostTags list of tags to be added to the host
- */
- public static UpdateHostOptions hostTags(Set<String> hostTags) {
- return new UpdateHostOptions().hostTags(hostTags);
- }
-
- /**
- * @param podId the Pod ID for the host
- */
- public static UpdateHostOptions osCategoryId(String osCategoryId) {
- return new UpdateHostOptions().osCategoryId(osCategoryId);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java
deleted file mode 100644
index d081a17..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the ISO updateISO method.
- *
- * @see org.jclouds.cloudstack.features.ISOApi#updateISO
- * @see org.jclouds.cloudstack.features.ISOApi#updateISO
- */
-public class UpdateISOOptions extends BaseHttpRequestOptions {
-
- public static final UpdateISOOptions NONE = new UpdateISOOptions();
-
- /**
- * @param bootable true if image is bootable, false otherwise
- */
- public UpdateISOOptions bootable(boolean bootable) {
- this.queryParameters.replaceValues("bootable", ImmutableSet.of(bootable + ""));
- return this;
- }
-
- /**
- * @param displayText the display text of the image
- */
- public UpdateISOOptions displayText(String displayText) {
- this.queryParameters.replaceValues("displaytext", ImmutableSet.of(displayText + ""));
- return this;
- }
-
- /**
- * @param format the format for the image
- */
- public UpdateISOOptions format(String format) {
- this.queryParameters.replaceValues("format", ImmutableSet.of(format + ""));
- return this;
- }
-
- /**
- * @param name the name of the image file
- */
- public UpdateISOOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name + ""));
- return this;
- }
-
- /**
- * @param osTypeId the ID of the OS type that best represents the OS of this image.
- */
- public UpdateISOOptions osTypeId(String osTypeId) {
- this.queryParameters.replaceValues("ostypeid", ImmutableSet.of(osTypeId + ""));
- return this;
- }
-
- /**
- * @param passwordEnabled true if the image supports the password reset feature; default is false
- */
- public UpdateISOOptions passwordEnabled(boolean passwordEnabled) {
- this.queryParameters.replaceValues("passwordenabled", ImmutableSet.of(passwordEnabled + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param bootable true if image is bootable, false otherwise
- */
- public static UpdateISOOptions bootable(boolean bootable) {
- return new UpdateISOOptions().bootable(bootable);
- }
-
- /**
- * @param displayText the display text of the image
- */
- public static UpdateISOOptions displayText(String displayText) {
- return new UpdateISOOptions().displayText(displayText);
- }
-
- /**
- * @param format the format for the image
- */
- public static UpdateISOOptions format(String format) {
- return new UpdateISOOptions().format(format);
- }
-
- /**
- * @param name the name of the image file
- */
- public static UpdateISOOptions name(String name) {
- return new UpdateISOOptions().name(name);
- }
-
- /**
- * @param osTypeId the ID of the OS type that best represents the OS of this image.
- */
- public static UpdateISOOptions osTypeId(String osTypeId) {
- return new UpdateISOOptions().osTypeId(osTypeId);
- }
-
- /**
- * @param passwordEnabled true if the image supports the password reset feature; default is false
- */
- public static UpdateISOOptions passwordEnabled(boolean passwordEnabled) {
- return new UpdateISOOptions().passwordEnabled(passwordEnabled);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java
deleted file mode 100644
index 233e09c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.PermissionOperation;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the ISO updateISOPermissions method.
- *
- * @see org.jclouds.cloudstack.features.ISOApi#updateISOPermissions
- * @see org.jclouds.cloudstack.features.ISOApi#updateISOPermissions
- */
-public class UpdateISOPermissionsOptions extends BaseHttpRequestOptions {
-
- public static final UpdateISOPermissionsOptions NONE = new UpdateISOPermissionsOptions();
-
- /**
- * @param accounts a comma delimited list of accounts. If specified, "op" parameter has to be passed in.
- */
- public UpdateISOPermissionsOptions accounts(Iterable<String> accounts) {
- this.queryParameters.replaceValues("accounts", ImmutableSet.of(Joiner.on(',').join(accounts)));
- return this;
- }
-
- /**
- * @param isExtractable true if the template/iso is extractable, false other wise. Can be set only by root admin
- */
- public UpdateISOPermissionsOptions isExtractable(boolean isExtractable) {
- this.queryParameters.replaceValues("isextractable", ImmutableSet.of(isExtractable + ""));
- return this;
- }
-
- /**
- * @param isFeatured true for featured template/iso, false otherwise
- */
- public UpdateISOPermissionsOptions isFeatured(boolean isFeatured) {
- this.queryParameters.replaceValues("isfeatured", ImmutableSet.of(isFeatured + ""));
- return this;
- }
-
- /**
- * @param isPublic true for public template/iso, false for private templates/isos
- */
- public UpdateISOPermissionsOptions isPublic(boolean isPublic) {
- this.queryParameters.replaceValues("ispublic", ImmutableSet.of(isPublic + ""));
- return this;
- }
-
- /**
- * @param operation permission operator (add, remove, reset)
- */
- public UpdateISOPermissionsOptions operation(PermissionOperation operation) {
- this.queryParameters.replaceValues("op", ImmutableSet.of(operation + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param accounts a comma delimited list of accounts. If specified, "op" parameter has to be passed in.
- */
- public static UpdateISOPermissionsOptions accounts(Iterable<String> accounts) {
- return new UpdateISOPermissionsOptions().accounts(accounts);
- }
-
- /**
- * @param isExtractable true if the template/iso is extractable, false other wise. Can be set only by root admin
- */
- public static UpdateISOPermissionsOptions isExtractable(boolean isExtractable) {
- return new UpdateISOPermissionsOptions().isExtractable(isExtractable);
- }
-
- /**
- * @param isFeatured true for featured template/iso, false otherwise
- */
- public static UpdateISOPermissionsOptions isFeatured(boolean isFeatured) {
- return new UpdateISOPermissionsOptions().isFeatured(isFeatured);
- }
-
- /**
- * @param isPublic true for public template/iso, false for private templates/isos
- */
- public static UpdateISOPermissionsOptions isPublic(boolean isPublic) {
- return new UpdateISOPermissionsOptions().isPublic(isPublic);
- }
-
- /**
- * @param operation permission operator (add, remove, reset)
- */
- public static UpdateISOPermissionsOptions operation(PermissionOperation operation) {
- return new UpdateISOPermissionsOptions().operation(operation);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java
deleted file mode 100644
index 1caec3a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.LoadBalancerRule;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a load balancer rule is updated
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/user/updateLoadBalancerRule.html"
- * />
- */
-public class UpdateLoadBalancerRuleOptions extends BaseHttpRequestOptions {
-
- public static final UpdateLoadBalancerRuleOptions NONE = new UpdateLoadBalancerRuleOptions();
-
- /**
- * @param algorithm load balancer algorithm (source, roundrobin, leastconn)
- */
- public UpdateLoadBalancerRuleOptions algorithm(LoadBalancerRule.Algorithm algorithm) {
- this.queryParameters.replaceValues("algorithm", ImmutableSet.of(algorithm.toString()));
- return this;
- }
-
- /**
- * @param description the description of the load balancer rule
- */
- public UpdateLoadBalancerRuleOptions description(String description) {
- this.queryParameters.replaceValues("description", ImmutableSet.of(description));
- return this;
- }
-
- /**
- * @param name the name of the load balancer rule
- */
- public UpdateLoadBalancerRuleOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see UpdateLoadBalancerRuleOptions#algorithm
- */
- public static UpdateLoadBalancerRuleOptions algorithm(LoadBalancerRule.Algorithm algorithm) {
- UpdateLoadBalancerRuleOptions options = new UpdateLoadBalancerRuleOptions();
- return options.algorithm(algorithm);
- }
-
- /**
- * @see UpdateLoadBalancerRuleOptions#description
- */
- public static UpdateLoadBalancerRuleOptions description(String description) {
- UpdateLoadBalancerRuleOptions options = new UpdateLoadBalancerRuleOptions();
- return options.description(description);
- }
-
- /**
- * @see UpdateLoadBalancerRuleOptions#name
- */
- public static UpdateLoadBalancerRuleOptions name(String name) {
- UpdateLoadBalancerRuleOptions options = new UpdateLoadBalancerRuleOptions();
- return options.name(name);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java
deleted file mode 100644
index 6f0ac87..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to control how network offerings are created
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/updateNetworkOffering.html"
- * />
- */
-public class UpdateNetworkOfferingOptions extends AccountInDomainOptions {
-
- public static final UpdateNetworkOfferingOptions NONE = new UpdateNetworkOfferingOptions();
-
- /**
- * @param name
- * service offering name
- */
- public UpdateNetworkOfferingOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.<String>of(name));
- return this;
- }
-
- /**
- * @param displayText
- * service offering display text
- */
- public UpdateNetworkOfferingOptions displayText(String displayText) {
- this.queryParameters.replaceValues("displaytext", ImmutableSet.<String>of(displayText));
- return this;
- }
-
- /**
- * @param availability
- * the availability of network offering. Default value is Required for Guest
- * Virtual network offering; Optional for Guest Direct network offering
- */
- public UpdateNetworkOfferingOptions availability(NetworkOfferingAvailabilityType availability) {
- this.queryParameters.replaceValues("availability", ImmutableSet.<String>of(availability.toString()));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see UpdateNetworkOfferingOptions#name
- */
- public static UpdateNetworkOfferingOptions name(String name) {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions();
- return options.name(name);
- }
-
- /**
- * @see UpdateNetworkOfferingOptions#displayText
- */
- public static UpdateNetworkOfferingOptions displayText(String displayText) {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions();
- return options.displayText(displayText);
- }
-
- /**
- * @see UpdateNetworkOfferingOptions#availability
- */
- public static UpdateNetworkOfferingOptions availability(NetworkOfferingAvailabilityType availability) {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions();
- return options.availability(availability);
- }
-
- /**
- * @see UpdateNetworkOfferingOptions#accountInDomain
- */
- public static UpdateNetworkOfferingOptions accountInDomain(String account, String domain) {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see UpdateNetworkOfferingOptions#domainId
- */
- public static UpdateNetworkOfferingOptions domainId(String domainId) {
- UpdateNetworkOfferingOptions options = new UpdateNetworkOfferingOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public UpdateNetworkOfferingOptions accountInDomain(String account, String domain) {
- return UpdateNetworkOfferingOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public UpdateNetworkOfferingOptions domainId(String domainId) {
- return UpdateNetworkOfferingOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java
deleted file mode 100644
index ae1f618..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalPodApi.updatePod API call.
- */
-public class UpdatePodOptions extends BaseHttpRequestOptions {
-
- public static final UpdatePodOptions NONE = new UpdatePodOptions();
-
- public static class Builder {
-
- public static UpdatePodOptions name(String name) {
- return new UpdatePodOptions().name(name);
- }
-
- public static UpdatePodOptions startIp(String startIp) {
- return new UpdatePodOptions().startIp(startIp);
- }
-
- public static UpdatePodOptions endIp(String endIp) {
- return new UpdatePodOptions().endIp(endIp);
- }
-
- public static UpdatePodOptions gateway(String gateway) {
- return new UpdatePodOptions().gateway(gateway);
- }
-
- public static UpdatePodOptions netmask(String netmask) {
- return new UpdatePodOptions().netmask(netmask);
- }
-
- public static UpdatePodOptions allocationState(AllocationState allocationState) {
- return new UpdatePodOptions().allocationState(allocationState);
- }
-
- }
-
- public UpdatePodOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.<String>of(name));
- return this;
- }
-
- public UpdatePodOptions startIp(String startIp) {
- this.queryParameters.replaceValues("startip", ImmutableSet.<String>of(startIp));
- return this;
- }
-
- public UpdatePodOptions endIp(String endIp) {
- this.queryParameters.replaceValues("endip", ImmutableSet.<String>of(endIp));
- return this;
- }
-
- public UpdatePodOptions gateway(String gateway) {
- this.queryParameters.replaceValues("gateway", ImmutableSet.<String>of(gateway));
- return this;
- }
-
- public UpdatePodOptions netmask(String netmask) {
- this.queryParameters.replaceValues("netmask", ImmutableSet.<String>of(netmask));
- return this;
- }
-
- public UpdatePodOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptions.java
deleted file mode 100644
index b6d5426..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateServiceOfferingOptions.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to control how service offerings are created
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createServiceOffering.html"
- * />
- */
-public class UpdateServiceOfferingOptions extends AccountInDomainOptions {
-
- public static final UpdateServiceOfferingOptions NONE = new UpdateServiceOfferingOptions();
-
- /**
- * @param name
- * service offering name
- */
- public UpdateServiceOfferingOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.<String>of(name));
- return this;
- }
-
- /**
- * @param displayText
- * service offering display text
- */
- public UpdateServiceOfferingOptions displayText(String displayText) {
- this.queryParameters.replaceValues("displaytext", ImmutableSet.<String>of(displayText));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see UpdateServiceOfferingOptions#name
- */
- public static UpdateServiceOfferingOptions name(String name) {
- UpdateServiceOfferingOptions options = new UpdateServiceOfferingOptions();
- return options.name(name);
- }
-
- /**
- * @see UpdateServiceOfferingOptions#displayText
- */
- public static UpdateServiceOfferingOptions displayText(String displayText) {
- UpdateServiceOfferingOptions options = new UpdateServiceOfferingOptions();
- return options.displayText(displayText);
- }
-
- /**
- * @see UpdateServiceOfferingOptions#accountInDomain
- */
- public static UpdateServiceOfferingOptions accountInDomain(String account, String domain) {
- UpdateServiceOfferingOptions options = new UpdateServiceOfferingOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see UpdateServiceOfferingOptions#domainId
- */
- public static UpdateServiceOfferingOptions domainId(String domainId) {
- UpdateServiceOfferingOptions options = new UpdateServiceOfferingOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public UpdateServiceOfferingOptions accountInDomain(String account, String domain) {
- return UpdateServiceOfferingOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public UpdateServiceOfferingOptions domainId(String domainId) {
- return UpdateServiceOfferingOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java
deleted file mode 100644
index 4293708..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a template should be updated.
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.8/api/user/updateTemplate.html"
- * />
- */
-public class UpdateTemplateOptions extends BaseHttpRequestOptions {
-
- /**
- * true if image is bootable, false otherwise
- */
- public UpdateTemplateOptions bootable(boolean bootable) {
- this.queryParameters.replaceValues("bootable", ImmutableSet.of(bootable + ""));
- return this;
- }
-
- /**
- * the display text of the image
- */
- public UpdateTemplateOptions displayText(String displayText) {
- this.queryParameters.replaceValues("displaytext", ImmutableSet.of(displayText));
- return this;
- }
-
- /**
- * the format for the image
- */
- public UpdateTemplateOptions format(Template.Format format) {
- this.queryParameters.replaceValues("format", ImmutableSet.of(format + ""));
- return this;
- }
-
- /**
- * the name of the image file
- */
- public UpdateTemplateOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * the ID of the OS type that best represents the OS of this image.
- */
- public UpdateTemplateOptions osTypeId(String osTypeId) {
- this.queryParameters.replaceValues("ostypeid", ImmutableSet.of(osTypeId + ""));
- return this;
- }
-
- /**
- * true if the image supports the password reset feature; default is false
- */
- public UpdateTemplateOptions passwordEnabled(boolean passwordEnabled) {
- this.queryParameters.replaceValues("passwordenabled", ImmutableSet.of(passwordEnabled + ""));
- return this;
- }
-
- public static class Builder {
-
- public static UpdateTemplateOptions bootable(boolean bootable) {
- UpdateTemplateOptions options = new UpdateTemplateOptions();
- return options.bootable(bootable);
- }
-
- public static UpdateTemplateOptions displayText(String displayText) {
- UpdateTemplateOptions options = new UpdateTemplateOptions();
- return options.displayText(displayText);
- }
-
- public static UpdateTemplateOptions format(Template.Format format) {
- UpdateTemplateOptions options = new UpdateTemplateOptions();
- return options.format(format);
- }
-
- public static UpdateTemplateOptions name(String name) {
- UpdateTemplateOptions options = new UpdateTemplateOptions();
- return options.name(name);
- }
-
- public static UpdateTemplateOptions osTypeId(String osTypeId) {
- UpdateTemplateOptions options = new UpdateTemplateOptions();
- return options.osTypeId(osTypeId);
- }
-
- public static UpdateTemplateOptions passwordEnabled(boolean passwordEnabled) {
- UpdateTemplateOptions options = new UpdateTemplateOptions();
- return options.passwordEnabled(passwordEnabled);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java
deleted file mode 100644
index 283edfb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a template should be updated.
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.8/api/user/updateTemplate.html"
- * />
- */
-public class UpdateTemplatePermissionsOptions extends BaseHttpRequestOptions {
-
- /**
- * a list of accounts. If specified, "op" parameter has to be passed in.
- */
- public UpdateTemplatePermissionsOptions accounts(Iterable<String> accounts) {
- this.queryParameters.replaceValues("accounts", ImmutableSet.of(Joiner.on(',').join(accounts)));
- return this;
- }
-
- /**
- * a list of projects. If specified, "op" parameter has to be passed in.
- */
- public UpdateTemplatePermissionsOptions projectIds(Iterable<String> projectIds) {
- this.queryParameters.replaceValues("projectids", ImmutableSet.of(Joiner.on(',').join(projectIds)));
- return this;
- }
-
- /**
- * true if the template/iso is extractable, false other wise. Can be set only by root admin
- */
- public UpdateTemplatePermissionsOptions isExtractable(boolean isExtractable) {
- this.queryParameters.replaceValues("isextractable", ImmutableSet.of(isExtractable + ""));
- return this;
- }
-
- /**
- * true for featured template/iso, false otherwise
- */
- public UpdateTemplatePermissionsOptions isFeatured(boolean isFeatured) {
- this.queryParameters.replaceValues("isfeatured", ImmutableSet.of(isFeatured + ""));
- return this;
- }
-
- /**
- * true for public template/iso, false for private templates/isos
- */
- public UpdateTemplatePermissionsOptions isPublic(boolean isPublic) {
- this.queryParameters.replaceValues("ispublic", ImmutableSet.of(isPublic + ""));
- return this;
- }
-
- /**
- * permission operator (add, remove, reset)
- */
- public UpdateTemplatePermissionsOptions op(Operation op) {
- this.queryParameters.replaceValues("op", ImmutableSet.of(op + ""));
- return this;
- }
-
- public enum Operation {
- add, remove, reset
- }
-
- public static class Builder {
-
- public static UpdateTemplatePermissionsOptions accounts(Iterable<String> accounts) {
- UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions();
- return options.accounts(accounts);
- }
-
- public static UpdateTemplatePermissionsOptions projectIds(Iterable<String> projectIds) {
- UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions();
- return options.projectIds(projectIds);
- }
-
- public static UpdateTemplatePermissionsOptions isExtractable(boolean isExtractable) {
- UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions();
- return options.isExtractable(isExtractable);
- }
-
- public static UpdateTemplatePermissionsOptions isFeatured(boolean isFeatured) {
- UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions();
- return options.isFeatured(isFeatured);
- }
-
- public static UpdateTemplatePermissionsOptions isPublic(boolean isPublic) {
- UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions();
- return options.isPublic(isPublic);
- }
-
- public static UpdateTemplatePermissionsOptions op(Operation op) {
- UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions();
- return options.op(op);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java
deleted file mode 100644
index dfe16c0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Optional arguments for updating an User
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/updateUser.html"
- * />
- */
-public class UpdateUserOptions extends BaseHttpRequestOptions {
-
- public static final UpdateUserOptions NONE = new UpdateUserOptions();
-
- /**
- * @param email user email address
- */
- public UpdateUserOptions email(String email) {
- this.queryParameters.replaceValues("email", ImmutableSet.of(email));
- return this;
- }
-
- /**
- * @param firstName user account first name
- */
- public UpdateUserOptions firstName(String firstName) {
- this.queryParameters.replaceValues("firstname", ImmutableSet.of(firstName));
- return this;
- }
-
- /**
- * @param lastName user account last name
- */
- public UpdateUserOptions lastName(String lastName) {
- this.queryParameters.replaceValues("lastname", ImmutableSet.of(lastName));
- return this;
- }
-
- /**
- * @param hashedPassword hashed password (default is MD5). If you wish to use any other
- * hashing algorithm, you would need to write a custom authentication adapter
- */
- public UpdateUserOptions hashedPassword(String hashedPassword) {
- this.queryParameters.replaceValues("password", ImmutableSet.of(hashedPassword));
- return this;
- }
-
- /**
- * @param timezone specifies a timezone for this command. For more information on
- * the timezone parameter, see Time Zone Format.
- */
- public UpdateUserOptions timezone(String timezone) {
- this.queryParameters.replaceValues("timezone", ImmutableSet.of(timezone));
- return this;
- }
-
- /**
- * @param userApiKey
- */
- public UpdateUserOptions userApiKey(String userApiKey) {
- this.queryParameters.replaceValues("userapikey", ImmutableSet.of(userApiKey));
- return this;
- }
-
- /**
- * @param userSecretKey
- */
- public UpdateUserOptions userSecretKey(String userSecretKey) {
- this.queryParameters.replaceValues("usersecretkey", ImmutableSet.of(userSecretKey));
- return this;
- }
-
- /**
- * @param userName unique user name
- */
- public UpdateUserOptions userName(String userName) {
- this.queryParameters.replaceValues("username", ImmutableSet.of(userName));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see UpdateUserOptions#email
- */
- public static UpdateUserOptions email(String email) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.email(email);
- }
-
- /**
- * @see UpdateUserOptions#firstName
- */
- public static UpdateUserOptions firstName(String firstName) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.firstName(firstName);
- }
-
- /**
- * @see UpdateUserOptions#lastName
- */
- public static UpdateUserOptions lastName(String lastName) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.lastName(lastName);
- }
-
- /**
- * @see UpdateUserOptions#hashedPassword
- */
- public static UpdateUserOptions hashedPassword(String hashedPassword) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.hashedPassword(hashedPassword);
- }
-
- /**
- * @see UpdateUserOptions#timezone
- */
- public static UpdateUserOptions timezone(String timezone) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.timezone(timezone);
- }
-
- /**
- * @see UpdateUserOptions#userApiKey
- */
- public static UpdateUserOptions userApiKey(String userApiKey) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.userApiKey(userApiKey);
- }
-
- /**
- * @see UpdateUserOptions#userSecretKey
- */
- public static UpdateUserOptions userSecretKey(String userSecretKey) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.userSecretKey(userSecretKey);
- }
-
- /**
- * @see UpdateUserOptions#userName
- */
- public static UpdateUserOptions userName(String userName) {
- UpdateUserOptions options = new UpdateUserOptions();
- return options.userName(userName);
- }
- }
-
-}
[24/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java
deleted file mode 100644
index cccfa62..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.hash.Hashing.md5;
-import static com.google.common.io.BaseEncoding.base16;
-import static org.jclouds.cloudstack.features.GlobalAccountApiLiveTest.createTestAccount;
-import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userName;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Properties;
-import java.util.Set;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.CloudStackGlobalApi;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.ApiKeyPair;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code GlobaUserClient}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalUserApiLiveTest")
-public class GlobalUserApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public static User createTestUser(CloudStackGlobalApi client, Account account, String prefix) {
- return client.getUserClient().createUser(prefix + "-user", account.getName(), "dummy2@example.com",
- base16().lowerCase().encode(md5().hashString("password", UTF_8).asBytes()), "First", "Last");
- }
-
- @Test
- public void testCreateUser() {
- skipIfNotGlobalAdmin();
-
- Account testAccount = createTestAccount(globalAdminClient, prefix);
- User testUser = null;
- try {
- testUser = createTestUser(globalAdminClient, testAccount, prefix);
-
- assertNotNull(testUser);
- assertEquals(testUser.getName(), prefix + "-user");
- assertEquals(testUser.getAccount(), prefix + "-account");
-
- User updatedUser = globalAdminClient.getUserClient()
- .updateUser(testUser.getId(), userName(prefix + "-user-2"));
-
- assertNotNull(updatedUser);
- assertEquals(updatedUser.getName(), prefix + "-user-2");
-
- ApiKeyPair apiKeys = globalAdminClient.getUserClient()
- .registerUserKeys(updatedUser.getId());
-
- assertNotNull(apiKeys.getApiKey());
- assertNotNull(apiKeys.getSecretKey());
-
- checkAuthAsUser(apiKeys);
-
- } finally {
- if (testUser != null) {
- globalAdminClient.getUserClient().deleteUser(testUser.getId());
- }
- globalAdminClient.getAccountApi().deleteAccount(testAccount.getId());
- }
- }
-
- private void checkAuthAsUser(ApiKeyPair keyPair) {
- CloudStackContext context = createView(credentialsAsProperties(keyPair), setupModules());
-
- CloudStackApi client = context.getApi();
- Set<Account> accounts = client.getAccountApi().listAccounts();
-
- assert !accounts.isEmpty();
-
- context.close();
- }
-
- private Properties credentialsAsProperties(ApiKeyPair keyPair) {
- Properties overrides = setupProperties();
- overrides.put(provider + ".identity", checkNotNull(keyPair.getApiKey()));
- overrides.put(provider + ".credential", checkNotNull(keyPair.getSecretKey()));
- return overrides;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiTest.java
deleted file mode 100644
index 4c8f76a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateUserOptions;
-import org.jclouds.cloudstack.options.UpdateUserOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GlobalUserApi}
- */
-@Test(groups = "unit", testName = "GlobalUserApiTest")
-public class GlobalUserApiTest extends BaseCloudStackApiTest<GlobalUserApi> {
-
- HttpRequest createUser = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createUser")
- .addQueryParam("username", "user")
- .addQueryParam("account", "account")
- .addQueryParam("email", "email%40example.com")
- .addQueryParam("password", "hashed-password")
- .addQueryParam("firstname", "FirstName")
- .addQueryParam("lastname", "LastName").build();
-
- public void testCreateAccount() throws Exception {
- Invokable<?, ?> method = method(GlobalUserApi.class, "createUser", String.class, String.class,
- String.class, String.class, String.class, String.class, CreateUserOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("user", "account", "email@example.com",
- "hashed-password", "FirstName", "LastName"));
-
- assertRequestLineEquals(httpRequest, createUser.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateUser() throws Exception {
- Invokable<?, ?> method = method(GlobalUserApi.class, "updateUser", String.class, UpdateUserOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(42L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateUser&id=42 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteUser() throws Exception {
- Invokable<?, ?> method = method(GlobalUserApi.class, "deleteUser", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(42L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteUser&id=42 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiExpectTest.java
deleted file mode 100644
index 6b9a2c7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiExpectTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.VlanIPRange;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack VlanClient
- */
-@Test(groups = "unit", testName = "GlobalVlanApiExpectTest")
-public class GlobalVlanApiExpectTest extends BaseCloudStackExpectTest<GlobalVlanApi> {
-
- public void testListVlanIpRangesWhenResponseIs2xx() {
- GlobalVlanApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listVlanIpRanges&listAll=true&apiKey=identity&signature=xPwCeAcMp9kDGbD5oPgztLtSdnU%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listvlaniprangesresponse.json"))
- .build());
-
- VlanIPRange range1 = VlanIPRange.builder()
- .id("1")
- .forVirtualNetwork(true)
- .zoneId("1")
- .vlan("127")
- .account("system")
- .domainId("1")
- .domain("ROOT")
- .gateway("10.27.27.254")
- .netmask("255.255.255.0")
- .startIP("10.27.27.50")
- .endIP("10.27.27.100")
- .networkId("200")
- .build();
-
- VlanIPRange range2 = VlanIPRange.builder()
- .id("2")
- .forVirtualNetwork(false)
- .zoneId("2")
- .vlan("untagged")
- .account("system")
- .domainId("1")
- .domain("ROOT")
- .podId("2")
- .podName("Dev Pod 2")
- .gateway("10.22.22.254")
- .netmask("255.255.255.0")
- .startIP("10.22.22.51")
- .endIP("10.22.22.100")
- .networkId("209")
- .build();
-
- assertEquals(client.listVlanIPRanges(), ImmutableSet.of(range1, range2));
- }
-
- public void testListVlanIpRangesWhenResponseIs404() {
- GlobalVlanApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listVlanIpRanges&listAll=true&apiKey=identity&signature=xPwCeAcMp9kDGbD5oPgztLtSdnU%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listVlanIPRanges(), ImmutableSet.of());
- }
-
- public void testCreateVlanIpRangeWhenResponseIs2xx() {
- GlobalVlanApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=createVlanIpRange&startip=10.22.22.51&endip=10.22.22.100&forvirtualnetwork=false&zoneid=2&vlan=untagged&account=system&domainid=1&podid=2&gateway=10.22.22.254&netmask=255.255.255.0&networkid=209&apiKey=identity&signature=XgDjPYAQNLMVCuSMGRA6QjV8mOY%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createvlaniprangeresponse.json"))
- .build());
-
- VlanIPRange actual = client.createVlanIPRange("10.22.22.51", "10.22.22.100", new CreateVlanIPRangeOptions()
- .forVirtualNetwork(false)
- .zoneId("2")
- .vlan("untagged")
- .accountInDomain("system", "1")
- .podId("2")
- .gateway("10.22.22.254")
- .netmask("255.255.255.0")
- .networkId("209"));
-
- VlanIPRange expected = VlanIPRange.builder()
- .id("2")
- .forVirtualNetwork(false)
- .zoneId("2")
- .vlan("untagged")
- .account("system")
- .domainId("1")
- .domain("ROOT")
- .podId("2")
- .podName("Dev Pod 2")
- .gateway("10.22.22.254")
- .netmask("255.255.255.0")
- .startIP("10.22.22.51")
- .endIP("10.22.22.100")
- .networkId("209")
- .build();
-
- assertEquals(actual, expected);
- }
-
- public void testDeleteVlanIpRangeWhenResponseIs2xx() {
- GlobalVlanApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=deleteVlanIpRange&id=1&apiKey=identity&signature=tTBbpdCndgHXdR397fbbJaN1RZU%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createvlaniprangeresponse.json"))
- .build());
-
- client.deleteVlanIPRange("1");
- }
-
- @Override
- protected GlobalVlanApi clientFrom(CloudStackContext context) {
- return context.getGlobalApi().getVlanClient();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java
deleted file mode 100644
index 34fe5be..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.cloudstack.domain.VlanIPRange;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions;
-import org.jclouds.cloudstack.options.ListVlanIPRangesOptions;
-import org.jclouds.cloudstack.predicates.NetworkOfferingPredicates;
-import org.jclouds.cloudstack.predicates.ZonePredicates;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Strings;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-/**
- * Tests behavior of {@code GlobalVlanApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalVlanApiLiveTest")
-public class GlobalVlanApiLiveTest extends BaseCloudStackApiLiveTest {
-
- private Network network;
- private boolean usingExistingNetwork;
-
- private VlanIPRange range;
-
- @Test
- public void testListVlanIPRanges() throws Exception {
- skipIfNotGlobalAdmin();
-
- Set<VlanIPRange> response = globalAdminClient.getVlanClient().listVlanIPRanges();
- assert null != response;
- long rangeCount = response.size();
- assertTrue(rangeCount >= 0);
-
- for (VlanIPRange range : response) {
- VlanIPRange newDetails = Iterables.getOnlyElement(globalAdminClient.getVlanClient().listVlanIPRanges(
- ListVlanIPRangesOptions.Builder.id(range.getId())));
- assertEquals(range, newDetails);
- assertEquals(range, globalAdminClient.getVlanClient().getVlanIPRange(range.getId()));
- assertNull(range.getId());
- assertNull(range.getZoneId());
- assertFalse(Strings.isNullOrEmpty(range.getVlan()));
- assertFalse(Strings.isNullOrEmpty(range.getAccount()));
- assertNull(range.getDomainId());
- assertFalse(Strings.isNullOrEmpty(range.getDomain()));
- assertFalse(Strings.isNullOrEmpty(range.getGateway()));
- assertFalse(Strings.isNullOrEmpty(range.getNetmask()));
- assertFalse(Strings.isNullOrEmpty(range.getStartIP()));
- assertFalse(Strings.isNullOrEmpty(range.getEndIP()));
- assertNull(range.getNetworkId());
- }
- }
-
- @Test
- public void testCreateVlanIPRange() {
- skipIfNotGlobalAdmin();
-
- final Zone zone = Iterables.find(client.getZoneApi().listZones(), ZonePredicates.supportsAdvancedNetworks());
- final NetworkOffering offering = Iterables.tryFind(client.getOfferingApi().listNetworkOfferings(),
- NetworkOfferingPredicates.supportsGuestVirtualNetworks()).orNull();
-
- if (offering != null) {
- Set<Network> suitableNetworks = Sets.filter(client.getNetworkApi().listNetworks(
- zoneId(zone.getId()).isSystem(false).trafficType(TrafficType.GUEST)),
- new Predicate<Network>() {
- @Override
- public boolean apply(Network network) {
- return network.getNetworkOfferingId().equals(offering.getId());
- }
- });
-
- if (!suitableNetworks.isEmpty()) {
- network = Iterables.get(suitableNetworks, 0);
- usingExistingNetwork = true;
-
- } else if (network == null) {
- network = client.getNetworkApi().createNetworkInZone(zone.getId(),
- offering.getId(), "net-" + prefix, "jclouds test " + prefix);
- usingExistingNetwork = false;
- }
-
- range = globalAdminClient.getVlanClient().createVlanIPRange("172.19.1.1", "172.19.1.199", CreateVlanIPRangeOptions.Builder
- .accountInDomain(user.getAccount(), user.getDomainId())
- .forVirtualNetwork(true)
- .vlan(1001)
- .networkId(network.getId())
- );
- }
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (range != null) {
- globalAdminClient.getVlanClient().deleteVlanIPRange(range.getId());
- range = null;
- }
- if (network != null && !usingExistingNetwork) {
- client.getNetworkApi().deleteNetwork(network.getId());
- network = null;
- }
- super.tearDownContext();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiExpectTest.java
deleted file mode 100644
index 80364d5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiExpectTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.UpdateZoneOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMultimap;
-
-/**
- * Test the CloudStack GlobalZoneApi
- */
-@Test(groups = "unit", testName = "GlobalZoneApiExpectTest")
-public class GlobalZoneApiExpectTest extends BaseCloudStackExpectTest<GlobalZoneApi> {
-
- HttpRequest createZone = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createZone")
- .addQueryParam("name", "test-zone")
- .addQueryParam("networktype", "Basic")
- .addQueryParam("dns1", "8.8.8.8")
- .addQueryParam("internaldns1", "10.10.10.10")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "hWNmM2%2BTsfb5DelQa/GJLN5DVWE=")
- .addHeader("Accept", "application/json").build();
-
- public void testCreateZoneWhenResponseIs2xxAnd404() {
- GlobalZoneApi client = requestSendsResponse(createZone,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createzoneresponse.json"))
- .build());
-
- assertEquals(client.createZone("test-zone", NetworkType.BASIC, "8.8.8.8", "10.10.10.10"),
- Zone.builder()
- .id("6")
- .name("test-zone")
- .DNS(ImmutableList.of("8.8.8.8"))
- .internalDNS(ImmutableList.of("10.10.10.10"))
- .networkType(NetworkType.BASIC)
- .securityGroupsEnabled(true)
- .allocationState(AllocationState.ENABLED)
- .zoneToken("7b6e27df-30a6-3024-9d8b-7971a3127f64")
- .dhcpProvider("DhcpServer").build());
-
- client = requestSendsResponse(createZone, HttpResponse.builder().statusCode(404).build());
- assertNull(client.createZone("test-zone", NetworkType.BASIC, "8.8.8.8", "10.10.10.10"));
- }
-
- public void testUpdateZoneWhenResponseIs2xxAnd404() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=updateZone&" +
- "id=6&name=test-zone&dns1=8.8.8.8&apiKey=identity&signature=v19FdHKHztdT0IRloYFFn0eNbWM%3D"))
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", "application/json")
- .build())
- .build();
-
- GlobalZoneApi client = requestSendsResponse(request,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/updatezoneresponse.json"))
- .build());
-
- assertEquals(client.updateZone("6", name("test-zone").externalDns(ImmutableList.of("8.8.8.8"))),
- Zone.builder()
- .id("6")
- .name("test-zone")
- .DNS(ImmutableList.of("8.8.8.8"))
- .internalDNS(ImmutableList.of("10.10.10.10"))
- .networkType(NetworkType.BASIC)
- .securityGroupsEnabled(true)
- .allocationState(AllocationState.ENABLED)
- .zoneToken("7b6e27df-30a6-3024-9d8b-7971a3127f64")
- .dhcpProvider("DhcpServer").build());
-
- client = requestSendsResponse(request, HttpResponse.builder().statusCode(404).build());
- assertNull(client.updateZone("6", name("test-zone").externalDns(ImmutableList.of("8.8.8.8"))));
- }
-
- public void testDeleteZone() {
- GlobalZoneApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=deleteZone&id=6&apiKey=identity&signature=TfkzSIK8kzGJnIYo3DofECyuOII%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/deletezoneresponse.json"))
- .build());
-
- client.deleteZone("6");
- }
-
- @Override
- protected GlobalZoneApi clientFrom(CloudStackContext context) {
- return context.getGlobalApi().getZoneApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiLiveTest.java
deleted file mode 100644
index 8e83343..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalZoneApiLiveTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.UpdateZoneOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code GlobalZoneApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalZoneApiLiveTest")
-public class GlobalZoneApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testCreateUpdateDeleteZone() {
- skipIfNotGlobalAdmin();
-
- Zone zone = null;
- String zoneName = prefix + "-zone";
- try {
- zone = globalAdminClient.getZoneApi().createZone(zoneName,
- NetworkType.BASIC, "8.8.8.8", "10.10.10.10");
-
- assertNotNull(zone);
- assertEquals(zone, globalAdminClient.getZoneApi().getZone(zone.getId()));
- assertEquals(zone.getNetworkType(), NetworkType.BASIC);
- assertEquals(zone.getDNS(), ImmutableList.of("8.8.8.8"));
- assertEquals(zone.getInternalDNS(), ImmutableList.of("10.10.10.10"));
-
- Zone updated = globalAdminClient.getZoneApi().updateZone(zone.getId(),
- name(zoneName + "-2").externalDns(ImmutableList.of("8.8.4.4")));
- assertEquals(updated.getId(), zone.getId());
- assertEquals(updated.getDNS(), ImmutableList.of("8.8.4.4"));
-
- } finally {
- if (zone != null) {
- globalAdminClient.getZoneApi().deleteZone(zone.getId());
- }
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiLiveTest.java
deleted file mode 100644
index 43c0d3a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiLiveTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListOSTypesOptions;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code GuestOSApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GuestOSApiLiveTest")
-public class GuestOSApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public void testListOSTypes() throws Exception {
- Set<OSType> response = client.getGuestOSApi().listOSTypes();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (OSType type : response) {
- OSType newDetails = getOnlyElement(client.getGuestOSApi().listOSTypes(
- ListOSTypesOptions.Builder.id(type.getId())));
- assertEquals(type.getId(), newDetails.getId());
- checkOSType(type);
- }
- }
-
- public void testListOSCategories() throws Exception {
- Map<String, String> response = client.getGuestOSApi().listOSCategories();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (Entry<String, String> category : response.entrySet()) {
- checkOSCategory(category);
- }
- }
-
- protected void checkOSCategory(Entry<String, String> category) {
- assertEquals(category, client.getGuestOSApi().getOSCategory(category.getKey()));
- assert category.getKey() != null : category;
- assert category.getValue() != null : category;
- }
-
- protected void checkOSType(OSType type) {
- assertEquals(type.getId(), client.getGuestOSApi().getOSType(type.getId()).getId());
- assert type.getId() != null : type;
- assert type.getOSCategoryId() != null : type;
- assert type.getDescription() != null : type;
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java
deleted file mode 100644
index 5f3e657..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.functions.ParseIdToNameEntryFromHttpResponse;
-import org.jclouds.cloudstack.functions.ParseIdToNameFromHttpResponse;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListOSTypesOptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GuestOSApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "GuestOSApiTest")
-public class GuestOSApiTest extends BaseCloudStackApiTest<GuestOSApi> {
-
- public void testGetOSCategory() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GuestOSApi.class, "getOSCategory", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11l));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listOsCategories&listAll=true&id=11 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseIdToNameEntryFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListOSCategories() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GuestOSApi.class, "listOSCategories");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listOsCategories&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseIdToNameFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetOSType() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GuestOSApi.class, "getOSType", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11l));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listOsTypes&listAll=true&id=11 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListOSTypes() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GuestOSApi.class, "listOSTypes", ListOSTypesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listOsTypes&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListOSTypesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(GuestOSApi.class, "listOSTypes", ListOSTypesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListOSTypesOptions.Builder.OSCategoryId("11")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listOsTypes&listAll=true&oscategoryid=11 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiLiveTest.java
deleted file mode 100644
index 13400fe..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiLiveTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code HypervisorApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "HypervisorApiLiveTest")
-public class HypervisorApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public void testListHypervisors() throws Exception {
- Set<String> response = client.getHypervisorApi().listHypervisors();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (Zone zone : client.getZoneApi().listZones()) {
- Set<String> zoneHype = client.getHypervisorApi().listHypervisorsInZone(zone.getId());
- assert response.containsAll(zoneHype);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiTest.java
deleted file mode 100644
index 0cc1303..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/HypervisorApiTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.functions.ParseNamesFromHttpResponse;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code HypervisorApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "HypervisorApiTest")
-public class HypervisorApiTest extends BaseCloudStackApiTest<HypervisorApi> {
-
- public void testListHypervisors() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(HypervisorApi.class, "listHypervisors");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listHypervisors&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseNamesFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListHypervisorsInZon() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(HypervisorApi.class, "listHypervisorsInZone", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listHypervisors&listAll=true&zoneid=11 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseNamesFromHttpResponse.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java
deleted file mode 100644
index ce564a1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.accountInDomain;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.ISO;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.cloudstack.options.RegisterISOOptions;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack ISOApi
- */
-@Test(groups = "unit", testName = "ISOApiExpectTest")
-public class ISOApiExpectTest extends BaseCloudStackExpectTest<ISOApi> {
-
- private static final ISO iso1 = ISO.builder()
- .id("018e0928-8205-4d8e-9329-f731a9ccd488")
- .name("xs-tools.iso")
- .displayText("xen-pv-drv-iso")
- .isPublic(true)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-08-21T15:45:01+0530"))
- .isReady(true)
- .passwordEnabled(false)
- .bootable(false)
- .isFeatured(true)
- .crossZones(false)
- .account("system")
- .domain("ROOT")
- .domainid("9d189ea2-097e-4b2b-9bae-d885f5430d69")
- .isExtractable(false).build();
-
- private static final ISO iso2 = ISO.builder()
- .id("1e29244b-9cf0-4ff2-9978-677eb83f6bfb")
- .name("vmware-tools.iso")
- .displayText("VMware Tools Installer ISO")
- .isPublic(true)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-08-21T15:45:01+0530"))
- .isReady(true)
- .passwordEnabled(false)
- .bootable(false)
- .isFeatured(true)
- .crossZones(false)
- .account("system")
- .domain("ROOT")
- .domainid("9d189ea2-097e-4b2b-9bae-d885f5430d69")
- .isExtractable(false).build();
-
- HttpRequest listIsos = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listIsos")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "qUUF6hCDc57Bc/nHriS9umbZBKA%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- public void testListISOsWhenResponseIs2xx() {
- ISOApi client = requestSendsResponse(listIsos,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listisosresponse.json"))
- .build());
-
- assertEquals(client.listISOs().toString(), ImmutableSet.of(iso1, iso2).toString());
- }
-
- public void testListISOsWhenResponseIs404() {
- ISOApi client = requestSendsResponse(listIsos,
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listISOs(), ImmutableSet.of());
- }
-
- HttpRequest listIsosOptions = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listIsos")
- .addQueryParam("listAll", "true")
- .addQueryParam("account", "fred")
- .addQueryParam("domainid", "5")
- .addQueryParam("bootable", "true")
- .addQueryParam("hypervisor", "xen")
- .addQueryParam("id", "3")
- .addQueryParam("isofilter", "featured")
- .addQueryParam("ispublic", "true")
- .addQueryParam("isready", "true")
- .addQueryParam("keyword", "bob")
- .addQueryParam("name", "bob%27s%20iso")
- .addQueryParam("zoneid", "7")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "4S5ustbaBErEnpymWLSj1rEJ/nk%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- public void testListISOsOptionsWhenResponseIs2xx() {
- ISOApi client = requestSendsResponse(listIsosOptions,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listisosresponse.json"))
- .build());
-
- assertEquals(client.listISOs(accountInDomain("fred", "5").bootable().hypervisor("xen").id("3").isoFilter(ISO.ISOFilter.featured).isPublic().isReady().keyword("bob").name("bob's iso").zoneId("7")).toString(), ImmutableSet.of(iso1, iso2).toString());
- }
-
- HttpRequest getIso = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listIsos")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "018e0928-8205-4d8e-9329-f731a9ccd488")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "uZyPUJt6ThMDcQSDa%2BEv5LMs%2B2U%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- public void testGetISOWhenResponseIs2xx() {
- ISOApi client = requestSendsResponse(getIso,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/getisoresponse.json"))
- .build());
-
- assertEquals(client.getISO("018e0928-8205-4d8e-9329-f731a9ccd488").toString(), iso1.toString());
- }
-
- public void testGetISOWhenResponseIs404() {
- ISOApi client = requestSendsResponse(getIso,
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.getISO("018e0928-8205-4d8e-9329-f731a9ccd488"));
- }
-
- HttpRequest registerIso = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "registerIso")
- .addQueryParam("name", "ubuntu10.10")
- .addQueryParam("displaytext", "ubuntu 10.10 (32 bit)")
- .addQueryParam("url", "http://ubuntu/ubuntu-10.10.iso")
- .addQueryParam("zoneid", "1e0335d9-b6cc-4805-bddf-0828e66a0d01")
- .addQueryParam("account", "root")
- .addQueryParam("domainid", "99f4159b-c698-4bd9-b8c5-5ac462f101eb")
- .addQueryParam("bootable", "true")
- .addQueryParam("isextractable", "true")
- .addQueryParam("isfeatured", "true")
- .addQueryParam("ispublic", "true")
- .addQueryParam("ostypeid", "1234-abcd")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "YpFMYUUu0daLgwxNFubVfkV0Nw8%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- RegisterISOOptions registerISOOptions = RegisterISOOptions.Builder
- .accountInDomain("root", "99f4159b-c698-4bd9-b8c5-5ac462f101eb")
- .bootable(true).isExtractable(true).isFeatured(true).isPublic(true).osTypeId("1234-abcd");
-
- @Test
- public void testRegisterISOsWhenResponseIs2xx() {
- ISOApi client = requestSendsResponse(
- registerIso,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/registerisoresponse.json"))
- .build());
-
- assertEquals(client.registerISO("ubuntu10.10", "ubuntu 10.10 (32 bit)", "http://ubuntu/ubuntu-10.10.iso", "1e0335d9-b6cc-4805-bddf-0828e66a0d01",
- registerISOOptions),
- ISO.builder().id("b52c509d-c6e2-452c-b6ec-aa00720ed6cd").name("ubuntu10.10").displayText("ubuntu 10.10 (32 bit)").isPublic(true)
- .isReady(false).bootable(true).isFeatured(false).crossZones(false).osTypeId("0e0335d9-b6cc-4808-bddf-0828e66a0d03")
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-08-21T15:45:01+0530"))
- .osTypeName("Ubuntu 10.10 (32-bit)").account("root").domain("ROOT").domainid("99f4159b-c698-4bd9-b8c5-5ac462f101eb").status("")
- .account("admin").zoneId("6f9a2921-b22a-4149-8b71-6ffc275a2177").zoneName("Basic1")
- .isExtractable(false).build());
- }
-
- @Test(expectedExceptions = ResourceNotFoundException.class)
- public void testRegisterISOWhenResponseIs404() {
- ISOApi client = requestSendsResponse(registerIso,
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertNull(client.registerISO("ubuntu10.10", "ubuntu 10.10 (32 bit)", "http://ubuntu/ubuntu-10.10.iso", "1e0335d9-b6cc-4805-bddf-0828e66a0d01",
- registerISOOptions));
- }
-
- @Override
- protected ISOApi clientFrom(CloudStackContext context) {
- return context.getApi().getISOApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiLiveTest.java
deleted file mode 100644
index 93e6c01..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiLiveTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.ListZonesOptions.Builder.available;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ISO;
-import org.jclouds.cloudstack.domain.ISOPermissions;
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.DeleteISOOptions;
-import org.jclouds.cloudstack.options.ListISOsOptions;
-import org.jclouds.cloudstack.options.RegisterISOOptions;
-import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Optional;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@link ISOApi} and {@link ISOApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "ISOApiLiveTest")
-public class ISOApiLiveTest extends BaseCloudStackApiLiveTest {
-
- private static final String isoName = "jcloudsTestISO";
- private static final String url = System.getProperty("test.cloudstack.iso-url", "http://archive.ubuntu.com/ubuntu/dists/maverick/main/installer-i386/current/images/netboot/mini.iso");
-
- public void testListPublicISOs() throws Exception {
- Set<ISO> response = client.getISOApi().listISOs(ListISOsOptions.Builder.isPublic());
- assertNotNull(response);
- assertFalse(response.isEmpty());
- long isoCount = response.size();
- assertTrue(isoCount >= 0);
-
- for (ISO iso : response) {
- ISO query = client.getISOApi().getISO(iso.getId());
- assertEquals(query.getId(), iso.getId());
- }
- }
-
- public void testListISOPermissions() throws Exception {
- Set<ISO> response = client.getISOApi().listISOs(ListISOsOptions.Builder.isPublic());
- assertNotNull(response);
- assertFalse(response.isEmpty());
- long isoCount = response.size();
- assertTrue(isoCount >= 0);
-
- for (ISO iso : response) {
- ISOPermissions perms = client.getISOApi().listISOPermissions(iso.getId());
- assertNotNull(perms);
- }
- }
-
- public void testRegisterISO() throws Exception {
- Optional<OSType> guestOSTypeOptional = Iterables.tryFind(client.getGuestOSApi().listOSTypes(), Predicates.notNull());
- Optional<Zone> zoneOptional = Iterables.tryFind(client.getZoneApi().listZones(available(true)), Predicates.notNull());
- if (guestOSTypeOptional.isPresent() && zoneOptional.isPresent()) {
- String osTypeId = guestOSTypeOptional.get().getId();
- String zoneId = zoneOptional.get().getId();
- ISO iso = client.getISOApi().registerISO(isoName, "", url, zoneId, RegisterISOOptions.Builder.isPublic(true).osTypeId(osTypeId));
- assertNotNull(iso);
- assertNotNull(iso.getId());
- assertEquals(iso.getName(), isoName);
- } else {
- String skipMessage = String.format("Cannot register the iso with url: %s", url);
- if (zoneOptional.isPresent())
- skipMessage += " without a valid zone";
- else
- skipMessage += " without a valid guest OS type";
- throw new SkipException(skipMessage);
- }
- }
-
- @AfterClass
- @Override
- protected void tearDownContext() {
- Set<ISO> isos = client.getISOApi().listISOs(ListISOsOptions.Builder.name(isoName));
- for (ISO iso : isos) {
- client.getISOApi().deleteISO(iso.getId(), DeleteISOOptions.NONE);
- }
- super.tearDownContext();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiTest.java
deleted file mode 100644
index ef5cf8c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ISOApiTest.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.cloudstack.domain.ExtractMode;
-import org.jclouds.cloudstack.domain.PermissionOperation;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.DeleteISOOptions;
-import org.jclouds.cloudstack.options.ExtractISOOptions;
-import org.jclouds.cloudstack.options.UpdateISOOptions;
-import org.jclouds.cloudstack.options.UpdateISOPermissionsOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.Invokable;
-/**
- * Tests the behaviour of ISOApi.
- *
- * @see ISOApi
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
-@Test(groups = "unit", testName = "ISOApiTest")
-public class ISOApiTest extends BaseCloudStackApiTest<ISOApi> {
-
- public void testAttachISO() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "attachISO", String.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("3", "5"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=attachIso&id=3&virtualmachineid=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDetachISO() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "detachISO", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=detachIso&virtualmachineid=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateISO() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "updateISO", String.class, UpdateISOOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateIso&id=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateISOOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "updateISO", String.class, UpdateISOOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, UpdateISOOptions.Builder.bootable(true).displayText("robert").format("format").name("bob").osTypeId("9").passwordEnabled(true)));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateIso&id=3&bootable=true&displaytext=robert&format=format&name=bob&ostypeid=9&passwordenabled=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteISO() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "deleteISO", String.class, DeleteISOOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteIso&id=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteISOOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "deleteISO", String.class, DeleteISOOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, DeleteISOOptions.Builder.zoneId("5")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteIso&id=3&zoneid=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest copyIso = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "copyIso")
- .addQueryParam("id", "3")
- .addQueryParam("sourcezoneid", "5")
- .addQueryParam("destzoneid", "7")
- .build();
-
- public void testCopyISO() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "copyISO", String.class, String.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, 5, 7));
-
- assertRequestLineEquals(httpRequest, copyIso.getRequestLine());
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateISOPermissions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "updateISOPermissions", String.class, UpdateISOPermissionsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateIsoPermissions&id=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateISOPermissionsOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "updateISOPermissions", String.class, UpdateISOPermissionsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, UpdateISOPermissionsOptions.Builder.accounts(ImmutableSet.<String>of("fred", "bob")).isExtractable(true).isFeatured(true).isPublic(true).operation(PermissionOperation.add)));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateIsoPermissions&id=3&accounts=fred,bob&isextractable=true&isfeatured=true&ispublic=true&op=add HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListISOPermissions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "listISOPermissions", String.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listIsoPermissions&listAll=true&id=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListISOPermissionsOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "listISOPermissions", String.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, AccountInDomainOptions.Builder.accountInDomain("fred", "5")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listIsoPermissions&listAll=true&id=3&account=fred&domainid=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest extractIso = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "extractIso")
- .addQueryParam("id", "3")
- .addQueryParam("mode", "HTTP_DOWNLOAD")
- .addQueryParam("zoneid", "5")
- .build();
-
- public void testExtractISO() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "extractISO", String.class, ExtractMode.class, String.class, ExtractISOOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5));
-
- assertRequestLineEquals(httpRequest, extractIso.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest extractIsoOptions = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "extractIso")
- .addQueryParam("id", "3")
- .addQueryParam("mode", "HTTP_DOWNLOAD")
- .addQueryParam("zoneid", "5")
- .addQueryParam("url", "http://example.com/")
- .build();
-
- public void testExtractISOOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(ISOApi.class, "extractISO", String.class, ExtractMode.class, String.class, ExtractISOOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5, ExtractISOOptions.Builder.url("http://example.com/")));
-
- assertRequestLineEquals(httpRequest, extractIsoOptions.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiLiveTest.java
deleted file mode 100644
index 06749cc..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiLiveTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ResourceLimit;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code LimitApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "LimitApiLiveTest")
-public class LimitApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public void testListResourceLimits() {
- final Set<ResourceLimit> resourceLimits = client.getLimitApi().listResourceLimits();
-
- for (ResourceLimit resourceLimit : resourceLimits) {
- checkResourceLimit(resourceLimit);
- }
- }
-
- private void checkResourceLimit(ResourceLimit resourceLimit) {
- assert resourceLimit.getAccount() != null : resourceLimit;
- assert resourceLimit.getDomain() != null : resourceLimit;
- assert resourceLimit.getResourceType() != ResourceLimit.ResourceType.UNRECOGNIZED : resourceLimit;
- }
-}
[14/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addclusterresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addclusterresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addclusterresponse.json
deleted file mode 100644
index 635a651..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addclusterresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "addclusterresponse" : { "cluster" : {"warning":"this test data is fabricated","id":1,"name":"Xen Clust 1","podid":1,"podname":"Dev Pod 1","zoneid":1,"zonename":"Dev Zone 1","hypervisortype":"XenServer","clustertype":"CloudManaged","allocationstate":"Enabled","managedstate":"Managed"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addhostresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addhostresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addhostresponse.json
deleted file mode 100644
index 7508410..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addhostresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "addhostresponse" : { "host" :
- {"warning":"This test data is fabricated","id":1,"name":"cs2-xevsrv.alucloud.local","state":"Up","type":"Routing","ipaddress":"10.26.26.107","zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","version":"2.2.12.20110928142833","hypervisor":"XenServer","cpunumber":24,"cpuspeed":2266,"cpuallocated":"2.76%","cpuused":"0.1%","cpuwithoverprovisioning":"54384.0","networkkbsread":4443,"networkkbswrite":15048,"memorytotal":100549733760,"memoryallocated":3623878656,"memoryused":3623878656,"capabilities":"xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"clusterid":1,"clustername":"Xen Clust 1","clustertype":"CloudManaged","islocalstorageactive":false,"created":"2011-11-26T23:28:36+0200","events":"PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance;
ShutdownRequested; Ping","hosttags":"","hasEnoughCapacity":false,"allocationstate":"Enabled"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addsecondarystorageresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addsecondarystorageresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addsecondarystorageresponse.json
deleted file mode 100644
index d164d9a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/addsecondarystorageresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "addsecondarystorageresponse" : { "host" :
- {"warning":"this test data is fabricated","id":2,"name":"nfs://10.26.26.165/mnt/nfs/cs_sec","state":"Alert","disconnected":"2011-11-26T23:33:38+0200","type":"SecondaryStorage","ipaddress":"nfs","zoneid":1,"zonename":"Dev Zone 1","version":"2.2.12.20110928142833","hypervisor":"None","lastpinged":"1970-01-16T00:42:30+0200","islocalstorageactive":false,"created":"2011-11-26T23:33:38+0200","events":"ManagementServerDown; AgentDisconnected; Remove; MaintenanceRequested; AgentConnected; Ping","hasEnoughCapacity":false,"allocationstate":"Enabled"},
-} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/authorizesecuritygroupingressresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/authorizesecuritygroupingressresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/authorizesecuritygroupingressresponse.json
deleted file mode 100644
index e0280e4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/authorizesecuritygroupingressresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
- { "authorizesecuritygroupingressresponse" :
- {"jobid":"13330fc9-8b3e-4582-aa3e-90883c041010"} }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/cancelhostmaintenanceresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/cancelhostmaintenanceresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/cancelhostmaintenanceresponse.json
deleted file mode 100644
index 5c3b0d0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/cancelhostmaintenanceresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "cancelhostmaintenanceresponse" : {"warning":"this test data is fabricated","jobid":2036,"id":2017} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createdomainresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createdomainresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createdomainresponse.json
deleted file mode 100644
index c5882ab..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createdomainresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "createdomainresponse" : { "domain" :
- {"id":10,"name":"test","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createegressfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createegressfirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createegressfirewallrulesresponse.json
deleted file mode 100644
index 728952a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createegressfirewallrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createegressfirewallruleresponse" : {"jobid":2036,"id":2017} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createfirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createfirewallrulesresponse.json
deleted file mode 100644
index f6a727b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createfirewallrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createfirewallruleresponse" : {"jobid":2036,"id":2017} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createkeypairresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createkeypairresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createkeypairresponse.json
deleted file mode 100644
index 858277a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createkeypairresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createkeypairresponse" : { "keypair" : {"name":"vijay2-test","fingerprint":"80:61:58:5b:92:4c:1f:5a:4f:fc:1d:39:ea:28:06:c7","privatekey":"-----BEGIN RSA PRIVATE KEY-----\nMIICXAIBAAKBgQDTMxvFfEC+SAq4JD1sYx/EAtvzdKt1XY3yBFZ4iRRDCM30fK76\nQ5um9H+PhxzeGj5PVKPF409nq17BiNjM64qnmoHFVn2J+NFaiyo/oo2wohDDWUyn\noh7ifGd+AUfhaISnuAmEfhlgHxBhrTXsKmGe/x7lgwiyg25t84XYR38QiQIDAQAB\nAoGAGk5cYC3I1qqcgzEoYW67TyvX/6wBiz3a51E5AAx69JqNJK2/EbcIFTSRCuyW\nYOe96R2uxIA6rLwAsnR8JJIWE+5DdlSjp+Vrgp3p10YXU6FHdmX0Uwq+Gi9Ofg2E\nX1qGBJTVmV0BRCJCZcufNk+XPSUp7QQpstqd0Nxnc6dcEnECQQDzZ7PnP+7EKmk4\nNT0kN2V56dartYOookA20V6YMa2mcOmDw0Mhh3B3GlOjwkfVLtGfdxdz4gtcGtzz\nEpwjrRA1AkEA3iDKxmSyWQSl80KfVQQK2QZ52jHIJbuT5UlvCSvgb2XXxJ+gxjSh\n/V805IIZ+WMzWNkRQ1g786dhI1BUCv2xhQJBAKngB3vub8pyuwqihXCARQ9H9y3R\nufh4fI6FoxpfGY2fIip2naSJ7SECu7r/vbh4O46qxDB5Y2o9yVTP+S8g+r0CQDKA\nWhnJAxNiDyjDWN5HUQAOjN2iu9J4VyOmEmyPYTNygB/f+vmVNc8ZOjlJqwYcG6xz\njY02HktDHr6coL7u9tECQE8hJ04UbS2O4ruafhDUHNJ9/4ERzFyn1GWhcipK6ACE\nF4MrwQImqtsUvGjtA3X0s+lEj3+iL
JfJr02pfYpCyf8=\n-----END RSA PRIVATE KEY-----\n"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createpodresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createpodresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createpodresponse.json
deleted file mode 100644
index 925b0d4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createpodresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createpodresponse" : { "pod" : {"id":6,"name":"richard-pod","zoneid":10,"zonename":"richard-zone","gateway":"172.20.0.254","netmask":"255.255.255.0","startip":"172.20.0.1","endip":"172.20.0.250","allocationstate":"Enabled"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createportforwardingrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createportforwardingrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createportforwardingrulesresponse.json
deleted file mode 100644
index cf29e1c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createportforwardingrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createportforwardingruleresponse" : {"jobid":2035,"id":2015} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsecuritygroupresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsecuritygroupresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsecuritygroupresponse.json
deleted file mode 100644
index 99a2ad2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsecuritygroupresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "listsecuritygroupsresponse" : { "securitygroup" :
-{"id":30,"name":"jclouds-test","account":"adrian","domainid":1,"domain":"ROOT"}
- } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse-2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse-2.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse-2.json
deleted file mode 100644
index 3dfb3b4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse-2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "createsshkeypairresponse" : { "keypair" : {
- "name":"jclouds-test",
- "fingerprint":"1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b",
- "privatekey":"-----BEGIN RSA PRIVATE KEY-----\nMIICXgIBAAKBgQDZo/EF4Ew1uEW0raz7vCs28lBwy0UKV2Xr606gaEgxO7h9mSXZ\n4x2K/KQ1NMnrbjppxGycLh9EKPWAO3ezFULAyuOZW4Fy+xRS8+3MAijxBJY/KBgl\nx5rJm2ILumRkTNkMlLGCSBb9SOqYRN1VpOy7kn3StzU9LdJ/snKVE2JLHQIDAQAB\nAoGBAMnL5okKRd9xcsBqYIAxIuiZmNhcwTErhEdRMOAukPGFbDSYsa3rldLvGdpz\njd2LoQG8rO/LHBZ429kASqZzyiV+NvcgH+tFNJSVAigjSICfhEKF9PY2TiAkrg7S\nGyJgAjpPWQc2sQh0dE8EPEtBiq4ibXfMTDmbs1d/vnfdwtQJAkEA+AX5Y+xgWj74\ndYETmNLyLhNZpftLizEfIYj7lCVhsbFwVb8jbM1m8n8bxwGjls1w/ico1CWcQna+\nUnAfA8kJvwJBAOCj0YgDKpYd0OLQhvI3212J9QcQpJEkDOTYiMwXNHCNMKRpoF47\nMPPX+GG8YzUiQAi9/OG4pDKCjzQWE/ebiiMCQQCssnQ5WICqtggIwYykr9VDseON\nSFIMpHJ5xkjumazRrqx6eDGxc8BH/6uWwRRoT7pqrVeniFyqhsX03u8pkpU/AkBj\nWfCcwBHArNUqy2EzlWKuvwogosq16oTNXbs60HR/5uIBhTnJE1K2NemDiGc0I77A\nXw6N4jS0piuhtLYGB8OTAkEA50abdbduXWcr62Z6E8G/6LNFaNg0uBuVgwSHtJMd\ndNeUtVDHQCHSf3tvxXTAtaB9PCnGOfgm/dyYWEMf3rMoHQ==\n-----END RSA PRIVATE KEY-----\n"} } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse.json
deleted file mode 100644
index 65d68ea..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createsshkeypairresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "createsshkeypairresponse" : { "keypair" : {
- "name":"jclouds-keypair",
- "fingerprint":"1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b",
- "privatekey":"-----BEGIN RSA PRIVATE KEY-----\nMIICXgIBAAKBgQDZo/EF4Ew1uEW0raz7vCs28lBwy0UKV2Xr606gaEgxO7h9mSXZ\n4x2K/KQ1NMnrbjppxGycLh9EKPWAO3ezFULAyuOZW4Fy+xRS8+3MAijxBJY/KBgl\nx5rJm2ILumRkTNkMlLGCSBb9SOqYRN1VpOy7kn3StzU9LdJ/snKVE2JLHQIDAQAB\nAoGBAMnL5okKRd9xcsBqYIAxIuiZmNhcwTErhEdRMOAukPGFbDSYsa3rldLvGdpz\njd2LoQG8rO/LHBZ429kASqZzyiV+NvcgH+tFNJSVAigjSICfhEKF9PY2TiAkrg7S\nGyJgAjpPWQc2sQh0dE8EPEtBiq4ibXfMTDmbs1d/vnfdwtQJAkEA+AX5Y+xgWj74\ndYETmNLyLhNZpftLizEfIYj7lCVhsbFwVb8jbM1m8n8bxwGjls1w/ico1CWcQna+\nUnAfA8kJvwJBAOCj0YgDKpYd0OLQhvI3212J9QcQpJEkDOTYiMwXNHCNMKRpoF47\nMPPX+GG8YzUiQAi9/OG4pDKCjzQWE/ebiiMCQQCssnQ5WICqtggIwYykr9VDseON\nSFIMpHJ5xkjumazRrqx6eDGxc8BH/6uWwRRoT7pqrVeniFyqhsX03u8pkpU/AkBj\nWfCcwBHArNUqy2EzlWKuvwogosq16oTNXbs60HR/5uIBhTnJE1K2NemDiGc0I77A\nXw6N4jS0piuhtLYGB8OTAkEA50abdbduXWcr62Z6E8G/6LNFaNg0uBuVgwSHtJMd\ndNeUtVDHQCHSf3tvxXTAtaB9PCnGOfgm/dyYWEMf3rMoHQ==\n-----END RSA PRIVATE KEY-----\n"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse-imageextension.json
deleted file mode 100644
index bcbba70..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse-imageextension.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createtemplateresponse" : {"id":"3dc6ce25-a6cf-4d60-a664-3499993b511b","jobid":"4e345230-8fcc-48a3-8a37-c5fe960df671"} }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse.json
deleted file mode 100644
index bcbba70..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createtemplateresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createtemplateresponse" : {"id":"3dc6ce25-a6cf-4d60-a664-3499993b511b","jobid":"4e345230-8fcc-48a3-8a37-c5fe960df671"} }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createvlaniprangeresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createvlaniprangeresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createvlaniprangeresponse.json
deleted file mode 100644
index b463074..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createvlaniprangeresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "createvlaniprangeresponse" : { "vlaniprange" : {"id":2,"forvirtualnetwork":false,"zoneid":2,"vlan":"untagged","account":"system","domainid":1,"domain":"ROOT","podid":2,"podname":"Dev Pod 2","gateway":"10.22.22.254","netmask":"255.255.255.0","startip":"10.22.22.51","endip":"10.22.22.100","networkid":209} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createzoneresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createzoneresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createzoneresponse.json
deleted file mode 100644
index a4b9604..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/createzoneresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "createzoneresponse" : { "zone" :
- {"id":6,"name":"test-zone","dns1":"8.8.8.8","internaldns1":"10.10.10.10","networktype":"Basic",
- "securitygroupsenabled":true,"allocationstate":"Enabled","zonetoken":"7b6e27df-30a6-3024-9d8b-7971a3127f64",
- "dhcpprovider":"DhcpServer"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletedomainresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletedomainresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletedomainresponse.json
deleted file mode 100644
index d617a15..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletedomainresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deletedomainresponse" : {"jobid":2413} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteegressfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteegressfirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteegressfirewallrulesresponse.json
deleted file mode 100644
index bde4289..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteegressfirewallrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deleteegressfirewallruleresponse" : {"jobid":2037} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletefirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletefirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletefirewallrulesresponse.json
deleted file mode 100644
index abf5b6d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletefirewallrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deletefirewallruleresponse" : {"jobid":2037} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteipforwardingruleresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteipforwardingruleresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteipforwardingruleresponse.json
deleted file mode 100644
index ae9e7c8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteipforwardingruleresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deleteipforwardingruleresponse" : {"jobid":50005} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletenetworkresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletenetworkresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletenetworkresponse.json
deleted file mode 100644
index 8902011..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletenetworkresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deletenetworkresponse" : {"jobid":45612} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteportforwardingrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteportforwardingrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteportforwardingrulesresponse.json
deleted file mode 100644
index 552ad94..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deleteportforwardingrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deleteportforwardingruleresponse" : {"jobid":2038} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletesecuritygroupresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletesecuritygroupresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletesecuritygroupresponse.json
deleted file mode 100644
index d6e0f36..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletesecuritygroupresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deletesecuritygroupresponse" : { "success" : "true"} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletetemplateresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletetemplateresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletetemplateresponse.json
deleted file mode 100644
index 995ed4b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletetemplateresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : {"jobid":118,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"success":true}} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletezoneresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletezoneresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletezoneresponse.json
deleted file mode 100644
index 93d68e2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deletezoneresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deletezoneresponse" : { "success" : "true"} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse.json
deleted file mode 100644
index 3b7bf7a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "deployvirtualmachine" : {"id":1234, "jobid":50006} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse4x.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse4x.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse4x.json
deleted file mode 100644
index cf04a8d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/deployvirtualmachineresponse4x.json
+++ /dev/null
@@ -1 +0,0 @@
- { "deployvirtualmachineresponse" : {"id":"1cce6cb7-2268-47ff-9696-d9e610f6619a","jobid":"13330fc9-8b3e-4582-aa3e-90883c041ff0"}, "cloudstack-version": "4.1.0-SNAPSHOT" }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/disablestaticnatresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/disablestaticnatresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/disablestaticnatresponse.json
deleted file mode 100644
index 5bfd5a0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/disablestaticnatresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "disablestaticnatresponse" : {"jobid":50006} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/enablestaticnatresponse-withoutjob.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/enablestaticnatresponse-withoutjob.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/enablestaticnatresponse-withoutjob.json
deleted file mode 100644
index d473153..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/enablestaticnatresponse-withoutjob.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "enablestaticnatresponse" : { "success" : "true"} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getdomainresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getdomainresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getdomainresponse.json
deleted file mode 100644
index a3baf57..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getdomainresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listdomainsresponse" : { "count":1 ,"domain" : [
- {"id":1,"name":"ROOT","level":0,"haschild":true} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getegressfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getegressfirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getegressfirewallrulesresponse.json
deleted file mode 100644
index bc14994..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getegressfirewallrulesresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listegressfirewallrulesresponse" : { "count":1 ,"firewallrule" : [
- {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getfirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getfirewallrulesresponse.json
deleted file mode 100644
index 88d3d47..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getfirewallrulesresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listfirewallrulesresponse" : { "count":1 ,"firewallrule" : [
- {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getisoresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getisoresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getisoresponse.json
deleted file mode 100644
index e54a578..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getisoresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listisosresponse" : { "count":1 ,"iso" : [ {"id":"018e0928-8205-4d8e-9329-f731a9ccd488","name":"xs-tools.iso","displaytext":"xen-pv-drv-iso","ispublic":true,"created":"2012-08-21T15:45:01+0530","isready":true,"passwordenabled":false,"bootable":false,"isfeatured":true,"crossZones":false,"account":"system","domain":"ROOT","domainid":"9d189ea2-097e-4b2b-9bae-d885f5430d69","isextractable":false,"tags":[]} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getportforwardingrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getportforwardingrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getportforwardingrulesresponse.json
deleted file mode 100644
index 3ea044d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getportforwardingrulesresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listportforwardingrulesresponse" : { "portforwardingrule" : [
- {"id":15,"privateport":"22","protocol":"tcp","publicport":"2022","virtualmachineid":3,"virtualmachinename":"i-3-3-VM","ipaddressid":3,"ipaddress":"72.52.126.32","state":"Active","cidrlist":"0.0.0.0/1,128.0.0.0/1"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse.json
deleted file mode 100644
index 27743ed..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listsecuritygroupsresponse" : { count: 0, "securitygroup" : [ { } ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid.json
deleted file mode 100644
index 5990627..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listsecuritygroupsresponse" : { "securitygroup" : [ {"id":13,"name":"default","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":5,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"adriancole","account":"adrian"},{"ruleid":6,"protocol":"udp","startport":11,"endport":11,"cidr":"1.1.1.1/24"}]} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_empty.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_empty.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_empty.json
deleted file mode 100644
index e4143ae..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_empty.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listsecuritygroupsresponse" : { "securitygroup" : [ {"id":13,"name":"default","description":"description","account":"adrian","domainid":1,"domain":"ROOT"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_cidr.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_cidr.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_cidr.json
deleted file mode 100644
index 4c8d56a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_cidr.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listsecuritygroupsresponse" : { "securitygroup" : [ {"id":13,"name":"default","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":6,"protocol":"udp","startport":11,"endport":11,"cidr":"1.1.1.1/24"}]} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_group.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_group.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_group.json
deleted file mode 100644
index 1e84406..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getsecuritygroupresponse_extension_byid_with_group.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listsecuritygroupsresponse" : { "securitygroup" : [ {"id":13,"name":"default","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":5,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"adriancole","account":"adrian"}] }] }}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getvmpasswordresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getvmpasswordresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getvmpasswordresponse.json
deleted file mode 100644
index 693018f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getvmpasswordresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "getvmpasswordresponse" : { "password" :
- {"encryptedpassword":"EFOwm8icZ4sEib4y6ntVHUKHZJQrGBdyPkL1L9lpFHYhs3JfAtL5E5bxBP5Er27bJyOZPjKFcInX\r\npQ0LZlQBZDd5/ac0NSoM6tAX3H30pYxNw4t2f9u8aJ48oOEvufgGxTTHnM9qHXD04lt+Ouql6i2q\r\nHxBqCxFkMZEla3LFieE=\r\n"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse-2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse-2.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse-2.json
deleted file mode 100644
index 7261716..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse-2.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listzonesresponse" : { "zone" : [ {"id":2,"name":"Chicago","networktype":"Advanced","securitygroupsenabled":true} ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse.json
deleted file mode 100644
index 65dc925..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/getzoneresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listzonesresponse" : { "zone" : [ {"id":1,"name":"San Jose 1","networktype":"Advanced","securitygroupsenabled":false} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listaccountsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listaccountsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listaccountsresponse.json
deleted file mode 100644
index 68c3074..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listaccountsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listaccountsresponse" : { "count":1 ,"account" : [ {"id":505,"name":"jclouds","accounttype":0,"domainid":457,"domain":"AA000062-jclouds-dev","receivedbytes":318900216,"sentbytes":23189677,"vmlimit":"15","vmtotal":1,"vmavailable":"14","iplimit":"15","iptotal":0,"ipavailable":"15","volumelimit":"90","volumetotal":2,"volumeavailable":"88","snapshotlimit":"250","snapshottotal":0,"snapshotavailable":"250","templatelimit":"15","templatetotal":0,"templateavailable":"15","vmstopped":0,"vmrunning":1,"state":"enabled","user":[{"id":505,"username":"jclouds","firstname":"Adrian","lastname":"Cole","email":"adrian@jclouds.org","created":"2011-04-19T01:57:24+0000","state":"enabled","account":"jclouds","accounttype":0,"domainid":457,"domain":"AA000062-jclouds-dev","apikey":"APIKEY","secretkey":"SECRETKEY"}]} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listalertsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listalertsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listalertsresponse.json
deleted file mode 100644
index d2ccf72..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listalertsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listalertsresponse" : { "count":1 ,"alert" : [ {"id":20,"type":7,"description":"Failed to deploy Vm with Id: 52","sent":"2011-12-04T10:05:02+0200"} ] } }
\ No newline at end of file
[32/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java
deleted file mode 100644
index b551f05..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what port forwarding rules are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/listPortForwardingRules.html"
- * />
- */
-public class ListPortForwardingRulesOptions extends AccountInDomainOptions {
-
- public static final ListPortForwardingRulesOptions NONE = new ListPortForwardingRulesOptions();
-
- /**
- * @param id
- * lists rule with the specified ID
- */
- public ListPortForwardingRulesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param IPAddressId
- * list the rule belonging to this public ip address
- */
- public ListPortForwardingRulesOptions ipAddressId(String IPAddressId) {
- this.queryParameters.replaceValues("ipaddressid", ImmutableSet.of(IPAddressId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * list the rules in this project
- */
- public ListPortForwardingRulesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
-
- }
- public static class Builder {
-
- /**
- * @see ListPortForwardingRulesOptions#id
- */
- public static ListPortForwardingRulesOptions id(String id) {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListPortForwardingRulesOptions#ipAddressId
- */
- public static ListPortForwardingRulesOptions ipAddressId(String ipAddressId) {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions();
- return options.ipAddressId(ipAddressId);
- }
-
- /**
- * @see ListPortForwardingRulesOptions#projectId(String)
- */
- public static ListPortForwardingRulesOptions projectId(String projectId) {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions();
- return options.projectId(projectId);
- }
-
- /**
- * @see ListPortForwardingRulesOptions#accountInDomain
- */
- public static ListPortForwardingRulesOptions accountInDomain(String account, String domain) {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListPortForwardingRulesOptions#domainId
- */
- public static ListPortForwardingRulesOptions domainId(String id) {
- ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions();
- return options.domainId(id);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListPortForwardingRulesOptions accountInDomain(String account, String domain) {
- return ListPortForwardingRulesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListPortForwardingRulesOptions domainId(String domainId) {
- return ListPortForwardingRulesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListProjectsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListProjectsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListProjectsOptions.java
deleted file mode 100644
index 7b0b2ff..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListProjectsOptions.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what account information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/3.0.6/api_3.0.6/root_admin/listProjects.html"
- * />
- */
-public class ListProjectsOptions extends AccountInDomainOptions {
-
- public static final ListProjectsOptions NONE = new ListProjectsOptions();
-
- /**
- * @param id
- * list projects by project ID
- */
- public ListProjectsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id));
- return this;
- }
-
- /**
- * @param name
- * list project by project name
- */
- public ListProjectsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param state
- * list projects by state. Valid states are enabled, disabled, and
- * locked.
- */
- public ListProjectsOptions state(String state) {
- this.queryParameters.replaceValues("state", ImmutableSet.of(state));
- return this;
- }
-
- /**
- * @param displayText
- * list projects by displayText.
- */
- public ListProjectsOptions displayText(String displayText) {
- this.queryParameters.replaceValues("displaytext", ImmutableSet.of(displayText));
- return this;
- }
-
- /**
- * @param keyword
- * list projects by keyword.
- */
- public ListProjectsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param recursive
- * defaults to false, but if true, lists all projects from the
- * parent specified by the domain id till leaves.
- */
- public ListProjectsOptions recursive(boolean recursive) {
- this.queryParameters.replaceValues("isrecursive", ImmutableSet.of(recursive + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#accountInDomain(String, String)
- */
- public static ListProjectsOptions accountInDomain(String project, String domain) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.accountInDomain(project, domain);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#domainId
- */
- public static ListProjectsOptions domainId(String domainId) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.domainId(domainId);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#id
- */
- public static ListProjectsOptions id(String id) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.id(id);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#name
- */
- public static ListProjectsOptions name(String name) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.name(name);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#state
- */
- public static ListProjectsOptions state(String state) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.state(state);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#displayText(String)
- */
- public static ListProjectsOptions displayText(String displayText) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.displayText(displayText);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#keyword(String)
- */
- public static ListProjectsOptions keyword(String keyword) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListProjectsOptions#recursive
- */
- public static ListProjectsOptions recursive(boolean recursive) {
- ListProjectsOptions options = new ListProjectsOptions();
- return options.recursive(recursive);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListProjectsOptions accountInDomain(String account, String domain) {
- return ListProjectsOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListProjectsOptions domainId(String domainId) {
- return ListProjectsOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java
deleted file mode 100644
index 0cb38e9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what ip addresss information is returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/listIPAddresses.html"
- * />
- */
-public class ListPublicIPAddressesOptions extends AccountInDomainOptions {
-
- public static final ListPublicIPAddressesOptions NONE = new ListPublicIPAddressesOptions();
-
- /**
- * @param id
- * lists ip address by id
- */
- public ListPublicIPAddressesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param allocatedOnly
- * limits search results to allocated public IP addresses
- */
- public ListPublicIPAddressesOptions allocatedOnly(boolean allocatedOnly) {
- this.queryParameters.replaceValues("allocatedonly", ImmutableSet.of(allocatedOnly + ""));
- return this;
-
- }
-
- /**
- * @param networkId
- * list ip addresss by networkId.
- */
- public ListPublicIPAddressesOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkid", ImmutableSet.of(networkId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * list ip addresss by project.
- */
- public ListPublicIPAddressesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
-
- }
-
- /**
- * @param VLANId
- * lists all public IP addresses by VLAN ID
- */
- public ListPublicIPAddressesOptions VLANId(String VLANId) {
- this.queryParameters.replaceValues("vlanid", ImmutableSet.of(VLANId + ""));
- return this;
-
- }
-
- /**
- * @param IPAddress
- * lists the specified IP address
- */
- public ListPublicIPAddressesOptions IPAddress(String IPAddress) {
- this.queryParameters.replaceValues("ipaddress", ImmutableSet.of(IPAddress));
- return this;
- }
-
- /**
- * @param zoneId
- * lists all public IP addresses by Zone ID
- */
- public ListPublicIPAddressesOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
-
- }
-
- /**
- * @param usesVirtualNetwork
- * the virtual network for the IP address
- */
- public ListPublicIPAddressesOptions usesVirtualNetwork(boolean usesVirtualNetwork) {
- this.queryParameters.replaceValues("forvirtualnetwork", ImmutableSet.of(usesVirtualNetwork + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListPublicIPAddressesOptions#accountInDomain
- */
- public static ListPublicIPAddressesOptions accountInDomain(String account, String domain) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#IPAddress
- */
- public static ListPublicIPAddressesOptions IPAddress(String IPAddress) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.IPAddress(IPAddress);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#domainId
- */
- public static ListPublicIPAddressesOptions domainId(String id) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#id
- */
- public static ListPublicIPAddressesOptions id(String id) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#allocatedOnly
- */
- public static ListPublicIPAddressesOptions allocatedOnly(boolean allocatedOnly) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.allocatedOnly(allocatedOnly);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#networkId
- */
- public static ListPublicIPAddressesOptions networkId(String id) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.networkId(id);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#projectId(String)
- */
- public static ListPublicIPAddressesOptions projectId(String id) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.projectId(id);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#VLANId
- */
- public static ListPublicIPAddressesOptions VLANId(String id) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.VLANId(id);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#zoneId
- */
- public static ListPublicIPAddressesOptions zoneId(String id) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.zoneId(id);
- }
-
- /**
- * @see ListPublicIPAddressesOptions#usesVirtualNetwork
- */
- public static ListPublicIPAddressesOptions usesVirtualNetwork(boolean usesVirtualNetwork) {
- ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions();
- return options.usesVirtualNetwork(usesVirtualNetwork);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListPublicIPAddressesOptions accountInDomain(String account, String domain) {
- return ListPublicIPAddressesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListPublicIPAddressesOptions domainId(String domainId) {
- return ListPublicIPAddressesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java
deleted file mode 100644
index d669c4d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-public class ListResourceLimitsOptions extends BaseHttpRequestOptions {
- public static final ListResourceLimitsOptions NONE = new ListResourceLimitsOptions();
-
- /**
- * Lists resource limits by account. Must be used with the domainId parameter.
- *
- * @param account - the account for which the resource limits are retrieved for.
- * @return ListResourceLimitsOptions
- */
- public ListResourceLimitsOptions account(String account, String domainId) {
- this.queryParameters.replaceValues("account", ImmutableSet.of(account));
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(String.valueOf(domainId)));
- return this;
- }
-
- /**
- * Lists resource limits by domain ID. If used with the account parameter,
- * lists resource limits for a specified account in a specified domain.
- *
- * @param domainId
- * @return ListResourceLimitsOptions
- */
- public ListResourceLimitsOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(String.valueOf(domainId)));
- return this;
- }
-
- /**
- * Lists resource limits by ID.
- *
- * @param id of the resource limit.
- * @return ListResourceLimitsOptions
- */
- public ListResourceLimitsOptions id(String id) {
- this.queryParameters.replaceValues("account", ImmutableSet.of(String.valueOf(id)));
- return this;
- }
-
- /**
- * Lists resource limits by project.
- *
- * @param projectId the project
- * @return ListResourceLimitsOptions
- */
- public ListResourceLimitsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(String.valueOf(projectId + "")));
- return this;
- }
-
- /**
- * List by keyword
- *
- * @param keyword
- * @return ListResourceLimitsOptions
- */
- public ListResourceLimitsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * Type of resource to update. Values are 0, 1, 2, 3, and 4.
- * <ul>
- * <li>0 - Instance. Number of instances a user can create.</li>
- * <li>1 - IP. Number of public IP addresses a user can own.</li>
- * <li>2 - Volume. Number of disk volumes a user can create.</li>
- * <li>3 - Snapshot. Number of snapshots a user can create.</li>
- * <li>4 - Template. Number of templates that a user can register/create.</li>
- * </ul>
- *
- * @param resourceType type of the resource to query for
- * @return ListResourceLimitsOptions
- */
- public ListResourceLimitsOptions resourceType(int resourceType) {
- this.queryParameters.replaceValues("resourcetype", ImmutableSet.of(String.valueOf(resourceType)));
- return this;
- }
-
-
- public static class Builder {
- /**
- * @see ListResourceLimitsOptions#account(String, String)
- */
- public static ListResourceLimitsOptions account(String account, String domainId) {
- ListResourceLimitsOptions options = new ListResourceLimitsOptions();
- return options.account(account, domainId);
- }
-
- /**
- * @see ListResourceLimitsOptions#domainId(String)
- */
- public static ListResourceLimitsOptions domainId(String domainId) {
- ListResourceLimitsOptions options = new ListResourceLimitsOptions();
- return options.domainId(domainId);
- }
-
- /**
- * @see ListResourceLimitsOptions#id(String)
- */
- public static ListResourceLimitsOptions id(String id) {
- ListResourceLimitsOptions options = new ListResourceLimitsOptions();
- return options.id(id);
- }
-
- /**
- * @see ListResourceLimitsOptions#projectId(String)
- */
- public static ListResourceLimitsOptions projectId(String projectId) {
- ListResourceLimitsOptions options = new ListResourceLimitsOptions();
- return options.projectId(projectId);
- }
-
- /**
- * @see ListResourceLimitsOptions#keyword(String)
- */
- public static ListResourceLimitsOptions keyword(String keyword) {
- ListResourceLimitsOptions options = new ListResourceLimitsOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListResourceLimitsOptions#resourceType(int)
- */
- public static ListResourceLimitsOptions resourceType(int resourceType) {
- ListResourceLimitsOptions options = new ListResourceLimitsOptions();
- return options.resourceType(resourceType);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java
deleted file mode 100644
index fc73828..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-public class ListSSHKeyPairsOptions extends BaseHttpRequestOptions {
-
- public static final ListSSHKeyPairsOptions NONE = new ListSSHKeyPairsOptions();
-
- /**
- * @param name
- * the SSHKeyPair name
- */
- public ListSSHKeyPairsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param projectId
- * the project to list in
- */
- public ListSSHKeyPairsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectId", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public static class Builder {
- /**
- * @see ListSSHKeyPairsOptions#name
- */
- public static ListSSHKeyPairsOptions name(String name) {
- ListSSHKeyPairsOptions options = new ListSSHKeyPairsOptions();
- return options.name(name);
- }
-
- /**
- * @see ListSSHKeyPairsOptions#projectId(String)
- */
- public static ListSSHKeyPairsOptions projectId(String projectId) {
- ListSSHKeyPairsOptions options = new ListSSHKeyPairsOptions();
- return options.projectId(projectId);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java
deleted file mode 100644
index d9e22c3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what security groups are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/listSecurityGroups.html"
- * />
- */
-public class ListSecurityGroupsOptions extends AssociateIPAddressOptions {
-
- public static final ListSecurityGroupsOptions NONE = new ListSecurityGroupsOptions();
-
- /**
- * @param id
- * the ID of the security group
- */
- public ListSecurityGroupsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param securityGroupName
- * lists security groups by name
- */
- public ListSecurityGroupsOptions named(String securityGroupName) {
- this.queryParameters.replaceValues("securitygroupname", ImmutableSet.of(securityGroupName));
- return this;
- }
-
- /**
- * @param virtualMachineId
- * the ID of the virtual machine. Pass this in if you want to see
- * the available service offering that a virtual machine can be
- * changed to.
- */
- public ListSecurityGroupsOptions virtualMachineId(String virtualMachineId) {
- this.queryParameters.replaceValues("virtualmachineid", ImmutableSet.of(virtualMachineId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * the ID of the project to search in.
- */
- public ListSecurityGroupsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListSecurityGroupsOptions#named
- */
- public static ListSecurityGroupsOptions named(String securityGroupName) {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions();
- return options.named(securityGroupName);
- }
-
- /**
- * @see ListSecurityGroupsOptions#id
- */
- public static ListSecurityGroupsOptions id(String id) {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions();
- return options.id(id);
- }
-
- /**
- * @see ListSecurityGroupsOptions#virtualMachineId
- */
- public static ListSecurityGroupsOptions virtualMachineId(String virtualMachineId) {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions();
- return options.virtualMachineId(virtualMachineId);
- }
-
- /**
- * @see ListSecurityGroupsOptions#projectId(String)
- */
- public static ListSecurityGroupsOptions projectId(String projectId) {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions();
- return options.projectId(projectId);
- }
-
- /**
- * @see DeployVirtualMachineOptions#accountInDomain
- */
- public static ListSecurityGroupsOptions accountInDomain(String account, String domain) {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see DeployVirtualMachineOptions#domainId
- */
- public static ListSecurityGroupsOptions domainId(String domainId) {
- ListSecurityGroupsOptions options = new ListSecurityGroupsOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListSecurityGroupsOptions accountInDomain(String account, String domain) {
- return ListSecurityGroupsOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListSecurityGroupsOptions domainId(String domainId) {
- return ListSecurityGroupsOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java
deleted file mode 100644
index c815fa3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what service offerings are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/listServiceOfferings.html"
- * />
- */
-public class ListServiceOfferingsOptions extends BaseHttpRequestOptions {
-
- public static final ListServiceOfferingsOptions NONE = new ListServiceOfferingsOptions();
-
- /**
- * @param id
- * the ID of the service offering
- */
- public ListServiceOfferingsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param domainId
- * the ID of the domain associated with the service offering
- */
- public ListServiceOfferingsOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
-
- }
-
- /**
- * @param name
- * the service offering name
- */
- public ListServiceOfferingsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param virtualMachineId
- * the ID of the virtual machine. Pass this in if you want to see
- * the available service offering that a virtual machine can be
- * changed to.
- */
- public ListServiceOfferingsOptions virtualMachineId(String virtualMachineId) {
- this.queryParameters.replaceValues("virtualmachineid", ImmutableSet.of(virtualMachineId + ""));
- return this;
-
- }
-
- public static class Builder {
-
- /**
- * @see ListServiceOfferingsOptions#name
- */
- public static ListServiceOfferingsOptions name(String name) {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions();
- return options.name(name);
- }
-
- /**
- * @see ListServiceOfferingsOptions#domainId
- */
- public static ListServiceOfferingsOptions domainId(String id) {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListServiceOfferingsOptions#id
- */
- public static ListServiceOfferingsOptions id(String id) {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions();
- return options.id(id);
- }
-
- /**
- * @see ListServiceOfferingsOptions#virtualMachineId
- */
- public static ListServiceOfferingsOptions virtualMachineId(String virtualMachineId) {
- ListServiceOfferingsOptions options = new ListServiceOfferingsOptions();
- return options.virtualMachineId(virtualMachineId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java
deleted file mode 100644
index 2feda8b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the Snapshot listSnapshotPolicies method.
- *
- * @see org.jclouds.cloudstack.features.SnapshotApi#listSnapshotPolicies
- * @see org.jclouds.cloudstack.features.SnapshotApi#listSnapshotPolicies
- */
-public class ListSnapshotPoliciesOptions extends AccountInDomainOptions {
-
- public static final ListSnapshotPoliciesOptions NONE = new ListSnapshotPoliciesOptions();
-
- /**
- * @param keyword List by keyword
- */
- public ListSnapshotPoliciesOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param account lists snapshot policies for the specified account.
- */
- public static ListSnapshotPoliciesOptions accountInDomain(String account, String domainId) {
- return (ListSnapshotPoliciesOptions) new ListSnapshotPoliciesOptions().accountInDomain(account, domainId);
- }
-
- /**
- * @param domainId the domain ID.
- */
- public static ListSnapshotPoliciesOptions domainId(String domainId) {
- return (ListSnapshotPoliciesOptions) new ListSnapshotPoliciesOptions().domainId(domainId);
- }
-
- /**
- * @param keyword List by keyword
- */
- public static ListSnapshotPoliciesOptions keyword(String keyword) {
- return new ListSnapshotPoliciesOptions().keyword(keyword);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java
deleted file mode 100644
index fa366d0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.Snapshot;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the Snapshot listSnapshots method.
- *
- * @see org.jclouds.cloudstack.features.SnapshotApi#listSnapshots
- * @see org.jclouds.cloudstack.features.SnapshotApi#listSnapshots
- */
-public class ListSnapshotsOptions extends AccountInDomainOptions {
-
- public static final ListSnapshotsOptions NONE = new ListSnapshotsOptions();
-
- /**
- * @param id lists snapshot by snapshot ID
- */
- public ListSnapshotsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param interval valid values are HOURLY, DAILY, WEEKLY, and MONTHLY.
- */
- public ListSnapshotsOptions interval(Snapshot.Interval interval) {
- this.queryParameters.replaceValues("intervaltype", ImmutableSet.of(interval + ""));
- return this;
- }
-
- /**
- * @param isRecursive defaults to false, but if true, lists all snapshots from the parent specified by the domain id till leaves.
- */
- public ListSnapshotsOptions isRecursive(boolean isRecursive) {
- this.queryParameters.replaceValues("isrecursive", ImmutableSet.of(isRecursive + ""));
- return this;
- }
-
- /**
- * @param keyword List by keyword
- */
- public ListSnapshotsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword + ""));
- return this;
- }
-
- /**
- * @param name lists snapshot by snapshot name
- */
- public ListSnapshotsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name + ""));
- return this;
- }
-
- /**
- * @param snapshotType valid values are MANUAL or RECURRING.
- */
- public ListSnapshotsOptions snapshotType(Snapshot.Type snapshotType) {
- this.queryParameters.replaceValues("snapshottype", ImmutableSet.of(snapshotType + ""));
- return this;
- }
-
- /**
- * @param volumeId the ID of the disk volume
- */
- public ListSnapshotsOptions volumeId(String volumeId) {
- this.queryParameters.replaceValues("volumeid", ImmutableSet.of(volumeId + ""));
- return this;
- }
-
- /**
- * @param projectId the project to list in
- */
- public ListSnapshotsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param account lists snapshot belonging to the specified account.
- * @param domainId The domain ID.
- */
- public static ListSnapshotsOptions accountInDomain(String account, String domainId) {
- return (ListSnapshotsOptions) new ListSnapshotsOptions().accountInDomain(account, domainId);
- }
-
- /**
- * @param domainId the domain ID.
- */
- public static ListSnapshotsOptions domainId(String domainId) {
- return (ListSnapshotsOptions) new ListSnapshotsOptions().domainId(domainId);
- }
-
- /**
- * @param id lists snapshot by snapshot ID
- */
- public static ListSnapshotsOptions id(String id) {
- return new ListSnapshotsOptions().id(id);
- }
-
- /**
- * @param interval valid values are HOURLY, DAILY, WEEKLY, and MONTHLY.
- */
- public static ListSnapshotsOptions interval(Snapshot.Interval interval) {
- return new ListSnapshotsOptions().interval(interval);
- }
-
- /**
- * @param isRecursive defaults to false, but if true, lists all snapshots from the parent specified by the domain id till leaves.
- */
- public static ListSnapshotsOptions isRecursive(boolean isRecursive) {
- return new ListSnapshotsOptions().isRecursive(isRecursive);
- }
-
- /**
- * @param keyword List by keyword
- */
- public static ListSnapshotsOptions keyword(String keyword) {
- return new ListSnapshotsOptions().keyword(keyword);
- }
-
- /**
- * @param name lists snapshot by snapshot name
- */
- public static ListSnapshotsOptions name(String name) {
- return new ListSnapshotsOptions().name(name);
- }
-
- /**
- * @param snapshotType valid values are MANUAL or RECURRING.
- */
- public static ListSnapshotsOptions snapshotType(Snapshot.Type snapshotType) {
- return new ListSnapshotsOptions().snapshotType(snapshotType);
- }
-
- /**
- * @param volumeId the ID of the disk volume
- */
- public static ListSnapshotsOptions volumeId(String volumeId) {
- return new ListSnapshotsOptions().volumeId(volumeId);
- }
-
- /**
- * @param projectId the project to list in
- */
- public static ListSnapshotsOptions projectId(String projectId) {
- return new ListSnapshotsOptions().projectId(projectId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java
deleted file mode 100644
index 4a372cb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalStoragePools[Async]Client.listStoragePools API call
- */
-public class ListStoragePoolsOptions extends BaseHttpRequestOptions {
-
- public static ListStoragePoolsOptions NONE = new ListStoragePoolsOptions();
-
- public static class Builder {
-
- private Builder() {}
-
- public static ListStoragePoolsOptions clusterId(String clusterId) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.clusterId(clusterId);
- }
-
- public static ListStoragePoolsOptions id(String id) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.id(id);
- }
-
- public static ListStoragePoolsOptions ipAddress(String ipAddress) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.ipAddress(ipAddress);
- }
-
- public static ListStoragePoolsOptions keyword(String keyword) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.keyword(keyword);
- }
-
- public static ListStoragePoolsOptions name(String name) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.name(name);
- }
-
- public static ListStoragePoolsOptions path(String path) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.path(path);
- }
-
- public static ListStoragePoolsOptions podId(String podId) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.podId(podId);
- }
-
- public static ListStoragePoolsOptions zoneId(String zoneId) {
- ListStoragePoolsOptions options = new ListStoragePoolsOptions();
- return options.zoneId(zoneId);
- }
- }
-
- ListStoragePoolsOptions() {}
-
- public ListStoragePoolsOptions clusterId(String clusterId) {
- this.queryParameters.replaceValues("clusterid", ImmutableSet.of(clusterId + ""));
- return this;
- }
-
- public ListStoragePoolsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- public ListStoragePoolsOptions ipAddress(String ipAddress) {
- this.queryParameters.replaceValues("ipaddress", ImmutableSet.of(ipAddress));
- return this;
- }
-
- public ListStoragePoolsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListStoragePoolsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
- public ListStoragePoolsOptions path(String path) {
- this.queryParameters.replaceValues("path", ImmutableSet.of(path));
- return this;
- }
-
- public ListStoragePoolsOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- public ListStoragePoolsOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java
deleted file mode 100644
index 4769920..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.TemplateFilter;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what templates information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api/user/listTemplates.html"
- * />
- */
-public class ListTemplatesOptions extends AccountInDomainOptions {
- public ListTemplatesOptions() {
- filter(TemplateFilter.EXECUTABLE);
- }
-
- public static final ListTemplatesOptions NONE = new ListTemplatesOptions();
-
- /**
- * @param filter
- * how to constrain the list
- */
- public ListTemplatesOptions filter(TemplateFilter filter) {
- this.queryParameters.replaceValues("templatefilter", ImmutableSet.of(filter.toString()));
- return this;
- }
-
- /**
- * @param id
- * the template ID
- */
- public ListTemplatesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param name
- * the template name
- */
- public ListTemplatesOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param zoneId
- * list templates by zoneId.
- */
- public ListTemplatesOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * list templates by projectId.
- */
- public ListTemplatesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
-
- }
-
- /**
- * @param hypervisor
- * the hypervisor for which to restrict the search
- */
- public ListTemplatesOptions hypervisor(String hypervisor) {
- this.queryParameters.replaceValues("hypervisor", ImmutableSet.of(hypervisor));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListTemplatesOptions#filter
- */
- public static ListTemplatesOptions filter(TemplateFilter filter) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.filter(filter);
- }
-
- /**
- * @see ListTemplatesOptions#domainId
- */
- public static ListTemplatesOptions domainId(String id) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListTemplatesOptions#accountInDomain
- */
- public static ListTemplatesOptions accountInDomain(String account, String domain) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListTemplatesOptions#id
- */
- public static ListTemplatesOptions id(String id) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListTemplatesOptions#name
- */
- public static ListTemplatesOptions name(String name) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.name(name);
- }
-
- /**
- * @see ListTemplatesOptions#zoneId
- */
- public static ListTemplatesOptions zoneId(String id) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.zoneId(id);
- }
-
- /**
- * @see ListTemplatesOptions#projectId(String)
- */
- public static ListTemplatesOptions projectId(String projectId) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.projectId(projectId);
- }
-
- /**
- * @see ListTemplatesOptions#hypervisor
- */
- public static ListTemplatesOptions hypervisor(String hypervisor) {
- ListTemplatesOptions options = new ListTemplatesOptions();
- return options.hypervisor(hypervisor);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListTemplatesOptions accountInDomain(String account, String domain) {
- return ListTemplatesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListTemplatesOptions domainId(String domainId) {
- return ListTemplatesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java
deleted file mode 100644
index 8725226..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalUsageApi.listUsageOptions() API call
- */
-public class ListUsageRecordsOptions extends AccountInDomainOptions {
-
- public static final ListUsageRecordsOptions NONE = new ListUsageRecordsOptions();
-
- public static class Builder {
- public static ListUsageRecordsOptions accountInDomain(String account, String domainId) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.accountInDomain(account, domainId);
- }
-
- public static ListUsageRecordsOptions domainId(String domainId) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.domainId(domainId);
- }
-
- public static ListUsageRecordsOptions accountId(String accountId) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.accountId(accountId);
- }
-
- public static ListUsageRecordsOptions projectId(String projectId) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.projectId(projectId);
- }
-
- public static ListUsageRecordsOptions keyword(String keyword) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.keyword(keyword);
- }
-
- public static ListUsageRecordsOptions type(String type) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.type(type);
- }
-
- public static ListUsageRecordsOptions page(String page) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.page(page);
- }
-
- public static ListUsageRecordsOptions pageSize(String pageSize) {
- ListUsageRecordsOptions options = new ListUsageRecordsOptions();
- return options.pageSize(pageSize);
- }
-
- }
-
- @Override
- public ListUsageRecordsOptions accountInDomain(String account, String domain) {
- return (ListUsageRecordsOptions) super.accountInDomain(account, domain);
- }
-
- @Override
- public ListUsageRecordsOptions domainId(String domainId) {
- return (ListUsageRecordsOptions) super.domainId(domainId);
- }
-
- public ListUsageRecordsOptions accountId(String accountId) {
- this.queryParameters.replaceValues("accountid", ImmutableSet.of(accountId + ""));
- return this;
- }
-
- public ListUsageRecordsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public ListUsageRecordsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListUsageRecordsOptions type(String type) {
- this.queryParameters.replaceValues("type", ImmutableSet.of(type));
- return this;
- }
-
- public ListUsageRecordsOptions page(String page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page));
- return this;
- }
-
- public ListUsageRecordsOptions pageSize(String pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize));
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java
deleted file mode 100644
index e87e059..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.User;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what user information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/domain_admin/listUsers.html"
- * />
- */
-public class ListUsersOptions extends AccountInDomainOptions {
-
- public static final ListUsersOptions NONE = new ListUsersOptions();
-
- /**
- * @param id
- * list account by account ID
- */
- public ListUsersOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param userName
- * retrieve user by name
- */
- public ListUsersOptions userName(String userName) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(userName));
- return this;
- }
-
- /**
- * @param state
- * list accounts by state. Valid states are enabled, disabled, and
- * locked.
- */
- public ListUsersOptions state(User.State state) {
- this.queryParameters.replaceValues("state", ImmutableSet.of(state.toString()));
- return this;
- }
-
- /**
- * @param accountType
- * List users by account type. Valid types include admin,
- * domain-admin, read-only-admin, or user.
- */
- public ListUsersOptions accountType(String accountType) {
- this.queryParameters.replaceValues("accounttype", ImmutableSet.of(accountType));
- return this;
- }
-
- /**
- * @param keyword
- */
- public ListUsersOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param page
- * the page number
- */
- public ListUsersOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- /**
- * @param pageSize
- * the number of items per page
- */
- public ListUsersOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
-
- public static class Builder {
- /**
- * @see ListUsersOptions#id
- */
- public static ListUsersOptions id(String id) {
- ListUsersOptions options = new ListUsersOptions();
- return options.id(id);
- }
-
- /**
- * @see ListUsersOptions#userName(String)
- */
- public static ListUsersOptions userName(String name) {
- ListUsersOptions options = new ListUsersOptions();
- return options.userName(name);
- }
-
- /**
- * @see ListUsersOptions#state
- */
- public static ListUsersOptions state(User.State state) {
- ListUsersOptions options = new ListUsersOptions();
- return options.state(state);
- }
-
- /**
- * @see ListUsersOptions#accountType
- */
- public static ListUsersOptions accountType(String accountType) {
- ListUsersOptions options = new ListUsersOptions();
- return options.accountType(accountType);
- }
-
- /**
- * @see ListUsersOptions#keyword
- */
- public static ListUsersOptions keyword(String keyword) {
- ListUsersOptions options = new ListUsersOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListUsersOptions#page
- */
- public static ListUsersOptions page(long page) {
- ListUsersOptions options = new ListUsersOptions();
- return options.page(page);
- }
-
- /**
- * @see ListUsersOptions#pageSize
- */
- public static ListUsersOptions pageSize(long pageSize) {
- ListUsersOptions options = new ListUsersOptions();
- return options.pageSize(pageSize);
- }
-
- /**
- * @see ListUsersOptions#accountInDomain
- */
- public static ListUsersOptions accountInDomain(String account, String domain) {
- ListUsersOptions options = new ListUsersOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListUsersOptions#domainId
- */
- public static ListUsersOptions domainId(String id) {
- ListUsersOptions options = new ListUsersOptions();
- return options.domainId(id);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListUsersOptions accountInDomain(String account, String domain) {
- return ListUsersOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListUsersOptions domainId(String domainId) {
- return ListUsersOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java
deleted file mode 100644
index 3bec50f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what VMGroups information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.8/api/user/listInstanceGroups.html"
- * />
- */
-public class ListVMGroupsOptions extends BaseHttpRequestOptions {
-
- public static final ListVMGroupsOptions NONE = new ListVMGroupsOptions();
-
- /**
- * @param id list VMGroups by id
- */
- public ListVMGroupsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param account account who owns the VMGroups
- */
- public ListVMGroupsOptions account(String account) {
- this.queryParameters.replaceValues("account", ImmutableSet.of(account));
- return this;
- }
-
- /**
- * @param domainId domain ID of the account owning the VMGroups
- */
- public ListVMGroupsOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
- }
-
- /**
- * @param projectId id of the project the vm group is in
- */
- public ListVMGroupsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- /**
- * @param keyword keyword to search on
- */
- public ListVMGroupsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param name find a VMGroup by its name
- */
- public ListVMGroupsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public static class Builder {
- /**
- * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#id
- */
- public static ListVMGroupsOptions id(String id) {
- ListVMGroupsOptions options = new ListVMGroupsOptions();
- return options.id(id);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#account
- */
- public static ListVMGroupsOptions account(String account) {
- ListVMGroupsOptions options = new ListVMGroupsOptions();
- return options.account(account);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#domainId
- */
- public static ListVMGroupsOptions domainId(String id) {
- ListVMGroupsOptions options = new ListVMGroupsOptions();
- return options.domainId(id);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#projectId(String)
- */
- public static ListVMGroupsOptions projectId(String id) {
- ListVMGroupsOptions options = new ListVMGroupsOptions();
- return options.projectId(id);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#keyword
- */
- public static ListVMGroupsOptions keyword(String keyword) {
- ListVMGroupsOptions options = new ListVMGroupsOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#account
- */
- public static ListVMGroupsOptions name(String name) {
- ListVMGroupsOptions options = new ListVMGroupsOptions();
- return options.name(name);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java
deleted file mode 100644
index 4d1c7d6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what virtual machines information is returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/listVirtualMachines.html"
- * />
- */
-public class ListVirtualMachinesOptions extends AccountInDomainOptions {
-
- public static final ListVirtualMachinesOptions NONE = new ListVirtualMachinesOptions();
-
- /**
- * @param id
- * the ID of the virtual machine
- */
- public ListVirtualMachinesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param name
- * the virtual machine name
- */
- public ListVirtualMachinesOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param state
- * state of the virtual machine
- */
- public ListVirtualMachinesOptions state(String state) {
- this.queryParameters.replaceValues("state", ImmutableSet.of(state));
- return this;
- }
-
- /**
- * @param groupId
- * list virtual machines by groupId.
- */
- public ListVirtualMachinesOptions groupId(String groupId) {
- this.queryParameters.replaceValues("groupid", ImmutableSet.of(groupId + ""));
- return this;
-
- }
-
- /**
- * @param hostId
- * list virtual machines by hostId.
- */
- public ListVirtualMachinesOptions hostId(String hostId) {
- this.queryParameters.replaceValues("hostid", ImmutableSet.of(hostId + ""));
- return this;
-
- }
-
- /**
- * @param networkId
- * list virtual machines by networkId.
- */
- public ListVirtualMachinesOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkid", ImmutableSet.of(networkId + ""));
- return this;
-
- }
-
- /**
- * @param podId
- * list virtual machines by podId.
- */
- public ListVirtualMachinesOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * list virtual machines by projectId.
- */
- public ListVirtualMachinesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
-
- }
-
- /**
- * @param zoneId
- * list virtual machines by zoneId.
- */
- public ListVirtualMachinesOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
-
- }
-
- /**
- * @param usesVirtualNetwork
- * list by network type; true if need to list vms using Virtual
- * Network, false otherwise
- */
- public ListVirtualMachinesOptions usesVirtualNetwork(boolean usesVirtualNetwork) {
- this.queryParameters.replaceValues("forvirtualnetwork", ImmutableSet.of(usesVirtualNetwork + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListVirtualMachinesOptions#accountInDomain
- */
- public static ListVirtualMachinesOptions accountInDomain(String account, String domain) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListVirtualMachinesOptions#domainId
- */
- public static ListVirtualMachinesOptions domainId(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#id
- */
- public static ListVirtualMachinesOptions id(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#name
- */
- public static ListVirtualMachinesOptions name(String name) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.name(name);
- }
-
- /**
- * @see ListVirtualMachinesOptions#state
- */
- public static ListVirtualMachinesOptions state(String state) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.state(state);
- }
-
- /**
- * @see ListVirtualMachinesOptions#groupId
- */
- public static ListVirtualMachinesOptions groupId(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.groupId(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#hostId
- */
- public static ListVirtualMachinesOptions hostId(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.hostId(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#networkId
- */
- public static ListVirtualMachinesOptions networkId(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.networkId(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#podId
- */
- public static ListVirtualMachinesOptions podId(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.podId(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#projectId(String)
- */
- public static ListVirtualMachinesOptions projectId(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.projectId(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#zoneId
- */
- public static ListVirtualMachinesOptions zoneId(String id) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.zoneId(id);
- }
-
- /**
- * @see ListVirtualMachinesOptions#usesVirtualNetwork
- */
- public static ListVirtualMachinesOptions usesVirtualNetwork(boolean usesVirtualNetwork) {
- ListVirtualMachinesOptions options = new ListVirtualMachinesOptions();
- return options.usesVirtualNetwork(usesVirtualNetwork);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListVirtualMachinesOptions accountInDomain(String account, String domain) {
- return ListVirtualMachinesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListVirtualMachinesOptions domainId(String domainId) {
- return ListVirtualMachinesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java
deleted file mode 100644
index 7a8b973..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the listVLANIPRanges() API call
- */
-public class ListVlanIPRangesOptions extends AccountInDomainOptions {
-
- public static class Builder {
-
- public static ListVlanIPRangesOptions accountInDomain(String account, String domainId) {
- return new ListVlanIPRangesOptions().accountInDomain(account, domainId);
- }
-
- public static ListVlanIPRangesOptions domainId(String domainId) {
- return new ListVlanIPRangesOptions().domainId(domainId);
- }
-
- public static ListVlanIPRangesOptions forVirtualNetwork(boolean forVirtualNetwork) {
- return new ListVlanIPRangesOptions().forVirtualNetwork(forVirtualNetwork);
- }
-
- public static ListVlanIPRangesOptions id(String id) {
- return new ListVlanIPRangesOptions().id(id);
- }
-
- public static ListVlanIPRangesOptions keyword(String keyword) {
- return new ListVlanIPRangesOptions().keyword(keyword);
- }
-
- public static ListVlanIPRangesOptions networkId(String networkId) {
- return new ListVlanIPRangesOptions().networkId(networkId);
- }
-
- public static ListVlanIPRangesOptions podId(String podId) {
- return new ListVlanIPRangesOptions().podId(podId);
- }
-
- public static ListVlanIPRangesOptions projectId(String projectId) {
- return new ListVlanIPRangesOptions().projectId(projectId);
- }
-
- public static ListVlanIPRangesOptions vlan(long vlan) {
- return new ListVlanIPRangesOptions().vlan(vlan);
- }
-
- public static ListVlanIPRangesOptions vlan(String vlan) {
- return new ListVlanIPRangesOptions().vlan(vlan + "");
- }
-
- public static ListVlanIPRangesOptions zoneId(String zoneId) {
- return new ListVlanIPRangesOptions().zoneId(zoneId);
- }
- }
-
- @Override
- public ListVlanIPRangesOptions accountInDomain(String account, String domainId) {
- return (ListVlanIPRangesOptions) super.accountInDomain(account, domainId);
- }
-
- @Override
- public ListVlanIPRangesOptions domainId(String domainId) {
- return (ListVlanIPRangesOptions) super.domainId(domainId);
- }
-
- public ListVlanIPRangesOptions forVirtualNetwork(boolean forVirtualNetwork) {
- this.queryParameters.replaceValues("forvirtualnetwork", ImmutableSet.of(forVirtualNetwork + ""));
- return this;
- }
-
- public ListVlanIPRangesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- public ListVlanIPRangesOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListVlanIPRangesOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkid", ImmutableSet.of(networkId + ""));
- return this;
- }
-
- public ListVlanIPRangesOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- public ListVlanIPRangesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public ListVlanIPRangesOptions vlan(String vlan) {
- this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan));
- return this;
- }
-
- public ListVlanIPRangesOptions vlan(long vlan) {
- this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan + ""));
- return this;
- }
-
- public ListVlanIPRangesOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-}
[15/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java
deleted file mode 100644
index 5f8944f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Pod;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListPodsResponseTest extends BaseSetParserTest<Pod> {
-
- @Override
- public String resource() {
- return "/listpodsresponse.json";
- }
-
- @Override
- @SelectJson("pod")
- public Set<Pod> expected() {
- Pod pod1 = Pod.builder()
- .id("1")
- .name("Dev Pod 1")
- .zoneId("1")
- .zoneName("Dev Zone 1")
- .gateway("10.26.26.254")
- .netmask("255.255.255.0")
- .startIp("10.26.26.50")
- .endIp("10.26.26.100")
- .allocationState(AllocationState.ENABLED)
- .build();
- Pod pod2 = Pod.builder()
- .id("2")
- .name("Dev Pod 2")
- .zoneId("2")
- .zoneName("Dev Zone 2")
- .gateway("10.22.22.254")
- .netmask("255.255.255.0")
- .startIp("10.22.22.25")
- .endIp("10.22.22.50")
- .allocationState(AllocationState.ENABLED)
- .build();
- return ImmutableSet.of(pod1, pod2);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java
deleted file mode 100644
index 6356c7d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.PortForwardingRule;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListPortForwardingRulesResponseTest extends BaseSetParserTest<PortForwardingRule> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
- }
-
- @Override
- public String resource() {
- return "/listportforwardingrulesresponse.json";
- }
-
- @Override
- @SelectJson("portforwardingrule")
- public Set<PortForwardingRule> expected() {
- Set<String> cidrs = ImmutableSet.of("0.0.0.0/1", "128.0.0.0/1");
- return ImmutableSet.<PortForwardingRule> of(
- PortForwardingRule.builder().id("15").privatePort(22).protocol(PortForwardingRule.Protocol.TCP)
- .publicPort(2022).virtualMachineId("3").virtualMachineName("i-3-3-VM").IPAddressId("3")
- .IPAddress("72.52.126.32").state(PortForwardingRule.State.ACTIVE).CIDRs(cidrs).build(),
- PortForwardingRule.builder().id("18").privatePort(22).protocol(PortForwardingRule.Protocol.TCP)
- .publicPort(22).virtualMachineId("89").virtualMachineName("i-3-89-VM").IPAddressId("34")
- .IPAddress("72.52.126.63").state(PortForwardingRule.State.ACTIVE).build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java
deleted file mode 100644
index a9547d4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListPublicIPAddressesResponseTest extends BaseSetParserTest<PublicIPAddress> {
-
- @Override
- public String resource() {
- return "/listpublicipaddressesresponse.json";
- }
-
- @Override
- @SelectJson("publicipaddress")
- public Set<PublicIPAddress> expected() {
- return ImmutableSet.of(PublicIPAddress.builder().id("30").IPAddress("72.52.126.59")
- .allocated(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-19T21:15:01-0800")).zoneId("1")
- .zoneName("San Jose 1").isSourceNAT(false).account("adrian").domainId("1").domain("ROOT")
- .usesVirtualNetwork(true).isStaticNAT(false).associatedNetworkId("204").networkId("200")
- .state(PublicIPAddress.State.ALLOCATED).build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java
deleted file mode 100644
index c509a34..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListSSHKeyPairsResponseTest extends BaseSetParserTest<SshKeyPair> {
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
-
- }
-
- @Override
- public String resource() {
- return "/listsshkeypairsresponse.json";
- }
-
- @Override
- @SelectJson("sshkeypair")
- public Set<SshKeyPair> expected() {
- return ImmutableSet.<SshKeyPair> of(SshKeyPair.builder().name("jclouds-keypair")
- .fingerprint("1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b").build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java
deleted file mode 100644
index 54d06b9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListSecurityGroupsResponseTest extends BaseSetParserTest<SecurityGroup> {
-
- @Override
- public String resource() {
- return "/listsecuritygroupsresponse.json";
- }
-
- @Override
- @SelectJson("securitygroup")
- public Set<SecurityGroup> expected() {
- return ImmutableSet
- .<SecurityGroup> builder()
- .add(SecurityGroup
- .builder()
- .id("13")
- .name("default")
- .description("description")
- .account("adrian")
- .domainId("1")
- .domain("ROOT")
- .ingressRules(
- ImmutableSet.of(
-
- IngressRule.builder().id("5").protocol("tcp").startPort(22).endPort(22)
- .securityGroupName("adriancole").account("adrian").build(),
-
- IngressRule.builder().id("6").protocol("udp").startPort(11).endPort(11).CIDR("1.1.1.1/24")
- .build())).build())
- .add(SecurityGroup.builder().id("12").name("adriancole").account("adrian").domainId("1").domain("ROOT").build())
- .add(SecurityGroup.builder().id("15").name("2").description("description").account("adrian").domainId("1")
- .domain("ROOT").build())
-
- .add(SecurityGroup.builder().id("14").name("1").description("description").account("adrian").domainId("1")
- .domain("ROOT").ingressRules(ImmutableSet.of(
-
- IngressRule.builder().id("7").protocol("tcp").startPort(10).endPort(10).CIDR("1.1.1.1/24").build(),
-
- IngressRule.builder().id("8").protocol("tcp").startPort(10).endPort(10).CIDR("2.2.2.2/16").build()))
- .build())
- .add(SecurityGroup
- .builder()
- .id("16")
- .name("with1and2")
- .description("description")
- .account("adrian")
- .domainId("1")
- .domain("ROOT")
- .ingressRules(
- ImmutableSet.of(IngressRule.builder().id("9").protocol("icmp").ICMPType(-1).ICMPCode(-1)
- .securityGroupName("1").account("adrian").build(),
-
- IngressRule.builder().id("10").protocol("tcp").startPort(22).endPort(22).securityGroupName("1")
- .account("adrian").build(),
-
- IngressRule.builder().id("11").protocol("tcp").startPort(22).endPort(22).securityGroupName("2")
- .account("adrian").build())).build()).build();
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java
deleted file mode 100644
index 0318d19..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.StorageType;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListServiceOfferingsResponseTest extends BaseSetParserTest<ServiceOffering> {
-
- @Override
- public String resource() {
- return "/listserviceofferingsresponse.json";
- }
-
- @Override
- @SelectJson("serviceoffering")
- public Set<ServiceOffering> expected() {
- return ImmutableSet.<ServiceOffering> of(
- ServiceOffering.builder().id("1").name("Small Instance")
- .displayText("Small Instance - 500 MhZ CPU, 512 MB RAM - $0.05 per hour").cpuNumber(1).cpuSpeed(500)
- .memory(512)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-11T15:22:32-0800"))
- .storageType(StorageType.SHARED).supportsHA(false).build(),
- ServiceOffering.builder().id("2").name("Medium Instance")
- .displayText("Medium Instance, 1 GhZ CPU, 1 GB RAM - $0.10 per hour").cpuNumber(1).cpuSpeed(1000)
- .memory(1024)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-11T15:22:32-0800"))
- .storageType(StorageType.SHARED).supportsHA(false).build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListStoragePoolsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListStoragePoolsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListStoragePoolsResponseTest.java
deleted file mode 100644
index 6993d72..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListStoragePoolsResponseTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.jclouds.cloudstack.config.CloudStackParserModule;
-import org.jclouds.cloudstack.domain.StoragePool;
-import org.jclouds.json.BaseItemParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit", testName = "ListStoragePoolsResponseTest")
-public class ListStoragePoolsResponseTest extends BaseItemParserTest<Set<StoragePool>> {
-
- @Override
- public String resource() {
- return "/liststoragepoolsresponse.json";
- }
-
- @Override
- @SelectJson("storagepool")
- public Set<StoragePool> expected() {
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT+02:00"));
- c.set(Calendar.YEAR, 2011);
- c.set(Calendar.MONTH, Calendar.NOVEMBER);
- c.set(Calendar.DAY_OF_MONTH, 26);
- c.set(Calendar.HOUR_OF_DAY, 23);
- c.set(Calendar.MINUTE, 33);
- c.set(Calendar.SECOND, 6);
- Date created = c.getTime();
-
- StoragePool storagePool = StoragePool.builder().id("201").zoneId("1").zoneName("Dev Zone 1").podId("1")
- .podName("Dev Pod 1").name("NFS Pri 1").ipAddress("10.26.26.165").path("/mnt/nfs/cs_pri")
- .created(created).type(StoragePool.Type.NETWORK_FILESYSTEM).clusterId("1").clusterName("Xen Clust 1")
- .diskSizeTotal(898356445184L).diskSizeAllocated(18276679680L).tag("tag1").state(StoragePool.State.UP)
- .build();
- return ImmutableSet.of(storagePool);
- }
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule(), new CloudStackParserModule());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java
deleted file mode 100644
index bd5980e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.Template.Format;
-import org.jclouds.cloudstack.domain.Template.Type;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListTemplatesResponseTest extends BaseSetParserTest<Template> {
-
- @Override
- public String resource() {
- // grep listtemplatesresponse ./target/test-data/jclouds-wire.log|tail
- // -1|sed -e 's/.*<< "//g' -e 's/"$//g'
- return "/listtemplatesresponse.json";
- }
-
- @Override
- @SelectJson("template")
- public Set<Template> expected() {
- return ImmutableSet.of(
- Template.builder().id("2").name("CentOS 5.3(64-bit) no GUI (XenServer)")
- .displayText("CentOS 5.3(64-bit) no GUI (XenServer)").isPublic(true)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-03-20T19:17:48-0700"))
- .ready(false).passwordEnabled(false).format(Format.VHD).featured(true).crossZones(true).OSTypeId("11")
- .OSType("CentOS 5.3 (32-bit)").account("system").zoneId("2").zone("Chicago").type(Type.BUILTIN)
- .hypervisor("XenServer").domain("ROOT").domainId("1").extractable(true).build(),
- Template.builder().id("4").name("CentOS 5.5(64-bit) no GUI (KVM)")
- .displayText("CentOS 5.5(64-bit) no GUI (KVM)").isPublic(true)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-03-20T19:17:48-0700"))
- .ready(true).passwordEnabled(false).format(Format.QCOW2).featured(true).crossZones(true)
- .OSTypeId("112").OSType("CentOS 5.5 (64-bit)").account("system").zoneId("2").zone("Chicago")
- .size(8589934592l).type(Type.BUILTIN).hypervisor("KVM").domain("ROOT").domainId("1").extractable(true)
- .build(),
- Template.builder().id("203").name("Windows 7 KVM").displayText("Windows 7 KVM").isPublic(true)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-03-20T22:02:18-0700"))
- .ready(true).passwordEnabled(false).format(Format.QCOW2).featured(true).crossZones(false)
- .OSTypeId("48").OSType("Windows 7 (32-bit)").account("admin").zoneId("2").zone("Chicago")
- .size(17179869184l).type(Type.USER).hypervisor("KVM").domain("ROOT").domainId("1").extractable(false)
- .build(),
- Template.builder().id("7").name("CentOS 5.3(64-bit) no GUI (vSphere)")
- .displayText("CentOS 5.3(64-bit) no GUI (vSphere)").isPublic(true)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-03-20T19:17:48-0700"))
- .ready(false).passwordEnabled(false).format(Format.OVA).featured(true).crossZones(true).OSTypeId("12")
- .OSType("CentOS 5.3 (64-bit)").account("system").zoneId("2").zone("Chicago").type(Type.BUILTIN)
- .hypervisor("VMware").domain("ROOT").domainId("1").extractable(true).build(),
- Template.builder().id("241").name("kvmdev4").displayText("v5.6.28_Dev4").isPublic(true)
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-04-21T09:43:25-0700"))
- .ready(true).passwordEnabled(false).format(Format.QCOW2).featured(false).crossZones(false)
- .OSTypeId("14").OSType("CentOS 5.4 (64-bit)").account("rs3").zoneId("2").zone("Chicago")
- .size(10737418240l).type(Type.USER).hypervisor("KVM").domain("ROOT").domainId("1").extractable(false)
- .build());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java
deleted file mode 100644
index 9ecd895..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.jclouds.cloudstack.config.CloudStackParserModule;
-import org.jclouds.cloudstack.domain.UsageRecord;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.json.config.GsonModule;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ListUsageRecordsResponseTest extends BaseSetParserTest<UsageRecord> {
-
- @Override
- public String resource() {
- return "/listusagerecordsresponse.json";
- }
-
- @Override
- @SelectJson("usagerecord")
- public Set<UsageRecord> expected() {
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
- c.set(Calendar.YEAR, 2011);
- c.set(Calendar.MONTH, Calendar.DECEMBER);
- c.set(Calendar.DAY_OF_MONTH, 15);
- c.set(Calendar.HOUR_OF_DAY, 0);
- c.set(Calendar.MINUTE, 0);
- c.set(Calendar.SECOND, 0);
- c.set(Calendar.MILLISECOND, 0);
- Date start = c.getTime();
- c.add(Calendar.DAY_OF_MONTH, 1);
- c.add(Calendar.SECOND, -1);
- Date end = c.getTime();
-
- return ImmutableSet.of(UsageRecord.builder()
- .accountName("admin").accountId("2").domainId("1").zoneId("1")
- .description("Template Id:203 Size:3117171712")
- .usage("24 Hrs").usageType(UsageRecord.UsageType.TEMPLATE).rawUsageHours(24)
- .templateId("0").id("203").startDate(start).endDate(end).build());
-
- }
-
- @Override
- protected Injector injector() {
- return Guice.createInjector(new GsonModule(), new CloudStackParserModule());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java
deleted file mode 100644
index a891f4c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponse3xTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.NIC;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListVirtualMachinesResponse3xTest extends BaseSetParserTest<VirtualMachine> {
-
- @Override
- public String resource() {
- return "/listvirtualmachinesresponse3x.json";
- }
-
- @Override
- @SelectJson("virtualmachine")
- public Set<VirtualMachine> expected() {
- return ImmutableSet.of(VirtualMachine
- .builder()
- .id("fee2ccb3-c1f2-4e7b-8465-42b390e10dff")
- .name("cloudstack-r-611")
- .displayName("cloudstack-r-611")
- .account("jcloud2")
- .domainId("ea66e3a5-d007-42e8-a0de-ec5ce778a1d7")
- .domain("jCloud")
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-22T09:18:28-0700"))
- .state(VirtualMachine.State.RUNNING)
- .isHAEnabled(false)
- .zoneId("1")
- .zoneName("Santa Clara Zone")
- .templateId("5c65f152-a4bc-4405-a756-fd10841a9aa7")
- .templateName("jclouds-6d4bdc29")
- .templateDisplayText("jclouds live testCreateTemplate")
- .passwordEnabled(false)
- .serviceOfferingId("5305750d-df71-4da9-8cd0-e23c2236a6e2")
- .serviceOfferingName("Micro Instance")
- .cpuCount(1)
- .cpuSpeed(500)
- .memory(256)
- .guestOSId("6dcd58ce-1ec6-432c-af0b-9ab4ca9207d9")
- .rootDeviceId("0")
- .rootDeviceType("IscsiLUN")
- .publicIP("72.52.126.110")
- .publicIPId("e202aafb-ab41-4dc0-80e9-9fcd64fbf45c")
- .nics(ImmutableSet.of(NIC.builder().id("48640c5e-90f3-45bd-abd2-a108ca8957ac").
- networkId("c0d5db5b-f7d5-44e1-b854-21ecd1a09dbf").netmask("255.255.255.0").gateway("10.1.1.1")
- .IPAddress("10.1.1.227").trafficType(TrafficType.GUEST).guestIPType(GuestIPType.ISOLATED)
- .isDefault(true).build())).build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java
deleted file mode 100644
index d6b737b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.NIC;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListVirtualMachinesResponseTest extends BaseSetParserTest<VirtualMachine> {
-
- @Override
- public String resource() {
- return "/listvirtualmachinesresponse.json";
- }
-
- @Override
- @SelectJson("virtualmachine")
- public Set<VirtualMachine> expected() {
- return ImmutableSet.of(VirtualMachine
- .builder()
- .id("54")
- .name("i-3-54-VM")
- .displayName("i-3-54-VM")
- .account("adrian")
- .domainId("1")
- .domain("ROOT")
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-16T14:28:37-0800"))
- .state(VirtualMachine.State.STARTING)
- .isHAEnabled(false)
- .zoneId("1")
- .zoneName("San Jose 1")
- .templateId("2")
- .templateName("CentOS 5.3(64-bit) no GUI (XenServer)")
- .templateDisplayText("CentOS 5.3(64-bit) no GUI (XenServer)")
- .passwordEnabled(false)
- .serviceOfferingId("1")
- .serviceOfferingName("Small Instance")
- .cpuCount(1)
- .cpuSpeed(500)
- .memory(512)
- .guestOSId("11")
- .rootDeviceId("0")
- .rootDeviceType("NetworkFilesystem")
- .jobId("63")
- .jobStatus(0)
- .nics(ImmutableSet.of(NIC.builder().id("72").networkId("204").netmask("255.255.255.0").gateway("10.1.1.1")
- .IPAddress("10.1.1.18").trafficType(TrafficType.GUEST).guestIPType(GuestIPType.VIRTUAL)
- .isDefault(true).build())).hypervisor("XenServer").build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java
deleted file mode 100644
index fdbaa68..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.VlanIPRange;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListVlanIPRangesResponseTest extends BaseSetParserTest<VlanIPRange> {
-
- @Override
- public String resource() {
- return "/listvlaniprangesresponse.json";
- }
-
- @Override
- @SelectJson("vlaniprange")
- public Set<VlanIPRange> expected() {
- VlanIPRange range1 = VlanIPRange.builder()
- .id("1")
- .forVirtualNetwork(true)
- .zoneId("1")
- .vlan("127")
- .account("system")
- .domainId("1")
- .domain("ROOT")
- .gateway("10.27.27.254")
- .netmask("255.255.255.0")
- .startIP("10.27.27.50")
- .endIP("10.27.27.100")
- .networkId("200")
- .build();
- VlanIPRange range2 = VlanIPRange.builder()
- .id("2")
- .forVirtualNetwork(false)
- .zoneId("2")
- .vlan("untagged")
- .account("system")
- .domainId("1")
- .domain("ROOT")
- .podId("2")
- .podName("Dev Pod 2")
- .gateway("10.22.22.254")
- .netmask("255.255.255.0")
- .startIP("10.22.22.51")
- .endIP("10.22.22.100")
- .networkId("209")
- .build();
- return ImmutableSet.of(range1, range2);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java
deleted file mode 100644
index f69213d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ListZonesResponseTest extends BaseSetParserTest<Zone> {
-
- @Override
- public String resource() {
- return "/listzonesresponse.json";
- }
-
- @Override
- @SelectJson("zone")
- public Set<Zone> expected() {
- return ImmutableSet.of(Zone.builder().id("1").name("San Jose 1").networkType(NetworkType.ADVANCED)
- .securityGroupsEnabled(false).build(),
- Zone.builder().id("2").name("Chicago").networkType(NetworkType.ADVANCED).securityGroupsEnabled(true).build());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/RegisterUserKeysResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/RegisterUserKeysResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/RegisterUserKeysResponseTest.java
deleted file mode 100644
index 08cd959..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/parse/RegisterUserKeysResponseTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.parse;
-
-import org.jclouds.cloudstack.domain.ApiKeyPair;
-import org.jclouds.json.BaseParserTest;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class RegisterUserKeysResponseTest extends BaseParserTest<ApiKeyPair, Object> {
-
- @Override
- public String resource() {
- return "/registeruserkeysresponse.json";
- }
-
- @Override
- @SelectJson("userkeys")
- public ApiKeyPair expected() {
- return ApiKeyPair.builder()
- .apiKey("5nn6IAQ-0BYuAKTu45rf49VsyX0rg9t48TpY8NKsduE5t-_1_g_AU8ZjP3OJvVdlzWKL3Lgfa6_nkC9hU6NyQQ")
- .secretKey("GSCDYzj65CiSkxzCJxlFvcF52qglM7HbuG6QL7zYVeWVhVO8GnW85wGTBBuZ3xpzEN_UfKnsORvrNszYQ1ofAw").build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/JobCompleteTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/JobCompleteTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/JobCompleteTest.java
deleted file mode 100644
index 581e373..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/JobCompleteTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import org.jclouds.cloudstack.AsyncJobException;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.AsyncJobError;
-import org.jclouds.cloudstack.domain.AsyncJob.ResultCode;
-import org.jclouds.cloudstack.domain.AsyncJob.Status;
-import org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode;
-import org.jclouds.cloudstack.features.AsyncJobApi;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", singleThreaded = true)
-public class JobCompleteTest {
-
- CloudStackApi client;
- AsyncJobApi asyncJobClient;
-
- @BeforeMethod
- public void setUp() {
- client = createMock(CloudStackApi.class);
- asyncJobClient = createMock(AsyncJobApi.class);
-
- expect(client.getAsyncJobApi()).andReturn(asyncJobClient);
- }
-
- @Test
- public void testJobComplete() {
- AsyncJob<?> job = AsyncJob.builder().id("100")
- .status(Status.SUCCEEDED).resultCode(ResultCode.SUCCESS).build();
- expect((Object) asyncJobClient.getAsyncJob(job.getId())).andReturn(job);
-
- replay(client, asyncJobClient);
- assertTrue(new JobComplete(client).apply(job.getId()));
- verify(client, asyncJobClient);
- }
-
- @Test
- public void testFailedJobComplete() {
- AsyncJob<?> job = AsyncJob.builder().id("100")
- .status(Status.FAILED).resultCode(ResultCode.FAIL)
- .error(AsyncJobError.builder().errorCode(ErrorCode.INTERNAL_ERROR).errorText("Dummy test error").build()).build();
- expect((Object) asyncJobClient.getAsyncJob(job.getId())).andReturn(job);
-
- replay(client, asyncJobClient);
- try {
- new JobComplete(client).apply(job.getId());
- fail("No exception thrown");
-
- } catch (AsyncJobException e) {
- assertTrue(e.toString().contains("Dummy test error"));
- }
- verify(client, asyncJobClient);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java
deleted file mode 100644
index c7fc117..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.defaultNetworkInZone;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.hasLoadBalancerService;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsPortForwarding;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsStaticNAT;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkService;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class NetworkPredicatesTest {
-
- public void testHasLoadBalancerService() {
- Network network = Network.builder().id("204").services(ImmutableSet.of(NetworkService.builder().name("Lb").build())).build();
-
- assert hasLoadBalancerService().apply(network);
- assert !supportsStaticNAT().apply(network);
- assert !supportsPortForwarding().apply(network);
-
- }
-
- public void testSupportsStaticNATFindsWhenFirewallHasStaticNatFeature() {
- Network network = Network
- .builder()
- .id("204")
- .services(
- ImmutableSet.of(NetworkService.builder().name("Firewall").capabilities(
- ImmutableMap.<String, String> of("StaticNat", "true")).build()))
- .build();
-
- assert !hasLoadBalancerService().apply(network);
- assert supportsStaticNAT().apply(network);
- assert !supportsPortForwarding().apply(network);
- }
-
- public void testNoSupport() {
- Network network = Network.builder().id("204")
- .services(ImmutableSet.of(NetworkService.builder().name("Firewall").capabilities(
- ImmutableMap.<String, String> of()).build())).build();
-
- assert !hasLoadBalancerService().apply(network);
- assert !supportsStaticNAT().apply(network);
- assert !supportsPortForwarding().apply(network);
- }
-
- public void testSupportsPortForwardingFindsWhenFirewallHasPortForwardingFeature() {
- Network network = Network
- .builder()
- .id("204")
- .services(
- ImmutableSet.of(NetworkService.builder().name("Firewall").capabilities(
- ImmutableMap.<String, String> of("PortForwarding", "true")).build())).build();
-
- assert !hasLoadBalancerService().apply(network);
- assert !supportsStaticNAT().apply(network);
- assert supportsPortForwarding().apply(network);
- }
-
- public void testSupportsPortForwardingAndStaticNATWhenFirewallHasFeatures() {
- Network network = Network
- .builder()
- .id("204")
- .services(
- ImmutableSet.of(NetworkService.builder().name("Firewall").capabilities(
- ImmutableMap.<String, String> of("StaticNat", "true", "PortForwarding", "true")).build())).build();
-
- assert Predicates.and(supportsPortForwarding(), supportsStaticNAT()).apply(network);
- assert !hasLoadBalancerService().apply(network);
-
- }
-
- public void testDefaultNetworkInZone() {
- Network defaultInZone = Network.builder().id("42-1").isDefault(true).zoneId("42").build();
- Network defaultNotInZone = Network.builder().id("200-1").isDefault(true).zoneId("200").build();
- Network notDefaultInZone = Network.builder().id("42-2").isDefault(false).zoneId("42").build();
- Network notDefaultNotInZone = Network.builder().id("200-2").isDefault(false).zoneId("200").build();
-
- Predicate<Network> predicate = defaultNetworkInZone("42");
- assertTrue(predicate.apply(defaultInZone));
- assertFalse(predicate.apply(defaultNotInZone));
- assertFalse(predicate.apply(notDefaultInZone));
- assertFalse(predicate.apply(notDefaultNotInZone));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java
deleted file mode 100644
index 0722a73..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.features.GuestOSApi;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-@Test(groups = "unit", singleThreaded = true)
-public class OSCategoryInTest {
-
- private CloudStackApi client;
- private GuestOSApi guestOSClient;
- private Set<String> acceptableCategories = ImmutableSet.<String>of("Ubuntu");
-
- @BeforeMethod
- public void setUp() {
- client = createMock(CloudStackApi.class);
- guestOSClient = createMock(GuestOSApi.class);
-
- expect(client.getGuestOSApi()).andReturn(guestOSClient).times(2);
-
- Map<String, String> osCategories = Maps.newHashMap();
- osCategories.put("1", "Ubuntu");
- osCategories.put("2", "CentOS");
- osCategories.put("3", "RHEL");
-
- expect(guestOSClient.listOSCategories()).andReturn(osCategories);
-
- Set<OSType> osTypes = ImmutableSet.of(
- OSType.builder().id("10").OSCategoryId("1").description("Ubuntu 10.04 LTS").build(),
- OSType.builder().id("20").OSCategoryId("2").description("CentOS 5.4").build(),
- OSType.builder().id("30").OSCategoryId("3").description("RHEL 6").build()
- );
-
- expect(guestOSClient.listOSTypes()).andReturn(osTypes);
- replay(client, guestOSClient);
- }
-
- @Test
- public void testTemplateInAcceptableCategory() {
- assertTrue(new OSCategoryIn(client).apply(acceptableCategories).apply(
- Template.builder().id("1").OSTypeId("10").build()
- ));
- verify(client, guestOSClient);
- }
-
- @Test
- public void testTemplateNotInAcceptableCategory() {
- assertFalse(new OSCategoryIn(client).apply(acceptableCategories).apply(
- Template.builder().id("2").OSTypeId("30").build()
- ));
- verify(client, guestOSClient);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java
deleted file mode 100644
index 8b05cf6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.jclouds.cloudstack.predicates.PublicIPAddressPredicates.available;
-
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class PublicIPAddressPredicatesTest {
-
- public void testIsAvailableWhenAllocated() {
- PublicIPAddress address = PublicIPAddress.builder().state(PublicIPAddress.State.ALLOCATED).id("204").build();
-
- assert available().apply(address);
-
- }
-
- public void testIsNotAvailableWhenNotAllocated() {
- PublicIPAddress address = PublicIPAddress.builder().state(PublicIPAddress.State.ALLOCATING).id("204").build();
-
- assert !available().apply(address);
-
- }
-
- public void testIsNotAvailableWhenAssignedToVM() {
- PublicIPAddress address = PublicIPAddress.builder().state(PublicIPAddress.State.ALLOCATED).virtualMachineId("1")
- .id("204").build();
-
- assert !available().apply(address);
-
- }
-
- public void testIsNotAvailableWhenSourceNAT() {
- PublicIPAddress address = PublicIPAddress.builder().state(PublicIPAddress.State.ALLOCATED).isSourceNAT(true)
- .id("204").build();
-
- assert !available().apply(address);
-
- }
-
- public void testIsNotAvailableWhenStaticNAT() {
- PublicIPAddress address = PublicIPAddress.builder().state(PublicIPAddress.State.ALLOCATED).isStaticNAT(true)
- .id("204").build();
-
- assert !available().apply(address);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
deleted file mode 100644
index cccb558..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicatesTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.hasCidr;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.nameEquals;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.portInRange;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.portInRangeForCidr;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.ruleCidrMatches;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.ruleGroupMatches;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-@Test(groups = "unit")
-public class SecurityGroupPredicatesTest {
-
- public SecurityGroup group() {
- return SecurityGroup
- .builder()
- .id("13")
- .name("default")
- .description("description")
- .account("adrian")
- .domainId("1")
- .domain("ROOT")
- .ingressRules(
- ImmutableSet.of(
-
- IngressRule.builder().id("5").protocol("tcp").startPort(22).endPort(22)
- .securityGroupName("adriancole").account("adrian").build(),
- IngressRule.builder().id("6").protocol("udp").startPort(11).endPort(11).CIDR("1.1.1.1/24").build(),
- IngressRule.builder().id("7").protocol("tcp").startPort(40).endPort(50).CIDR("1.1.1.1/24").build(),
- IngressRule.builder().id("8").protocol("tcp").startPort(60).endPort(60).CIDR("2.2.2.2/16").build()
- )).build();
- }
-
- @Test
- public void testPortInRange() {
- assertTrue(portInRange(22).apply(group()));
- assertTrue(portInRange(45).apply(group()));
- assertFalse(portInRange(100).apply(group()));
- }
-
- @Test
- public void testHasCidr() {
- assertTrue(hasCidr("1.1.1.1/24").apply(group()));
- assertFalse(hasCidr("3.3.3.3/25").apply(group()));
- }
-
- @Test
- public void testPortInRangeForCidr() {
- assertTrue(portInRangeForCidr(11, "1.1.1.1/24").apply(group()));
- assertTrue(portInRangeForCidr(45, "1.1.1.1/24").apply(group()));
- assertFalse(portInRangeForCidr(45, "2.2.2.2/16").apply(group()));
- assertFalse(portInRangeForCidr(11, "2.2.2.2/16").apply(group()));
- assertFalse(portInRangeForCidr(11, "3.3.3.3/25").apply(group()));
- }
-
- @Test
- public void testNameEquals() {
- assertTrue(nameEquals("default").apply(group()));
- assertFalse(nameEquals("not-default").apply(group()));
- }
-
- @Test
- public void testRuleCidrMatches() {
- assertTrue(Iterables.any(group().getIngressRules(),
- ruleCidrMatches("tcp", 40, 50, ImmutableSet.of("1.1.1.1/24"))));
- assertFalse(Iterables.any(group().getIngressRules(),
- ruleCidrMatches("tcp", 40, 50, ImmutableSet.of("2.2.2.2/24"))));
- }
-
- @Test
- public void testRuleGroupMatches() {
- assertTrue(Iterables.any(group().getIngressRules(),
- ruleGroupMatches("tcp", 22, 22,
- ImmutableMultimap.<String, String>builder().put("adrian", "adriancole").build())));
- assertFalse(Iterables.any(group().getIngressRules(),
- ruleGroupMatches("tcp", 22, 22,
- ImmutableMultimap.<String, String>builder().put("adrian", "somegroup").build())));
- assertFalse(Iterables.any(group().getIngressRules(),
- ruleGroupMatches("tcp", 22, 22,
- ImmutableMultimap.<String, String>builder().put("someuser", "adriancole").build())));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java
deleted file mode 100644
index c514af1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.jclouds.cloudstack.predicates.TemplatePredicates.isPasswordEnabled;
-import static org.jclouds.cloudstack.predicates.TemplatePredicates.isReady;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.domain.Template;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class TemplatePredicatesTest {
-
- @Test
- public void testTemplateIsReady() {
- assertTrue(isReady().apply(
- Template.builder().id("a").ready(true).build()
- ));
- assertFalse(isReady().apply(
- Template.builder().id("b").ready(false).build()
- ));
- }
-
- @Test
- public void testTemplateIsPasswordEnabled() {
- assertTrue(isPasswordEnabled().apply(
- Template.builder().id("anid").passwordEnabled(true).build()
- ));
- assertFalse(isPasswordEnabled().apply(
- Template.builder().id("someid").passwordEnabled(false).build()
- ));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java
deleted file mode 100644
index ac2ecb1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.jclouds.cloudstack.predicates.UserPredicates.apiKeyEquals;
-import static org.jclouds.cloudstack.predicates.UserPredicates.isAdminAccount;
-import static org.jclouds.cloudstack.predicates.UserPredicates.isDomainAdminAccount;
-import static org.jclouds.cloudstack.predicates.UserPredicates.isUserAccount;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.User;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class UserPredicatesTest {
-
- @Test
- public void testMatchApiKey() {
- assertTrue(apiKeyEquals("random-text").apply(
- User.builder().id("random-id").apiKey("random-text").build()
- ));
- assertFalse(apiKeyEquals("something-different").apply(
- User.builder().id("random-id").apiKey("random-text").build()
- ));
- }
-
- @DataProvider(name = "accountType")
- public Object[][] getAccountTypes() {
- return new Object[][] {
- /* Type ID, isUser, isDomainAdmin, isAdmin */
- {Account.Type.USER, true, false, false},
- {Account.Type.DOMAIN_ADMIN, false, true, false},
- {Account.Type.ADMIN, false, false, true},
- {Account.Type.UNRECOGNIZED, false, false, false}
- };
- }
-
- @Test(dataProvider = "accountType")
- public void testAccountType(Account.Type type, boolean isUser, boolean isDomainAdmin, boolean isAdmin) {
- User testUser = User.builder().id("someid").accountType(type).build();
- assertEquals(isUserAccount().apply(testUser), isUser);
- assertEquals(isDomainAdminAccount().apply(testUser), isDomainAdmin);
- assertEquals(isAdminAccount().apply(testUser), isAdmin);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java
deleted file mode 100644
index 2c5f99b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.features.VirtualMachineApi;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", singleThreaded = true, testName = "VirtualMachineDestroyedTest")
-public class VirtualMachineDestroyedTest {
-
- CloudStackApi client;
- VirtualMachineApi virtualMachineClient;
-
- @BeforeMethod
- public void setUp() {
- client = createMock(CloudStackApi.class);
- virtualMachineClient = createMock(VirtualMachineApi.class);
- expect(client.getVirtualMachineApi()).andReturn(virtualMachineClient);
- }
-
- @Test
- public void testIsDestroyed() {
- VirtualMachine virtualMachine = VirtualMachine.builder().
- id("229").state(VirtualMachine.State.DESTROYED).build();
-
- expect(virtualMachineClient.getVirtualMachine(virtualMachine.getId())).andReturn(virtualMachine);
-
- replay(client, virtualMachineClient);
- assertTrue(new VirtualMachineDestroyed(client).apply(virtualMachine));
- verify(client, virtualMachineClient);
- }
-
- @Test
- public void testStillRunning() {
- VirtualMachine virtualMachine = VirtualMachine.builder().
- id("229").state(VirtualMachine.State.RUNNING).build();
-
- expect(virtualMachineClient.getVirtualMachine(virtualMachine.getId())).andReturn(virtualMachine);
-
- replay(client, virtualMachineClient);
- assertFalse(new VirtualMachineDestroyed(client).apply(virtualMachine));
- verify(client, virtualMachineClient);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java
deleted file mode 100644
index 11f2790..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.features.VirtualMachineApi;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", singleThreaded = true, testName = "VirtualMachineExpungedTest")
-public class VirtualMachineExpungedTest {
-
- CloudStackApi client;
- VirtualMachineApi virtualMachineClient;
-
- @BeforeMethod
- public void setUp() {
- client = createMock(CloudStackApi.class);
- virtualMachineClient = createMock(VirtualMachineApi.class);
- expect(client.getVirtualMachineApi()).andReturn(virtualMachineClient);
- }
-
- @Test
- public void testWaitForVirtualMachineToBeExpunged() {
- VirtualMachine virtualMachine = VirtualMachine.builder().id("229").build();
- expect(virtualMachineClient.getVirtualMachine(virtualMachine.getId())).andReturn(null);
-
- replay(client, virtualMachineClient);
- assertTrue(new VirtualMachineExpunged(client).apply(virtualMachine));
- verify(client, virtualMachineClient);
- }
-
- @Test
- public void testNoRemovedYet() {
- VirtualMachine virtualMachine = VirtualMachine.builder().id("229").build();
- expect(virtualMachineClient.getVirtualMachine(virtualMachine.getId())).andReturn(virtualMachine);
-
- replay(client, virtualMachineClient);
- assertFalse(new VirtualMachineExpunged(client).apply(virtualMachine));
- verify(client, virtualMachineClient);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java
deleted file mode 100644
index 269fa32..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.VirtualMachine.State;
-import org.jclouds.cloudstack.features.VirtualMachineApi;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit", singleThreaded = true, testName = "VirtualMachineRunningTest")
-public class VirtualMachineRunningTest {
-
- CloudStackApi client;
- VirtualMachineApi virtualMachineClient;
-
- @BeforeMethod
- public void setUp() {
- client = createMock(CloudStackApi.class);
- virtualMachineClient = createMock(VirtualMachineApi.class);
-
- expect(client.getVirtualMachineApi()).andReturn(virtualMachineClient);
- }
-
- @DataProvider(name = "virtualMachineStates")
- public Object[][] virtualMachineStates() {
- return new Object[][] {
- {State.RUNNING, true},
- {State.STARTING, false},
- {State.STOPPING, false},
- {State.STOPPED, false},
- {State.SHUTDOWNED, false},
- {State.DESTROYED, false},
- {State.EXPUNGING, false},
- {State.MIGRATING, false}
- };
- }
-
- @Test(dataProvider = "virtualMachineStates")
- public void testWaitForVirtualMachineToBeRunning(State state, boolean expected) {
- assertPredicateResult(state, expected);
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testThrowExceptionOnErrorState() {
- assertPredicateResult(State.ERROR, true);
- }
-
- private void assertPredicateResult(State state, boolean expected) {
- String virtualMachineId = "229";
- VirtualMachine virtualMachine = VirtualMachine.builder().
- id(virtualMachineId).state(state).build();
-
- expect(virtualMachineClient.getVirtualMachine(virtualMachineId)).andReturn(virtualMachine);
- replay(client, virtualMachineClient);
-
- assertEquals(new VirtualMachineRunning(client).apply(virtualMachine), expected);
- verify(client, virtualMachineClient);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java
deleted file mode 100644
index 8dfeb24..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.predicates;
-
-import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsAdvancedNetworks;
-import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityGroups;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.testng.annotations.Test;
-
-@Test(groups = "unit")
-public class ZonePredicatesTest {
-
- @Test
- public void testSupportsAdvancedNetworks() {
- assertTrue(supportsAdvancedNetworks().apply(
- Zone.builder().id("41").networkType(NetworkType.ADVANCED).build()
- ));
- assertFalse(supportsAdvancedNetworks().apply(
- Zone.builder().id("42").networkType(NetworkType.BASIC).build()
- ));
- }
-
- @Test
- public void testSupportsSecurityGroups() {
- assertTrue(supportsSecurityGroups().apply(
- Zone.builder().id("43").securityGroupsEnabled(true).build()
- ));
- assertFalse(supportsSecurityGroups().apply(
- Zone.builder().id("44").securityGroupsEnabled(false).build()
- ));
- }
-
-}
[43/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
deleted file mode 100644
index 8161e63..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Representation of the login API call response
- */
-public class LoginResponse {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromLoginResponse(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String username;
- protected String userId;
- protected String password;
- protected String domainId;
- protected long timeout;
- protected boolean registered;
- protected String accountName;
- protected String firstName;
- protected String lastName;
- protected Account.Type accountType;
- protected String timezone;
- protected String timezoneOffset;
- protected String sessionKey;
- protected String jSessionId;
-
- /**
- * @see LoginResponse#getUsername()
- */
- public T username(String username) {
- this.username = username;
- return self();
- }
-
- /**
- * @see LoginResponse#getUserId()
- */
- public T userId(String userId) {
- this.userId = userId;
- return self();
- }
-
- /**
- * @see LoginResponse#getPassword()
- */
- public T password(String password) {
- this.password = password;
- return self();
- }
-
- /**
- * @see LoginResponse#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see LoginResponse#getTimeout()
- */
- public T timeout(long timeout) {
- this.timeout = timeout;
- return self();
- }
-
- /**
- * @see LoginResponse#isRegistered()
- */
- public T registered(boolean registered) {
- this.registered = registered;
- return self();
- }
-
- /**
- * @see LoginResponse#getAccountName()
- */
- public T accountName(String accountName) {
- this.accountName = accountName;
- return self();
- }
-
- /**
- * @see LoginResponse#getFirstName()
- */
- public T firstName(String firstName) {
- this.firstName = firstName;
- return self();
- }
-
- /**
- * @see LoginResponse#getLastName()
- */
- public T lastName(String lastName) {
- this.lastName = lastName;
- return self();
- }
-
- /**
- * @see LoginResponse#getAccountType()
- */
- public T accountType(Account.Type accountType) {
- this.accountType = accountType;
- return self();
- }
-
- /**
- * @see LoginResponse#getTimezone()
- */
- public T timezone(String timezone) {
- this.timezone = timezone;
- return self();
- }
-
- /**
- * @see LoginResponse#getTimezoneOffset()
- */
- public T timezoneOffset(String timezoneOffset) {
- this.timezoneOffset = timezoneOffset;
- return self();
- }
-
- /**
- * @see LoginResponse#getSessionKey()
- */
- public T sessionKey(String sessionKey) {
- this.sessionKey = sessionKey;
- return self();
- }
-
- /**
- * @see LoginResponse#getJSessionId()
- */
- public T jSessionId(String jSessionId) {
- this.jSessionId = jSessionId;
- return self();
- }
-
- public LoginResponse build() {
- return new LoginResponse(username, userId, password, domainId, timeout, registered, accountName, firstName, lastName, accountType, timezone, timezoneOffset, sessionKey, jSessionId);
- }
-
- public T fromLoginResponse(LoginResponse in) {
- return this
- .username(in.getUsername())
- .userId(in.getUserId())
- .password(in.getPassword())
- .domainId(in.getDomainId())
- .timeout(in.getTimeout())
- .registered(in.isRegistered())
- .accountName(in.getAccountName())
- .firstName(in.getFirstName())
- .lastName(in.getLastName())
- .accountType(in.getAccountType())
- .timezone(in.getTimezone())
- .timezoneOffset(in.getTimezoneOffset())
- .sessionKey(in.getSessionKey())
- .jSessionId(in.getJSessionId());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String username;
- private final String userId;
- private final String password;
- private final String domainId;
- private final long timeout;
- private final boolean registered;
- private final String accountName;
- private final String firstName;
- private final String lastName;
- private final Account.Type accountType;
- private final String timezone;
- private final String timezoneOffset;
- private final String sessionKey;
- private final String jSessionId;
-
- @ConstructorProperties({
- "username", "userid", "password", "domainid", "timeout", "registered", "account", "firstname", "lastname", "type", "timezone", "timezoneoffset", "sessionkey", "jSessionId"
- })
- protected LoginResponse(@Nullable String username, @Nullable String userId, @Nullable String password, @Nullable String domainId, long timeout, boolean registered, @Nullable String accountName, @Nullable String firstName, @Nullable String lastName, @Nullable Account.Type accountType, @Nullable String timezone, @Nullable String timezoneOffset, @Nullable String sessionKey, @Nullable String jSessionId) {
- this.username = username;
- this.userId = userId;
- this.password = password;
- this.domainId = domainId;
- this.timeout = timeout;
- this.registered = registered;
- this.accountName = accountName;
- this.firstName = firstName;
- this.lastName = lastName;
- this.accountType = accountType;
- this.timezone = timezone;
- this.timezoneOffset = timezoneOffset;
- this.sessionKey = sessionKey;
- this.jSessionId = jSessionId;
- }
-
- @Nullable
- public String getUsername() {
- return this.username;
- }
-
- @Nullable
- public String getUserId() {
- return this.userId;
- }
-
- @Nullable
- public String getPassword() {
- return this.password;
- }
-
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- public long getTimeout() {
- return this.timeout;
- }
-
- public boolean isRegistered() {
- return this.registered;
- }
-
- @Nullable
- public String getAccountName() {
- return this.accountName;
- }
-
- @Nullable
- public String getFirstName() {
- return this.firstName;
- }
-
- @Nullable
- public String getLastName() {
- return this.lastName;
- }
-
- @Nullable
- public Account.Type getAccountType() {
- return this.accountType;
- }
-
- @Nullable
- public String getTimezone() {
- return this.timezone;
- }
-
- @Nullable
- public String getTimezoneOffset() {
- return this.timezoneOffset;
- }
-
- @Nullable
- public String getSessionKey() {
- return this.sessionKey;
- }
-
- @Nullable
- public String getJSessionId() {
- return this.jSessionId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(username, userId, password, domainId, timeout, registered, accountName, firstName, lastName, accountType, timezone, timezoneOffset, sessionKey, jSessionId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- LoginResponse that = LoginResponse.class.cast(obj);
- return Objects.equal(this.username, that.username)
- && Objects.equal(this.userId, that.userId)
- && Objects.equal(this.password, that.password)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.timeout, that.timeout)
- && Objects.equal(this.registered, that.registered)
- && Objects.equal(this.accountName, that.accountName)
- && Objects.equal(this.firstName, that.firstName)
- && Objects.equal(this.lastName, that.lastName)
- && Objects.equal(this.accountType, that.accountType)
- && Objects.equal(this.timezone, that.timezone)
- && Objects.equal(this.timezoneOffset, that.timezoneOffset)
- && Objects.equal(this.sessionKey, that.sessionKey)
- && Objects.equal(this.jSessionId, that.jSessionId);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("username", username).add("userId", userId).add("password", password).add("domainId", domainId).add("timeout", timeout).add("registered", registered).add("accountName", accountName).add("firstName", firstName).add("lastName", lastName).add("accountType", accountType).add("timezone", timezone).add("timezoneOffset", timezoneOffset).add("sessionKey", sessionKey).add("jSessionId", jSessionId);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NIC.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NIC.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NIC.java
deleted file mode 100644
index 0f8eae8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NIC.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.net.URI;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class NIC
- */
-public class NIC {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromNIC(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected URI broadcastURI;
- protected String gateway;
- protected String IPAddress;
- protected boolean isDefault;
- protected URI isolationURI;
- protected String netmask;
- protected String macAddress;
- protected String networkId;
- protected TrafficType trafficType;
- protected GuestIPType guestIPType;
-
- /**
- * @see NIC#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see NIC#getBroadcastURI()
- */
- public T broadcastURI(URI broadcastURI) {
- this.broadcastURI = broadcastURI;
- return self();
- }
-
- /**
- * @see NIC#getGateway()
- */
- public T gateway(String gateway) {
- this.gateway = gateway;
- return self();
- }
-
- /**
- * @see NIC#getIPAddress()
- */
- public T IPAddress(String IPAddress) {
- this.IPAddress = IPAddress;
- return self();
- }
-
- /**
- * @see NIC#isDefault()
- */
- public T isDefault(boolean isDefault) {
- this.isDefault = isDefault;
- return self();
- }
-
- /**
- * @see NIC#getIsolationURI()
- */
- public T isolationURI(URI isolationURI) {
- this.isolationURI = isolationURI;
- return self();
- }
-
- /**
- * @see NIC#getNetmask()
- */
- public T netmask(String netmask) {
- this.netmask = netmask;
- return self();
- }
-
- /**
- * @see NIC#getMacAddress()
- */
- public T macAddress(String macAddress) {
- this.macAddress = macAddress;
- return self();
- }
-
- /**
- * @see NIC#getNetworkId()
- */
- public T networkId(String networkId) {
- this.networkId = networkId;
- return self();
- }
-
- /**
- * @see NIC#getTrafficType()
- */
- public T trafficType(TrafficType trafficType) {
- this.trafficType = trafficType;
- return self();
- }
-
- /**
- * @see NIC#getGuestIPType()
- */
- public T guestIPType(GuestIPType guestIPType) {
- this.guestIPType = guestIPType;
- return self();
- }
-
- public NIC build() {
- return new NIC(id, broadcastURI, gateway, IPAddress, isDefault, isolationURI, netmask, macAddress, networkId, trafficType, guestIPType);
- }
-
- public T fromNIC(NIC in) {
- return this
- .id(in.getId())
- .broadcastURI(in.getBroadcastURI())
- .gateway(in.getGateway())
- .IPAddress(in.getIPAddress())
- .isDefault(in.isDefault())
- .isolationURI(in.getIsolationURI())
- .netmask(in.getNetmask())
- .macAddress(in.getMacAddress())
- .networkId(in.getNetworkId())
- .trafficType(in.getTrafficType())
- .guestIPType(in.getGuestIPType());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final URI broadcastURI;
- private final String gateway;
- private final String IPAddress;
- private final boolean isDefault;
- private final URI isolationURI;
- private final String netmask;
- private final String macAddress;
- private final String networkId;
- private final TrafficType trafficType;
- private final GuestIPType guestIPType;
-
- @ConstructorProperties({
- "id", "broadcasturi", "gateway", "ipaddress", "isdefault", "isolationuri", "netmask", "macaddress", "networkid", "traffictype", "type"
- })
- protected NIC(String id, @Nullable URI broadcastURI, @Nullable String gateway, @Nullable String IPAddress, boolean isDefault,
- @Nullable URI isolationURI, @Nullable String netmask, @Nullable String macAddress, @Nullable String networkId,
- @Nullable TrafficType trafficType, @Nullable GuestIPType guestIPType) {
- this.id = checkNotNull(id, "id");
- this.broadcastURI = broadcastURI;
- this.gateway = gateway;
- this.IPAddress = IPAddress;
- this.isDefault = isDefault;
- this.isolationURI = isolationURI;
- this.netmask = netmask;
- this.macAddress = macAddress;
- this.networkId = networkId;
- this.trafficType = trafficType;
- this.guestIPType = guestIPType;
- }
-
- /**
- * the ID of the nic
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * the broadcast uri of the nic
- */
- @Nullable
- public URI getBroadcastURI() {
- return this.broadcastURI;
- }
-
- /**
- * the gateway of the nic
- */
- @Nullable
- public String getGateway() {
- return this.gateway;
- }
-
- /**
- * the ip address of the nic
- */
- @Nullable
- public String getIPAddress() {
- return this.IPAddress;
- }
-
- /**
- * true if nic is default, false otherwise
- */
- public boolean isDefault() {
- return this.isDefault;
- }
-
- /**
- * the isolation uri of the nic
- */
- @Nullable
- public URI getIsolationURI() {
- return this.isolationURI;
- }
-
- /**
- * the netmask of the nic
- */
- @Nullable
- public String getNetmask() {
- return this.netmask;
- }
-
- /**
- * the MAC Address of the NIC
- */
- @Nullable
- public String getMacAddress() {
- return this.macAddress;
- }
-
- /**
- * the ID of the corresponding network
- */
- @Nullable
- public String getNetworkId() {
- return this.networkId;
- }
-
- /**
- * the traffic type of the nic
- */
- @Nullable
- public TrafficType getTrafficType() {
- return this.trafficType;
- }
-
- /**
- * the type of the nic
- */
- @Nullable
- public GuestIPType getGuestIPType() {
- return this.guestIPType;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, broadcastURI, gateway, IPAddress, isDefault, isolationURI, netmask, macAddress, networkId, trafficType, guestIPType);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- NIC that = NIC.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.broadcastURI, that.broadcastURI)
- && Objects.equal(this.gateway, that.gateway)
- && Objects.equal(this.IPAddress, that.IPAddress)
- && Objects.equal(this.isDefault, that.isDefault)
- && Objects.equal(this.isolationURI, that.isolationURI)
- && Objects.equal(this.netmask, that.netmask)
- && Objects.equal(this.macAddress, that.macAddress)
- && Objects.equal(this.networkId, that.networkId)
- && Objects.equal(this.trafficType, that.trafficType)
- && Objects.equal(this.guestIPType, that.guestIPType);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("broadcastURI", broadcastURI).add("gateway", gateway).add("IPAddress", IPAddress)
- .add("isDefault", isDefault).add("isolationURI", isolationURI).add("netmask", netmask).add("macAddress", macAddress)
- .add("networkId", networkId).add("trafficType", trafficType).add("guestIPType", guestIPType);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Network.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Network.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Network.java
deleted file mode 100644
index a6ec5a4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Network.java
+++ /dev/null
@@ -1,748 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.net.URI;
-import java.util.List;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
-
-/**
- * Class Network
- */
-public class Network {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromNetwork(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected String broadcastDomainType;
- protected URI broadcastURI;
- protected String displayText;
- protected String DNS1;
- protected String DNS2;
- protected String domain;
- protected String domainId;
- protected String endIP;
- protected String gateway;
- protected boolean isDefault;
- protected boolean isShared;
- protected boolean isSystem;
- protected String netmask;
- protected String networkDomain;
- protected String networkOfferingAvailability;
- protected String networkOfferingDisplayText;
- protected String networkOfferingId;
- protected String networkOfferingName;
- protected String related;
- protected String startIP;
- protected String name;
- protected String state;
- protected GuestIPType guestIPType;
- protected String VLAN;
- protected TrafficType trafficType;
- protected String zoneId;
- protected ImmutableSet.Builder<String> tags = ImmutableSet.<String>builder();
- protected boolean securityGroupEnabled;
- protected Set<? extends NetworkService> services = ImmutableSortedSet.of();
-
- /**
- * @see Network#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Network#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see Network#getBroadcastDomainType()
- */
- public T broadcastDomainType(String broadcastDomainType) {
- this.broadcastDomainType = broadcastDomainType;
- return self();
- }
-
- /**
- * @see Network#getBroadcastURI()
- */
- public T broadcastURI(URI broadcastURI) {
- this.broadcastURI = broadcastURI;
- return self();
- }
-
- /**
- * @see Network#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @return the DNS for the Network
- */
- public T DNS(List<String> DNS) {
- if (!DNS.isEmpty()) this.DNS1 = DNS.get(0);
- if (DNS.size() > 1) this.DNS2 = DNS.get(1);
- return self();
- }
-
- /**
- * @see Network#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see Network#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see Network#getEndIP()
- */
- public T endIP(String endIP) {
- this.endIP = endIP;
- return self();
- }
-
- /**
- * @see Network#getGateway()
- */
- public T gateway(String gateway) {
- this.gateway = gateway;
- return self();
- }
-
- /**
- * @see Network#isDefault()
- */
- public T isDefault(boolean isDefault) {
- this.isDefault = isDefault;
- return self();
- }
-
- /**
- * @see Network#isShared()
- */
- public T isShared(boolean isShared) {
- this.isShared = isShared;
- return self();
- }
-
- /**
- * @see Network#isSystem()
- */
- public T isSystem(boolean isSystem) {
- this.isSystem = isSystem;
- return self();
- }
-
- /**
- * @see Network#getNetmask()
- */
- public T netmask(String netmask) {
- this.netmask = netmask;
- return self();
- }
-
- /**
- * @see Network#getNetworkDomain()
- */
- public T networkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- return self();
- }
-
- /**
- * @see Network#getNetworkOfferingAvailability()
- */
- public T networkOfferingAvailability(String networkOfferingAvailability) {
- this.networkOfferingAvailability = networkOfferingAvailability;
- return self();
- }
-
- /**
- * @see Network#getNetworkOfferingDisplayText()
- */
- public T networkOfferingDisplayText(String networkOfferingDisplayText) {
- this.networkOfferingDisplayText = networkOfferingDisplayText;
- return self();
- }
-
- /**
- * @see Network#getNetworkOfferingId()
- */
- public T networkOfferingId(String networkOfferingId) {
- this.networkOfferingId = networkOfferingId;
- return self();
- }
-
- /**
- * @see Network#getNetworkOfferingName()
- */
- public T networkOfferingName(String networkOfferingName) {
- this.networkOfferingName = networkOfferingName;
- return self();
- }
-
- /**
- * @see Network#getRelated()
- */
- public T related(String related) {
- this.related = related;
- return self();
- }
-
- /**
- * @see Network#getStartIP()
- */
- public T startIP(String startIP) {
- this.startIP = startIP;
- return self();
- }
-
- /**
- * @see Network#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Network#getState()
- */
- public T state(String state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see Network#getGuestIPType()
- */
- public T guestIPType(GuestIPType guestIPType) {
- this.guestIPType = guestIPType;
- return self();
- }
-
- /**
- * @see Network#getVLAN()
- */
- public T VLAN(String VLAN) {
- this.VLAN = VLAN;
- return self();
- }
-
- /**
- * @see Network#getTrafficType()
- */
- public T trafficType(TrafficType trafficType) {
- this.trafficType = trafficType;
- return self();
- }
-
- /**
- * @see Network#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see Network#getTags()
- */
- public T tags(Iterable<String> tags) {
- this.tags = ImmutableSet.<String>builder().addAll(tags);
- return self();
- }
-
- /**
- * @see Network#getTags()
- */
- public T tag(String tag) {
- this.tags.add(tag);
- return self();
- }
-
-
- /**
- * @see Network#isSecurityGroupEnabled()
- */
- public T securityGroupEnabled(boolean securityGroupEnabled) {
- this.securityGroupEnabled = securityGroupEnabled;
- return self();
- }
-
- /**
- * @see Network#getServices()
- */
- public T services(Set<? extends NetworkService> services) {
- this.services = services;
- return self();
- }
-
- public Network build() {
- return new Network(id, account, broadcastDomainType, broadcastURI, displayText, DNS1, DNS2, domain, domainId, endIP, gateway, isDefault, isShared, isSystem, netmask, networkDomain, networkOfferingAvailability, networkOfferingDisplayText, networkOfferingId, networkOfferingName, related, startIP, name, state, guestIPType, VLAN, trafficType, zoneId, tags.build(), securityGroupEnabled, services);
- }
-
- public T fromNetwork(Network in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .broadcastDomainType(in.getBroadcastDomainType())
- .broadcastURI(in.getBroadcastURI())
- .displayText(in.getDisplayText())
- .DNS(in.getDNS())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .endIP(in.getEndIP())
- .gateway(in.getGateway())
- .isDefault(in.isDefault())
- .isShared(in.isShared())
- .isSystem(in.isSystem())
- .netmask(in.getNetmask())
- .networkDomain(in.getNetworkDomain())
- .networkOfferingAvailability(in.getNetworkOfferingAvailability())
- .networkOfferingDisplayText(in.getNetworkOfferingDisplayText())
- .networkOfferingId(in.getNetworkOfferingId())
- .networkOfferingName(in.getNetworkOfferingName())
- .related(in.getRelated())
- .startIP(in.getStartIP())
- .name(in.getName())
- .state(in.getState())
- .guestIPType(in.getGuestIPType())
- .VLAN(in.getVLAN())
- .trafficType(in.getTrafficType())
- .zoneId(in.getZoneId())
- .tags(in.getTags())
- .securityGroupEnabled(in.isSecurityGroupEnabled())
- .services(in.getServices());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final String broadcastDomainType;
- private final URI broadcastURI;
- private final String displayText;
- private final String DNS1;
- private final String DNS2;
- private final String domain;
- private final String domainId;
- private final String endIP;
- private final String gateway;
- private final boolean isDefault;
- private final boolean isShared;
- private final boolean isSystem;
- private final String netmask;
- private final String networkDomain;
- private final String networkOfferingAvailability;
- private final String networkOfferingDisplayText;
- private final String networkOfferingId;
- private final String networkOfferingName;
- private final String related;
- private final String startIP;
- private final String name;
- private final String state;
- private final GuestIPType guestIPType;
- private final String VLAN;
- private final TrafficType trafficType;
- private final String zoneId;
- private final Set<String> tags;
- private final boolean securityGroupEnabled;
- private final Set<? extends NetworkService> services;
-
- @ConstructorProperties({
- "id", "account", "broadcastdomaintype", "broadcasturi", "displaytext", "dns1", "dns2", "domain", "domainid", "endip", "gateway", "isdefault", "isshared", "issystem", "netmask", "networkdomain", "networkofferingavailability", "networkofferingdisplaytext", "networkofferingid", "networkofferingname", "related", "startip", "name", "state", "type", "vlan", "traffictype", "zoneid", "tags", "securitygroupenabled", "service"
- })
- protected Network(String id, @Nullable String account, @Nullable String broadcastDomainType, @Nullable URI broadcastURI,
- @Nullable String displayText, @Nullable String DNS1, @Nullable String DNS2, @Nullable String domain, @Nullable String domainId,
- @Nullable String endIP, @Nullable String gateway, boolean isDefault, boolean isShared, boolean isSystem,
- @Nullable String netmask, @Nullable String networkDomain, @Nullable String networkOfferingAvailability,
- @Nullable String networkOfferingDisplayText, @Nullable String networkOfferingId, @Nullable String networkOfferingName,
- @Nullable String related, @Nullable String startIP, @Nullable String name, @Nullable String state,
- @Nullable GuestIPType guestIPType, @Nullable String VLAN, @Nullable TrafficType trafficType,
- @Nullable String zoneId, @Nullable Iterable<String> tags, boolean securityGroupEnabled, Set<? extends NetworkService> services) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.broadcastDomainType = broadcastDomainType;
- this.broadcastURI = broadcastURI;
- this.displayText = displayText;
- this.DNS1 = DNS1;
- this.DNS2 = DNS2;
- this.domain = domain;
- this.domainId = domainId;
- this.endIP = endIP;
- this.gateway = gateway;
- this.isDefault = isDefault;
- this.isShared = isShared;
- this.isSystem = isSystem;
- this.netmask = netmask;
- this.networkDomain = networkDomain;
- this.networkOfferingAvailability = networkOfferingAvailability;
- this.networkOfferingDisplayText = networkOfferingDisplayText;
- this.networkOfferingId = networkOfferingId;
- this.networkOfferingName = networkOfferingName;
- this.related = related;
- this.startIP = startIP;
- this.name = name;
- this.state = state;
- this.guestIPType = guestIPType;
- this.VLAN = VLAN;
- this.trafficType = trafficType;
- this.zoneId = zoneId;
- this.tags = tags != null ? ImmutableSet.copyOf(tags) : ImmutableSet.<String> of();
- this.securityGroupEnabled = securityGroupEnabled;
- this.services = ImmutableSortedSet.copyOf(services);
- }
-
- /**
- * @return network id
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account associated with the network
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return Broadcast domain type of the network
- */
- @Nullable
- public String getBroadcastDomainType() {
- return this.broadcastDomainType;
- }
-
- /**
- * @return broadcast uri of the network
- */
- @Nullable
- public URI getBroadcastURI() {
- return this.broadcastURI;
- }
-
- /**
- * @return the display text of the zone
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- public List<String> getDNS() {
- ImmutableList.Builder<String> builder = ImmutableList.builder();
- if (DNS1 != null && !"".equals(DNS1))
- builder.add(DNS1);
- if (DNS2 != null && !"".equals(DNS2))
- builder.add(DNS2);
- return builder.build();
- }
-
- /**
- * @return Domain name for the Network
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain id of the Network
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the end ip of the network
- */
- @Nullable
- public String getEndIP() {
- return this.endIP;
- }
-
- /**
- * @return the network's gateway
- */
- @Nullable
- public String getGateway() {
- return this.gateway;
- }
-
- /**
- * @return true if network offering is default, false otherwise
- */
- public boolean isDefault() {
- return this.isDefault;
- }
-
- /**
- * @return true if network offering is shared, false otherwise
- */
- public boolean isShared() {
- return this.isShared;
- }
-
- /**
- * @return true if network offering is system, false otherwise
- */
- public boolean isSystem() {
- return this.isSystem;
- }
-
- /**
- * @return the network's netmask
- */
- @Nullable
- public String getNetmask() {
- return this.netmask;
- }
-
- /**
- * @return the network domain
- */
- @Nullable
- public String getNetworkDomain() {
- return this.networkDomain;
- }
-
- /**
- * @return availability of the network offering the network is created from
- */
- @Nullable
- public String getNetworkOfferingAvailability() {
- return this.networkOfferingAvailability;
- }
-
- /**
- * @return display text of the network offering the network is created from
- */
- @Nullable
- public String getNetworkOfferingDisplayText() {
- return this.networkOfferingDisplayText;
- }
-
- /**
- * @return network offering id the network is created from
- */
- @Nullable
- public String getNetworkOfferingId() {
- return this.networkOfferingId;
- }
-
- /**
- * @return name of the network offering the network is created from
- */
- @Nullable
- public String getNetworkOfferingName() {
- return this.networkOfferingName;
- }
-
- /**
- * @return related to what other network configuration
- */
- @Nullable
- public String getRelated() {
- return this.related;
- }
-
- /**
- * @return the start ip of the network
- */
- @Nullable
- public String getStartIP() {
- return this.startIP;
- }
-
- /**
- * @return network name
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return state of the network
- */
- @Nullable
- public String getState() {
- return this.state;
- }
-
- /**
- * @return the GuestIPType of the network
- */
- public GuestIPType getGuestIPType() {
- return this.guestIPType;
- }
-
- /**
- * @return the vlan range of the zone
- */
- @Nullable
- public String getVLAN() {
- return this.VLAN;
- }
-
- /**
- * @return the traffic type for this network offering
- */
- @Nullable
- public TrafficType getTrafficType() {
- return this.trafficType;
- }
-
- /**
- * @return zone id of the network
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return the tags for the Network
- */
- public Set<String> getTags() {
- return this.tags;
- }
-
- /**
- * @return true if security group is enabled, false otherwise
- */
- public boolean isSecurityGroupEnabled() {
- return this.securityGroupEnabled;
- }
-
- /**
- * @return the list of services
- */
- public Set<? extends NetworkService> getServices() {
- return this.services;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, broadcastDomainType, broadcastURI, displayText, DNS1, DNS2, domain, domainId, endIP, gateway, isDefault, isShared, isSystem, netmask, networkDomain, networkOfferingAvailability, networkOfferingDisplayText, networkOfferingId, networkOfferingName, related, startIP, name, state, guestIPType, VLAN, trafficType, zoneId, tags, securityGroupEnabled, services);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Network that = Network.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.broadcastDomainType, that.broadcastDomainType)
- && Objects.equal(this.broadcastURI, that.broadcastURI)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.DNS1, that.DNS1)
- && Objects.equal(this.DNS2, that.DNS2)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.endIP, that.endIP)
- && Objects.equal(this.gateway, that.gateway)
- && Objects.equal(this.isDefault, that.isDefault)
- && Objects.equal(this.isShared, that.isShared)
- && Objects.equal(this.isSystem, that.isSystem)
- && Objects.equal(this.netmask, that.netmask)
- && Objects.equal(this.networkDomain, that.networkDomain)
- && Objects.equal(this.networkOfferingAvailability, that.networkOfferingAvailability)
- && Objects.equal(this.networkOfferingDisplayText, that.networkOfferingDisplayText)
- && Objects.equal(this.networkOfferingId, that.networkOfferingId)
- && Objects.equal(this.networkOfferingName, that.networkOfferingName)
- && Objects.equal(this.related, that.related)
- && Objects.equal(this.startIP, that.startIP)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.guestIPType, that.guestIPType)
- && Objects.equal(this.VLAN, that.VLAN)
- && Objects.equal(this.trafficType, that.trafficType)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.tags, that.tags)
- && Objects.equal(this.securityGroupEnabled, that.securityGroupEnabled)
- && Objects.equal(this.services, that.services);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("broadcastDomainType", broadcastDomainType).add("broadcastURI", broadcastURI)
- .add("displayText", displayText).add("DNS1", DNS1).add("DNS2", DNS2).add("domain", domain).add("domainId", domainId)
- .add("endIP", endIP).add("gateway", gateway).add("isDefault", isDefault).add("isShared", isShared).add("isSystem", isSystem)
- .add("netmask", netmask).add("networkDomain", networkDomain).add("networkOfferingAvailability", networkOfferingAvailability)
- .add("networkOfferingDisplayText", networkOfferingDisplayText).add("networkOfferingId", networkOfferingId)
- .add("networkOfferingName", networkOfferingName).add("related", related).add("startIP", startIP).add("name", name)
- .add("state", state).add("guestIPType", guestIPType).add("VLAN", VLAN).add("trafficType", trafficType)
- .add("zoneId", zoneId).add("tags", tags).add("securityGroupEnabled", securityGroupEnabled).add("services", services);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
deleted file mode 100644
index 9937391..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class NetworkOffering
- */
-public class NetworkOffering implements Comparable<NetworkOffering> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromNetworkOffering(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String name;
- protected String displayText;
- protected Date created;
- protected NetworkOfferingAvailabilityType availability;
- protected Integer maxConnections;
- protected boolean isDefault;
- protected boolean supportsVLAN;
- protected TrafficType trafficType;
- protected GuestIPType guestIPType;
- protected int networkRate;
- protected ImmutableSet.Builder<String> tags = ImmutableSet.<String>builder();
-
- /**
- * @see NetworkOffering#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see NetworkOffering#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see NetworkOffering#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see NetworkOffering#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see NetworkOffering#getAvailability()
- */
- public T availability(NetworkOfferingAvailabilityType availability) {
- this.availability = availability;
- return self();
- }
-
- /**
- * @see NetworkOffering#getMaxConnections()
- */
- public T maxConnections(Integer maxConnections) {
- this.maxConnections = maxConnections;
- return self();
- }
-
- /**
- * @see NetworkOffering#isDefault()
- */
- public T isDefault(boolean isDefault) {
- this.isDefault = isDefault;
- return self();
- }
-
- /**
- * @see NetworkOffering#supportsVLAN()
- */
- public T supportsVLAN(boolean supportsVLAN) {
- this.supportsVLAN = supportsVLAN;
- return self();
- }
-
- /**
- * @see NetworkOffering#getTrafficType()
- */
- public T trafficType(TrafficType trafficType) {
- this.trafficType = trafficType;
- return self();
- }
-
- /**
- * @see NetworkOffering#getGuestIPType()
- */
- public T guestIPType(GuestIPType guestIPType) {
- this.guestIPType = guestIPType;
- return self();
- }
-
- /**
- * @see NetworkOffering#getNetworkRate()
- */
- public T networkRate(int networkRate) {
- this.networkRate = networkRate;
- return self();
- }
-
- /**
- * @see NetworkOffering#getTags()
- */
- public T tags(Iterable<String> tags) {
- this.tags = ImmutableSet.<String>builder().addAll(tags);
- return self();
- }
-
- /**
- * @see NetworkOffering#getTags()
- */
- public T tag(String tag) {
- this.tags.add(tag);
- return self();
- }
-
-
- public NetworkOffering build() {
- return new NetworkOffering(id, name, displayText, created, availability, maxConnections, isDefault, supportsVLAN, trafficType, guestIPType, networkRate, tags.build());
- }
-
- public T fromNetworkOffering(NetworkOffering in) {
- return this
- .id(in.getId())
- .name(in.getName())
- .displayText(in.getDisplayText())
- .created(in.getCreated())
- .availability(in.getAvailability())
- .maxConnections(in.getMaxConnections())
- .isDefault(in.isDefault())
- .supportsVLAN(in.supportsVLAN())
- .trafficType(in.getTrafficType())
- .guestIPType(in.getGuestIPType())
- .networkRate(in.getNetworkRate())
- .tags(in.getTags());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String name;
- private final String displayText;
- private final Date created;
- private final NetworkOfferingAvailabilityType availability;
- private final Integer maxConnections;
- private final boolean isDefault;
- private final boolean supportsVLAN;
- private final TrafficType trafficType;
- private final GuestIPType guestIPType;
- private final int networkRate;
- private final Set<String> tags;
-
- @ConstructorProperties({
- "id", "name", "displaytext", "created", "availability", "maxconnections", "isdefault", "specifyvlan", "traffictype", "guestiptype", "networkrate", "tags"
- })
- protected NetworkOffering(String id, @Nullable String name, @Nullable String displayText, @Nullable Date created, @Nullable NetworkOfferingAvailabilityType availability, @Nullable Integer maxConnections, boolean isDefault, boolean supportsVLAN, @Nullable TrafficType trafficType, @Nullable GuestIPType guestIPType, int networkRate, @Nullable Iterable<String> tags) {
- this.id = checkNotNull(id, "id");
- this.name = name;
- this.displayText = displayText;
- this.created = created;
- this.availability = availability;
- this.maxConnections = maxConnections;
- this.isDefault = isDefault;
- this.supportsVLAN = supportsVLAN;
- this.trafficType = trafficType;
- this.guestIPType = guestIPType;
- this.networkRate = networkRate;
- this.tags = tags != null ? ImmutableSet.copyOf(tags) : ImmutableSet.<String> of();
- }
-
- /**
- * @return the id of the network offering
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the name of the network offering
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return an alternate display text of the network offering.
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- /**
- * @return the date this network offering was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return Availability name for the offering
- */
- @Nullable
- public NetworkOfferingAvailabilityType getAvailability() {
- return this.availability;
- }
-
- /**
- * @return the max number of concurrent connection the network offering
- * supports
- */
- @Nullable
- public Integer getMaxConnections() {
- return this.maxConnections;
- }
-
- /**
- * @return true if network offering is default, false otherwise
- */
- public boolean isDefault() {
- return this.isDefault;
- }
-
- /**
- * @return true if network offering supports vlans, false otherwise
- */
- public boolean supportsVLAN() {
- return this.supportsVLAN;
- }
-
- /**
- * @return the traffic type for this network offering
- */
- @Nullable
- public TrafficType getTrafficType() {
- return this.trafficType;
- }
-
- /**
- * @return the guest ip type for this network offering
- */
- @Nullable
- public GuestIPType getGuestIPType() {
- return this.guestIPType;
- }
-
- /**
- * @return data transfer rate in megabits per second allowed.
- */
- public int getNetworkRate() {
- return this.networkRate;
- }
-
- /**
- * @return the tags for the network offering
- */
- public Set<String> getTags() {
- return this.tags;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name, displayText, created, availability, maxConnections, isDefault, supportsVLAN, trafficType, guestIPType, networkRate, tags);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- NetworkOffering that = NetworkOffering.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.availability, that.availability)
- && Objects.equal(this.maxConnections, that.maxConnections)
- && Objects.equal(this.isDefault, that.isDefault)
- && Objects.equal(this.supportsVLAN, that.supportsVLAN)
- && Objects.equal(this.trafficType, that.trafficType)
- && Objects.equal(this.guestIPType, that.guestIPType)
- && Objects.equal(this.networkRate, that.networkRate)
- && Objects.equal(this.tags, that.tags);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("availability", availability).add("maxConnections", maxConnections).add("isDefault", isDefault).add("supportsVLAN", supportsVLAN).add("trafficType", trafficType).add("guestIPType", guestIPType).add("networkRate", networkRate).add("tags", tags);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(NetworkOffering o) {
- return id.compareTo(o.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java
deleted file mode 100644
index 55f9065..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-public enum NetworkOfferingAvailabilityType {
-
- DEFAULT,
-
- REQUIRED, /* default value for Guest Virtual network offering */
-
- OPTIONAL, /* default value for Guest Direct network offering */
-
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static NetworkOfferingAvailabilityType fromValue(String type) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
deleted file mode 100644
index 800bc23..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Sets;
-
-/**
- * Class NetworkService
- */
-public class NetworkService implements Comparable<NetworkService> {
-
- public static class Capability implements Comparable<Capability> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromCapability(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String name;
- protected String value;
-
- /**
- * @see Capability#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Capability#getValue()
- */
- public T value(String value) {
- this.value = value;
- return self();
- }
-
- public Capability build() {
- return new Capability(name, value);
- }
-
- public T fromCapability(Capability in) {
- return this
- .name(in.getName())
- .value(in.getValue());
- }
-
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String name;
- private final String value;
-
- @ConstructorProperties({
- "name", "value"
- })
- protected Capability(String name, @Nullable String value) {
- this.name = checkNotNull(name, "name");
- this.value = value;
- }
-
- public String getName() {
- return this.name;
- }
-
- @Nullable
- public String getValue() {
- return this.value;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name, value);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Capability that = Capability.class.cast(obj);
- return Objects.equal(this.name, that.name)
- && Objects.equal(this.value, that.value);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("name", name).add("value", value);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Capability o) {
- return name.compareTo(o.getName());
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromNetworkService(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String name;
- protected Set<Capability> capabilities = Sets.newHashSet();
-
- /**
- * @see NetworkService#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see NetworkService#getCapabilities()
- */
- public T capabilities(Map<String, String> capabilities) {
- for (Map.Entry<String, String> entry : capabilities.entrySet()) {
- this.capabilities.add(Capability.builder().name(entry.getKey()).value(entry.getValue()).build());
- }
- return self();
- }
-
- public NetworkService build() {
- return new NetworkService(name, capabilities);
- }
-
- public T fromNetworkService(NetworkService in) {
- return this
- .name(in.getName())
- .capabilities(in.getCapabilities());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String name;
- private final Set<Capability> capabilities;
-
- @ConstructorProperties({
- "name", "capability"
- })
- protected NetworkService(String name, @Nullable Set<Capability> capabilities) {
- this.name = checkNotNull(name, "name");
- this.capabilities = capabilities == null ? ImmutableSet.<Capability>of() : ImmutableSortedSet.copyOf(capabilities);
- }
-
- public String getName() {
- return this.name;
- }
-
- public Map<String, String> getCapabilities() {
- // so tests and serialization comes out expected
- ImmutableSortedMap.Builder<String, String> returnVal = ImmutableSortedMap.naturalOrder();
- for (Capability capability : capabilities) {
- returnVal.put(capability.name, capability.value);
- }
- return returnVal.build();
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name, capabilities);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- NetworkService that = NetworkService.class.cast(obj);
- return Objects.equal(this.name, that.name)
- && Objects.equal(this.capabilities, that.capabilities);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(NetworkService o) {
- return name.compareTo(o.getName());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java
deleted file mode 100644
index b014e74..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * @see TemplateApi#listZones
- */
-public enum NetworkType {
- BASIC,
-
- ADVANCED,
-
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static NetworkType fromValue(String type) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/OSType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/OSType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/OSType.java
deleted file mode 100644
index b03738f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/OSType.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class OSType
- */
-public class OSType implements Comparable<OSType> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromOSType(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String OSCategoryId;
- protected String description;
-
- /**
- * @see OSType#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see OSType#getOSCategoryId()
- */
- public T OSCategoryId(String OSCategoryId) {
- this.OSCategoryId = OSCategoryId;
- return self();
- }
-
- /**
- * @see OSType#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- public OSType build() {
- return new OSType(id, OSCategoryId, description);
- }
-
- public T fromOSType(OSType in) {
- return this
- .id(in.getId())
- .OSCategoryId(in.getOSCategoryId())
- .description(in.getDescription());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String OSCategoryId;
- private final String description;
-
- @ConstructorProperties({
- "id", "oscategoryid", "description"
- })
- protected OSType(String id, @Nullable String OSCategoryId, @Nullable String description) {
- this.id = checkNotNull(id, "id");
- this.OSCategoryId = OSCategoryId;
- this.description = description;
- }
-
- /**
- * @return the ID of the OS type
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the ID of the OS category
- */
- @Nullable
- public String getOSCategoryId() {
- return this.OSCategoryId;
- }
-
- /**
- * @return the name/description of the OS type
- */
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, OSCategoryId, description);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- OSType that = OSType.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.OSCategoryId, that.OSCategoryId)
- && Objects.equal(this.description, that.description);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(OSType o) {
- return id.compareTo(o.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java
deleted file mode 100644
index 5da62af..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public enum PermissionOperation {
-
- add, remove, reset, UNRECOGNIZED;
-
- public static PermissionOperation fromValue(String format) {
- try {
- return valueOf(checkNotNull(format, "format"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Pod.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Pod.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Pod.java
deleted file mode 100644
index 4186812..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Pod.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Represents a Pod in CloudStack.
- */
-public class Pod implements Comparable<Pod> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromPod(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String name;
- protected String zoneId;
- protected String zoneName;
- protected String gateway;
- protected String netmask;
- protected String startIp;
- protected String endIp;
- protected AllocationState allocationState;
-
- /**
- * @see Pod#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Pod#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Pod#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see Pod#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- /**
- * @see Pod#getGateway()
- */
- public T gateway(String gateway) {
- this.gateway = gateway;
- return self();
- }
-
- /**
- * @see Pod#getNetmask()
- */
- public T netmask(String netmask) {
- this.netmask = netmask;
- return self();
- }
-
- /**
- * @see Pod#getStartIp()
- */
- public T startIp(String startIp) {
- this.startIp = startIp;
- return self();
- }
-
- /**
- * @see Pod#getEndIp()
- */
- public T endIp(String endIp) {
- this.endIp = endIp;
- return self();
- }
-
- /**
- * @see Pod#getAllocationState()
- */
- public T allocationState(AllocationState allocationState) {
- this.allocationState = allocationState;
- return self();
- }
-
- public Pod build() {
- return new Pod(id, name, zoneId, zoneName, gateway, netmask, startIp, endIp, allocationState);
- }
-
- public T fromPod(Pod in) {
- return this
- .id(in.getId())
- .name(in.getName())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName())
- .gateway(in.getGateway())
- .netmask(in.getNetmask())
- .startIp(in.getStartIp())
- .endIp(in.getEndIp())
- .allocationState(in.getAllocationState());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String name;
- private final String zoneId;
- private final String zoneName;
- private final String gateway;
- private final String netmask;
- private final String startIp;
- private final String endIp;
- private final AllocationState allocationState;
-
- @ConstructorProperties({
- "id", "name", "zoneid", "zonename", "gateway", "netmask", "startip", "endip", "allocationstate"
- })
- protected Pod(String id, @Nullable String name, @Nullable String zoneId, @Nullable String zoneName, @Nullable String gateway, @Nullable String netmask, @Nullable String startIp, @Nullable String endIp, @Nullable AllocationState allocationState) {
- this.id = checkNotNull(id, "id");
- this.name = name;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- this.gateway = gateway;
- this.netmask = netmask;
- this.startIp = startIp;
- this.endIp = endIp;
- this.allocationState = allocationState;
- }
-
- /**
- * @return id the ID of the Pod
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return name the name of the Pod
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return zoneId the Zone ID of the Pod
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return zoneName the Zone name of the Pod
- */
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- /**
- * @return gateway the gateway of the Pod
- */
- @Nullable
- public String getGateway() {
- return this.gateway;
- }
-
- /**
- * @return netmask the netmask of the Pod
- */
- @Nullable
- public String getNetmask() {
- return this.netmask;
- }
-
- /**
- * @return startIp the starting IP for the Pod
- */
- @Nullable
- public String getStartIp() {
- return this.startIp;
- }
-
- /**
- * @return endIp the ending IP for the Pod
- */
- @Nullable
- public String getEndIp() {
- return this.endIp;
- }
-
- /**
- * @return the allocation state of the cluster
- */
- @Nullable
- public AllocationState getAllocationState() {
- return this.allocationState;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name, zoneId, zoneName, gateway, netmask, startIp, endIp, allocationState);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Pod that = Pod.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName)
- && Objects.equal(this.gateway, that.gateway)
- && Objects.equal(this.netmask, that.netmask)
- && Objects.equal(this.startIp, that.startIp)
- && Objects.equal(this.endIp, that.endIp)
- && Objects.equal(this.allocationState, that.allocationState);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("name", name).add("zoneId", zoneId).add("zoneName", zoneName).add("gateway", gateway).add("netmask", netmask).add("startIp", startIp).add("endIp", endIp).add("allocationState", allocationState);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Pod other) {
- return this.id.compareTo(other.id);
- }
-}
[34/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java
deleted file mode 100644
index 0de8292..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.StorageType;
-import org.jclouds.cloudstack.domain.SystemVmType;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to control how service offerings are created
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createServiceOffering.html"
- * />
- */
-public class CreateServiceOfferingOptions extends AccountInDomainOptions {
-
- public static final CreateServiceOfferingOptions NONE = new CreateServiceOfferingOptions();
-
- /**
- * @param hostTags
- * the host tag for this service offering
- */
- public CreateServiceOfferingOptions hostTags(Set<String> hostTags) {
- this.queryParameters.replaceValues("hosttags", ImmutableSet.copyOf(hostTags));
- return this;
- }
-
- /**
- * @param isSystem
- * is this a system vm offering
- */
- public CreateServiceOfferingOptions isSystem(boolean isSystem) {
- this.queryParameters.replaceValues("issystem", ImmutableSet.<String>of(isSystem + ""));
- return this;
- }
-
- /**
- * @param limitCpuUse
- * restrict the CPU usage to committed service offering
- */
- public CreateServiceOfferingOptions limitCpuUse(boolean limitCpuUse) {
- this.queryParameters.replaceValues("limitcpuuse", ImmutableSet.<String>of(limitCpuUse + ""));
- return this;
- }
-
- /**
- * @param networkRateInMb
- * data transfer rate in megabits per second allowed. Supported only
- * for non-System offering and system offerings having "domainrouter"
- * systemvmtype
- */
- public CreateServiceOfferingOptions networkRateInMb(int networkRateInMb) {
- this.queryParameters.replaceValues("networkrate", ImmutableSet.<String>of(networkRateInMb + ""));
- return this;
- }
-
- /**
- * @param highlyAvailable
- * the HA for the service offering
- */
- public CreateServiceOfferingOptions highlyAvailable(boolean highlyAvailable) {
- this.queryParameters.replaceValues("offerha", ImmutableSet.<String>of(highlyAvailable + ""));
- return this;
- }
-
- /**
- * @param storageType
- * the storage type of the service offering
- */
- public CreateServiceOfferingOptions storageType(StorageType storageType) {
- this.queryParameters.replaceValues("storagetype", ImmutableSet.<String>of(storageType.toString()));
- return this;
- }
-
- /**
- * @param systemVmType
- * the system VM type. Possible types are "domainrouter", "consoleproxy" and "secondarystoragevm"
- */
- public CreateServiceOfferingOptions systemVmType(SystemVmType systemVmType) {
- this.queryParameters.replaceValues("systemvmtype", ImmutableSet.<String>of(systemVmType.toString()));
- return this;
- }
-
- /**
- * @param tags
- * the tags for this service offering
- */
- public CreateServiceOfferingOptions tags(Set<String> tags) {
- this.queryParameters.replaceValues("tags", ImmutableSet.copyOf(tags));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see CreateServiceOfferingOptions#hostTags
- */
- public static CreateServiceOfferingOptions hostTags(Set<String> hostTags) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.hostTags(hostTags);
- }
-
- /**
- * @see CreateServiceOfferingOptions#isSystem
- */
- public static CreateServiceOfferingOptions isSystem(boolean isSystem) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.isSystem(isSystem);
- }
-
- /**
- * @see CreateServiceOfferingOptions#limitCpuUse
- */
- public static CreateServiceOfferingOptions limitCpuUse(boolean limitCpuUse) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.limitCpuUse(limitCpuUse);
- }
-
- /**
- * @see CreateServiceOfferingOptions#networkRateInMb
- */
- public static CreateServiceOfferingOptions networkRateInMb(int networkRate) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.networkRateInMb(networkRate);
- }
-
- /**
- * @see CreateServiceOfferingOptions#highlyAvailable
- */
- public static CreateServiceOfferingOptions highlyAvailable(boolean highlyAvailable) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.highlyAvailable(highlyAvailable);
- }
-
- /**
- * @see CreateServiceOfferingOptions#storageType
- */
- public static CreateServiceOfferingOptions storageType(StorageType storageType) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.storageType(storageType);
- }
-
- /**
- * @see CreateServiceOfferingOptions#systemVmType
- */
- public static CreateServiceOfferingOptions systemVmType(SystemVmType systemVmType) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.systemVmType(systemVmType);
- }
-
- /**
- * @see CreateServiceOfferingOptions#tags
- */
- public static CreateServiceOfferingOptions tags(Set<String> tags) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.tags(tags);
- }
-
- /**
- * @see CreateServiceOfferingOptions#accountInDomain
- */
- public static CreateServiceOfferingOptions accountInDomain(String account, String domain) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see CreateServiceOfferingOptions#domainId
- */
- public static CreateServiceOfferingOptions domainId(String domainId) {
- CreateServiceOfferingOptions options = new CreateServiceOfferingOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CreateServiceOfferingOptions accountInDomain(String account, String domain) {
- return CreateServiceOfferingOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CreateServiceOfferingOptions domainId(String domainId) {
- return CreateServiceOfferingOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java
deleted file mode 100644
index 7902cc0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the Snapshot createSnapshot method.
- *
- * @see org.jclouds.cloudstack.features.SnapshotApi#createSnapshot
- * @see org.jclouds.cloudstack.features.SnapshotApi#createSnapshot
- */
-public class CreateSnapshotOptions extends AccountInDomainOptions {
-
- public static final CreateSnapshotOptions NONE = new CreateSnapshotOptions();
-
- /**
- * @param policyId policy id of the snapshot, if this is null, then use MANUAL_POLICY.
- */
- public CreateSnapshotOptions policyId(String policyId) {
- this.queryParameters.replaceValues("policyid", ImmutableSet.of(policyId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param account The account of the snapshot.
- * @param domainId The domain ID of the snapshot.
- */
- public static CreateSnapshotOptions accountInDomain(String account, String domainId) {
- return (CreateSnapshotOptions) new CreateSnapshotOptions().accountInDomain(account, domainId);
- }
-
- /**
- * @param domainId The domain ID of the snapshot.
- */
- public static CreateSnapshotOptions domainId(String domainId) {
- return (CreateSnapshotOptions) new CreateSnapshotOptions().domainId(domainId);
- }
-
- /**
- * @param policyId policy id of the snapshot, if this is null, then use MANUAL_POLICY.
- */
- public static CreateSnapshotOptions policyId(String policyId) {
- return new CreateSnapshotOptions().policyId(policyId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java
deleted file mode 100644
index 1cc0a2b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a template is created.
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.8/api/user/createTemplate.html"
- * />
- */
-public class CreateTemplateOptions extends BaseHttpRequestOptions {
-
- public static final CreateTemplateOptions NONE = new CreateTemplateOptions();
-
- /**
- * 32 or 64 bit
- */
- public CreateTemplateOptions bits(int bits) {
- this.queryParameters.replaceValues("bits", ImmutableSet.of(bits + ""));
- return this;
- }
-
- /**
- * true if this template is a featured template, false otherwise
- */
- public CreateTemplateOptions isFeatured(boolean isFeatured) {
- this.queryParameters.replaceValues("isfeatured", ImmutableSet.of(isFeatured + ""));
- return this;
- }
-
- /**
- * true if this template is a public template, false otherwise
- */
- public CreateTemplateOptions isPublic(boolean isPublic) {
- this.queryParameters.replaceValues("ispublic", ImmutableSet.of(isPublic + ""));
- return this;
- }
-
- /**
- * true if the template supports the password reset feature; default is false
- */
- public CreateTemplateOptions passwordEnabled(boolean passwordEnabled) {
- this.queryParameters.replaceValues("passwordenabled", ImmutableSet.of(passwordEnabled + ""));
- return this;
- }
-
- /**
- * true if the template requires HVM, false otherwise
- */
- public CreateTemplateOptions requiresHVM(boolean requiresHVM) {
- this.queryParameters.replaceValues("requireshvm", ImmutableSet.of(requiresHVM + ""));
- return this;
- }
-
- /**
- * the ID of the snapshot the template is being created from. Either this parameter, or volumeId has to be passed in
- */
- public CreateTemplateOptions snapshotId(String snapshotId) {
- this.queryParameters.replaceValues("snapshotid", ImmutableSet.of(snapshotId + ""));
- return this;
- }
-
- /**
- * the ID of the disk volume the template is being created from. Either this parameter, or snapshotId has to be passed in
- */
- public CreateTemplateOptions volumeId(String volumeId) {
- this.queryParameters.replaceValues("volumeid", ImmutableSet.of(volumeId + ""));
- return this;
- }
-
- public static class Builder {
-
- public static CreateTemplateOptions bits(int bits) {
- CreateTemplateOptions options = new CreateTemplateOptions();
- return options.bits(bits);
- }
-
- public static CreateTemplateOptions isFeatured(boolean isFeatured) {
- CreateTemplateOptions options = new CreateTemplateOptions();
- return options.isFeatured(isFeatured);
- }
-
- public static CreateTemplateOptions isPublic(boolean isPublic) {
- CreateTemplateOptions options = new CreateTemplateOptions();
- return options.isPublic(isPublic);
- }
-
- public static CreateTemplateOptions passwordEnabled(boolean passwordEnabled) {
- CreateTemplateOptions options = new CreateTemplateOptions();
- return options.passwordEnabled(passwordEnabled);
- }
-
- public static CreateTemplateOptions requiresHVM(boolean requiresHVM) {
- CreateTemplateOptions options = new CreateTemplateOptions();
- return options.requiresHVM(requiresHVM);
- }
-
- public static CreateTemplateOptions snapshotId(String snapshotId) {
- CreateTemplateOptions options = new CreateTemplateOptions();
- return options.snapshotId(snapshotId);
- }
-
- public static CreateTemplateOptions volumeId(String volumeId) {
- CreateTemplateOptions options = new CreateTemplateOptions();
- return options.volumeId(volumeId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java
deleted file mode 100644
index cde9d21..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Optional fields for user creation
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createUser.html"
- * />
- */
-public class CreateUserOptions extends BaseHttpRequestOptions {
-
- public static final CreateUserOptions NONE = new CreateUserOptions();
-
- /**
- * @param domainId The domain for the resource
- */
- public CreateUserOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
-
- }
-
- /**
- * @param timezone Specifies a timezone for this command. For more information
- * on the timezone parameter, see Time Zone Format.
- */
- public CreateUserOptions timezone(String timezone) {
- this.queryParameters.replaceValues("timezone", ImmutableSet.of(timezone));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see CreateUserOptions#domainId
- */
- public static CreateUserOptions domainId(String domainId) {
- CreateUserOptions options = new CreateUserOptions();
- return options.domainId(domainId);
- }
-
- /**
- * @see CreateUserOptions#timezone
- */
- public static CreateUserOptions timezone(String timezone) {
- CreateUserOptions options = new CreateUserOptions();
- return options.timezone(timezone);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java
deleted file mode 100644
index 7966fe3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control options for creating a VM group
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.8/api/user/createInstanceGroup.html"
- * />
- */
-public class CreateVMGroupOptions extends BaseHttpRequestOptions {
-
- public static final CreateVMGroupOptions NONE = new CreateVMGroupOptions();
-
- /**
- * @param account account who owns the VMGroup
- */
- public CreateVMGroupOptions account(String account) {
- this.queryParameters.replaceValues("account", ImmutableSet.of(account));
- return this;
- }
-
- /**
- * @param domainId domain ID of the account owning the VMGroup
- */
- public CreateVMGroupOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
- }
-
- /**
- * @param projectId the project the vm group will be in
- */
- public CreateVMGroupOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public static class Builder {
- /**
- * @see org.jclouds.cloudstack.options.CreateVMGroupOptions#account
- */
- public static CreateVMGroupOptions account(String account) {
- CreateVMGroupOptions options = new CreateVMGroupOptions();
- return options.account(account);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.CreateVMGroupOptions#domainId
- */
- public static CreateVMGroupOptions domainId(String id) {
- CreateVMGroupOptions options = new CreateVMGroupOptions();
- return options.domainId(id);
- }
-
- /**
- * @see org.jclouds.cloudstack.options.CreateVMGroupOptions#projectId(String)
- */
- public static CreateVMGroupOptions projectId(String id) {
- CreateVMGroupOptions options = new CreateVMGroupOptions();
- return options.projectId(id);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java
deleted file mode 100644
index f6eb4ef..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the createVlanIPRange API call.
- */
-public class CreateVlanIPRangeOptions extends AccountInDomainOptions {
-
- public static class Builder {
-
- public static CreateVlanIPRangeOptions accountInDomain(String account, String domain) {
- return new CreateVlanIPRangeOptions().accountInDomain(account, domain);
- }
-
- public static CreateVlanIPRangeOptions domainId(String domainId) {
- return new CreateVlanIPRangeOptions().domainId(domainId);
- }
-
- public static CreateVlanIPRangeOptions forVirtualNetwork(boolean forVirtualNetwork) {
- return new CreateVlanIPRangeOptions().forVirtualNetwork(forVirtualNetwork);
- }
-
- public static CreateVlanIPRangeOptions zoneId(String zoneId) {
- return new CreateVlanIPRangeOptions().zoneId(zoneId);
- }
-
- public static CreateVlanIPRangeOptions vlan(long vlan) {
- return new CreateVlanIPRangeOptions().vlan(vlan);
- }
-
- public static CreateVlanIPRangeOptions vlan(String vlan) {
- return new CreateVlanIPRangeOptions().vlan(vlan);
- }
-
- public static CreateVlanIPRangeOptions podId(String podId) {
- return new CreateVlanIPRangeOptions().podId(podId);
- }
-
- public static CreateVlanIPRangeOptions gateway(String gateway) {
- return new CreateVlanIPRangeOptions().gateway(gateway);
- }
-
- public static CreateVlanIPRangeOptions netmask(String netmask) {
- return new CreateVlanIPRangeOptions().netmask(netmask);
- }
-
- public static CreateVlanIPRangeOptions networkId(String networkId) {
- return new CreateVlanIPRangeOptions().networkId(networkId);
- }
-
- public static CreateVlanIPRangeOptions projectId(String projectId) {
- return new CreateVlanIPRangeOptions().projectId(projectId);
- }
-
- }
-
- @Override
- public CreateVlanIPRangeOptions accountInDomain(String account, String domain) {
- return (CreateVlanIPRangeOptions) super.accountInDomain(account, domain);
- }
-
- @Override
- public CreateVlanIPRangeOptions domainId(String domainId) {
- return (CreateVlanIPRangeOptions) super.domainId(domainId);
- }
-
- public CreateVlanIPRangeOptions forVirtualNetwork(boolean forVirtualNetwork) {
- this.queryParameters.replaceValues("forvirtualnetwork", ImmutableSet.of(forVirtualNetwork + ""));
- return this;
- }
-
- public CreateVlanIPRangeOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- public CreateVlanIPRangeOptions vlan(long vlan) {
- this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan + ""));
- return this;
- }
-
- public CreateVlanIPRangeOptions vlan(String vlan) {
- this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan));
- return this;
- }
-
- public CreateVlanIPRangeOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- public CreateVlanIPRangeOptions gateway(String gateway) {
- this.queryParameters.replaceValues("gateway", ImmutableSet.of(gateway));
- return this;
- }
-
- public CreateVlanIPRangeOptions netmask(String netmask) {
- this.queryParameters.replaceValues("netmask", ImmutableSet.of(netmask));
- return this;
- }
-
- public CreateVlanIPRangeOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkid", ImmutableSet.of(networkId + ""));
- return this;
- }
-
- public CreateVlanIPRangeOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java
deleted file mode 100644
index 1e18e92..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a zone is created
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/createZone.html"
- * />
- */
-public class CreateZoneOptions extends BaseHttpRequestOptions {
-
- public static final CreateZoneOptions NONE = new CreateZoneOptions();
-
- /**
- * @param allocationState
- * allocation state of this Zone for allocation of new resources
- */
- public CreateZoneOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- /**
- * @param dns2
- * the second DNS for the Zone
- */
- public CreateZoneOptions dns2(String dns2) {
- this.queryParameters.replaceValues("dns2", ImmutableSet.of(dns2));
- return this;
- }
-
- /**
- * @param internalDns2
- * the second internal DNS for the Zone
- */
- public CreateZoneOptions internalDns2(String internalDns2) {
- this.queryParameters.replaceValues("internaldns2", ImmutableSet.of(internalDns2));
- return this;
- }
-
- /**
- * @param domainName
- * network domain name for the networks in zone
- */
- public CreateZoneOptions domainName(String domainName) {
- this.queryParameters.replaceValues("domain", ImmutableSet.of(domainName));
- return this;
- }
-
- /**
- * @param domainId
- * the ID of the containing domain; null for public zones
- */
- public CreateZoneOptions domainId(@Nullable String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
- }
-
- /**
- * @param guestCIDRAddress
- * the guest CIDR address for the Zone
- */
- public CreateZoneOptions guestCIDRAddress(String guestCIDRAddress) {
- this.queryParameters.replaceValues("guestcidraddress", ImmutableSet.of(guestCIDRAddress));
- return this;
- }
-
- /**
- * @param securityGroupEnabled
- * true if network is security group enabled, false otherwise
- */
- public CreateZoneOptions securityGroupEnabled(boolean securityGroupEnabled) {
- this.queryParameters.replaceValues("securitygroupenabled", ImmutableSet.of(securityGroupEnabled + ""));
- return this;
- }
-
- /**
- * @param vlan
- * the VLAN for the Zone
- */
- public CreateZoneOptions vlan(String vlan) {
- this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see CreateZoneOptions#allocationState
- */
- public static CreateZoneOptions allocationState(AllocationState allocationState) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.allocationState(allocationState);
- }
-
- /**
- * @see CreateZoneOptions#dns2
- */
- public static CreateZoneOptions dns2(String dns2) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.dns2(dns2);
- }
-
- /**
- * @see CreateZoneOptions#internalDns2
- */
- public static CreateZoneOptions internalDns2(String internalDns2) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.internalDns2(internalDns2);
- }
-
- /**
- * @see CreateZoneOptions#domainName
- */
- public static CreateZoneOptions domainName(String domainName) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.domainName(domainName);
- }
-
- /**
- * @see CreateZoneOptions#domainId
- */
- public static CreateZoneOptions domainId(@Nullable String domainId) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.domainId(domainId);
- }
-
- /**
- * @see CreateZoneOptions#guestCIDRAddress
- */
- public static CreateZoneOptions guestCIDRAddress(String guestCIDRAddress) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.guestCIDRAddress(guestCIDRAddress);
- }
-
- /**
- * @see CreateZoneOptions#securityGroupEnabled
- */
- public static CreateZoneOptions securityGroupEnabled(boolean securityGroupEnabled) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.securityGroupEnabled(securityGroupEnabled);
- }
-
- /**
- * @see CreateZoneOptions#vlan
- */
- public static CreateZoneOptions vlan(String vlan) {
- CreateZoneOptions options = new CreateZoneOptions();
- return options.vlan(vlan);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java
deleted file mode 100644
index 07e2ef4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalHostApi.deleteHost() API call
- */
-public class DeleteHostOptions extends BaseHttpRequestOptions {
-
- public static final DeleteHostOptions NONE = new DeleteHostOptions();
-
- /**
- * @param forced Force delete the host. All HA enabled vms running on the host will be put to HA; HA disabled ones will be stopped
- */
- public DeleteHostOptions forced(boolean forced) {
- this.queryParameters.replaceValues("forced", ImmutableSet.of(forced + ""));
- return this;
- }
-
- /**
- * @param forceDestroyLocalStorage Force destroy local storage on this host. All VMs created on this local storage will be destroyed
- */
- public DeleteHostOptions forceDestroyLocalStorage(boolean forceDestroyLocalStorage) {
- this.queryParameters.replaceValues("forcedestroylocalstorage", ImmutableSet.of(forceDestroyLocalStorage + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param forced Force delete the host. All HA enabled vms running on the host will be put to HA; HA disabled ones will be stopped
- */
- public static DeleteHostOptions forced(boolean forced) {
- return new DeleteHostOptions().forced(forced);
- }
-
- /**
- * @param forceDestroyLocalStorage Force destroy local storage on this host. All VMs created on this local storage will be destroyed
- */
- public static DeleteHostOptions forceDestroyLocalStorage(boolean forceDestroyLocalStorage) {
- return new DeleteHostOptions().forceDestroyLocalStorage(forceDestroyLocalStorage);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java
deleted file mode 100644
index ceb3364..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the ISO deleteISO method.
- *
- * @see org.jclouds.cloudstack.features.ISOApi#deleteISO
- * @see org.jclouds.cloudstack.features.ISOApi#deleteISO
- */
-public class DeleteISOOptions extends BaseHttpRequestOptions {
-
- public static final DeleteISOOptions NONE = new DeleteISOOptions();
-
- /**
- * @param zoneId the ID of the zone of the ISO file. If not specified, the ISO will be deleted from all the zones
- */
- public DeleteISOOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param zoneId the ID of the zone of the ISO file. If not specified, the ISO will be deleted from all the zones
- */
- public static DeleteISOOptions zoneId(String zoneId) {
- return new DeleteISOOptions().zoneId(zoneId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java
deleted file mode 100644
index 26452a0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control how a template is created.
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.8/api/user/createTemplate.html"
- * />
- */
-public class DeleteTemplateOptions extends BaseHttpRequestOptions {
-
- public static final DeleteTemplateOptions NONE = new DeleteTemplateOptions();
-
- /**
- * @param zoneId selects the template's zoneId.
- */
- public DeleteTemplateOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see DeleteTemplateOptions#zoneId
- */
- public static DeleteTemplateOptions zoneId(String id) {
- DeleteTemplateOptions options = new DeleteTemplateOptions();
- return options.zoneId(id);
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java
deleted file mode 100644
index 9cdd5d2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.io.BaseEncoding.base64;
-
-import java.util.Map;
-
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Options used to control what disk offerings are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/deployVirtualMachine.html"
- * />
- */
-public class DeployVirtualMachineOptions extends AccountInDomainOptions {
-
- public static final DeployVirtualMachineOptions NONE = new DeployVirtualMachineOptions();
-
- /**
- * the ID of the disk offering for the virtual machine. If the template is of
- * ISO format, the diskOfferingId is for the root disk volume. Otherwise this
- * parameter is used to dinidcate the offering for the data disk volume. If
- * the templateId parameter passed is from a Template object, the
- * diskOfferingId refers to a DATA Disk Volume created. If the templateId
- * parameter passed is from an ISO object, the diskOfferingId refers to a
- * ROOT Disk Volume created.
- *
- * @param diskofferingid
- * the ID of the disk offering
- */
- public DeployVirtualMachineOptions diskOfferingId(String diskofferingid) {
- checkArgument(!queryParameters.containsKey("size"), "Mutually exclusive with size");
- this.queryParameters.replaceValues("diskofferingid", ImmutableSet.of(diskofferingid + ""));
- return this;
- }
-
- /**
- * sets the displayName - just for display purposes. We don't pass this
- * parameter to the backend.
- *
- * @param displayName
- * an optional user generated name for the virtual machine
- */
- public DeployVirtualMachineOptions displayName(String displayName) {
- this.queryParameters.replaceValues("displayname", ImmutableSet.of(displayName));
- return this;
- }
-
- /**
- * @param group
- * an optional group for the virtual machine
- */
- public DeployVirtualMachineOptions group(String group) {
- this.queryParameters.replaceValues("group", ImmutableSet.of(group));
- return this;
- }
-
- /**
- * @param hypervisor
- * the hypervisor on which to deploy the virtual machine
- */
- public DeployVirtualMachineOptions hypervisor(String hypervisor) {
- this.queryParameters.replaceValues("hypervisor", ImmutableSet.of(hypervisor));
- return this;
- }
-
- /**
- * @param keyPair
- * name of the ssh key pair used to login to the virtual machine
- */
- public DeployVirtualMachineOptions keyPair(String keyPair) {
- this.queryParameters.replaceValues("keypair", ImmutableSet.of(keyPair));
- return this;
- }
-
- /**
- * sets the hostName, it will be propagated down to the backend and set on
- * the user vm. If this parameter is not passed it, it will be defaulted to
- * our usual "i-x-y'
- *
- * @param name
- * host name for the virtual machine
- */
- public DeployVirtualMachineOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param ipOnDefaultNetwork
- * the requested ip address (2.2.12 only option)
- */
- public DeployVirtualMachineOptions ipOnDefaultNetwork(String ipOnDefaultNetwork) {
- this.queryParameters.replaceValues("ipaddress", ImmutableSet.of(ipOnDefaultNetwork));
- return this;
- }
-
- /**
- * @param ipsToNetworks
- * mapping ip addresses to network ids (2.2.12 only option)
- */
- public DeployVirtualMachineOptions ipsToNetworks(Map<String, String> ipsToNetworks) {
- int count = 0;
- for (Map.Entry<String, String> entry : ipsToNetworks.entrySet()) {
- this.queryParameters.replaceValues(String.format("iptonetworklist[%d].ip", count), ImmutableSet.of(entry.getKey()));
- this.queryParameters.replaceValues(String.format("iptonetworklist[%d].networkid", count),
- ImmutableSet.of(entry.getValue()));
- count += 1;
- }
- return this;
- }
-
- /**
- * @param networkId
- * network id used by virtual machine
- */
- public DeployVirtualMachineOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkids", ImmutableSet.of(networkId + ""));
- return this;
- }
-
- /**
- * @param networkIds
- * network ids used by virtual machine
- */
- public DeployVirtualMachineOptions networkIds(Iterable<String> networkIds) {
- this.queryParameters.replaceValues("networkids", ImmutableSet.of(Joiner.on(',').join(networkIds)));
- return this;
- }
-
- public Iterable<String> getNetworkIds() {
- if (queryParameters.get("networkids").size() == 1) {
- return Iterables.transform(
- Splitter.on(",").split(Iterables.getOnlyElement(queryParameters.get("networkids"))),
- new Function<String, String>() {
-
- @Override
- public String apply(String arg0) {
- return arg0;
- }
-
- });
- } else {
- return ImmutableSet.<String> of();
- }
- }
-
- /**
- * @param projectId The project this VM will be in.
- */
- public DeployVirtualMachineOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- /**
- * @param securityGroupId
- * security group applied to the virtual machine. Should be passed
- * only when vm is created from a zone with Basic Network support
- */
- public DeployVirtualMachineOptions securityGroupId(String securityGroupId) {
- this.queryParameters.replaceValues("securitygroupids", ImmutableSet.of(securityGroupId + ""));
- return this;
- }
-
- /**
- * @param securityGroupIds
- * security groups applied to the virtual machine. Should be passed
- * only when vm is created from a zone with Basic Network support
- */
- public DeployVirtualMachineOptions securityGroupIds(Iterable<String> securityGroupIds) {
- this.queryParameters.replaceValues("securitygroupids", ImmutableSet.of(Joiner.on(',').join(securityGroupIds)));
- return this;
- }
-
- /**
- * @param dataDiskSize
- * the arbitrary size for the DATADISK volume.
- */
- public DeployVirtualMachineOptions dataDiskSize(long dataDiskSize) {
- this.queryParameters.replaceValues("size", ImmutableSet.of(dataDiskSize + ""));
- return this;
- }
-
- /**
- * @param unencodedData
- * an optional binary data that can be sent to the virtual machine
- * upon a successful deployment. This binary data must be base64
- * encoded before adding it to the request. Currently only HTTP GET
- * is supported. Using HTTP GET (via querystring), you can send up
- * to 2KB of data after base64 encoding.
- */
- public DeployVirtualMachineOptions userData(byte[] unencodedData) {
- int length = checkNotNull(unencodedData, "unencodedData").length;
- checkArgument(length > 0, "userData cannot be empty");
- checkArgument(length <= 2 * 1024, "userData cannot be larger than 2kb");
- this.queryParameters.replaceValues("userdata", ImmutableSet.of(base64().encode(unencodedData)));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see DeployVirtualMachineOptions#diskOfferingId
- */
- public static DeployVirtualMachineOptions diskOfferingId(String diskOfferingId) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.diskOfferingId(diskOfferingId);
- }
-
- /**
- * @see DeployVirtualMachineOptions#displayName
- */
- public static DeployVirtualMachineOptions displayName(String displayName) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.displayName(displayName);
- }
-
- /**
- * @see DeployVirtualMachineOptions#group
- */
- public static DeployVirtualMachineOptions group(String group) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.group(group);
- }
-
- /**
- * @see DeployVirtualMachineOptions#hypervisor
- */
- public static DeployVirtualMachineOptions hypervisor(String hypervisor) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.hypervisor(hypervisor);
- }
-
- /**
- * @see DeployVirtualMachineOptions#keyPair
- */
- public static DeployVirtualMachineOptions keyPair(String keyPair) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.keyPair(keyPair);
- }
-
- /**
- * @see DeployVirtualMachineOptions#name
- */
- public static DeployVirtualMachineOptions name(String name) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.name(name);
- }
-
- /**
- * @see DeployVirtualMachineOptions#ipOnDefaultNetwork
- */
- public static DeployVirtualMachineOptions ipOnDefaultNetwork(String ipOnDefaultNetwork) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.ipOnDefaultNetwork(ipOnDefaultNetwork);
- }
-
- /**
- * @see DeployVirtualMachineOptions#ipsToNetworks
- */
- public static DeployVirtualMachineOptions ipsToNetworks(Map<String, String> ipsToNetworks) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.ipsToNetworks(ipsToNetworks);
- }
-
- /**
- * @see DeployVirtualMachineOptions#networkId
- */
- public static DeployVirtualMachineOptions networkId(String id) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.networkId(id);
- }
-
- /**
- * @see DeployVirtualMachineOptions#networkIds
- */
- public static DeployVirtualMachineOptions networkIds(Iterable<String> networkIds) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.networkIds(networkIds);
- }
-
- /**
- * @see DeployVirtualMachineOptions#projectId(String)
- */
- public static DeployVirtualMachineOptions projectId(String id) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.projectId(id);
- }
-
- /**
- * @see DeployVirtualMachineOptions#securityGroupId
- */
- public static DeployVirtualMachineOptions securityGroupId(String id) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.securityGroupId(id);
- }
-
- /**
- * @see DeployVirtualMachineOptions#securityGroupIds
- */
- public static DeployVirtualMachineOptions securityGroupIds(Iterable<String> securityGroupIds) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.securityGroupIds(securityGroupIds);
- }
-
- /**
- * @see DeployVirtualMachineOptions#dataDiskSize
- */
- public static DeployVirtualMachineOptions dataDiskSize(long id) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.dataDiskSize(id);
- }
-
- /**
- * @see DeployVirtualMachineOptions#userData
- */
- public static DeployVirtualMachineOptions userData(byte[] unencodedData) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.userData(unencodedData);
- }
-
- /**
- * @see DeployVirtualMachineOptions#accountInDomain
- */
- public static DeployVirtualMachineOptions accountInDomain(String account, String domain) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see DeployVirtualMachineOptions#domainId
- */
- public static DeployVirtualMachineOptions domainId(String domainId) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- return options.domainId(domainId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DeployVirtualMachineOptions accountInDomain(String account, String domain) {
- return DeployVirtualMachineOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public DeployVirtualMachineOptions domainId(String domainId) {
- return DeployVirtualMachineOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java
deleted file mode 100644
index 5c150a9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the ISO extractISO method.
- *
- * @see org.jclouds.cloudstack.features.ISOApi#extractISO
- * @see org.jclouds.cloudstack.features.ISOApi#extractISO
- */
-public class ExtractISOOptions extends BaseHttpRequestOptions {
-
- public static final ExtractISOOptions NONE = new ExtractISOOptions();
-
- /**
- * @param url the url to which the ISO would be extracted
- */
- public ExtractISOOptions url(String url) {
- this.queryParameters.replaceValues("url", ImmutableSet.of(url + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @param url the url to which the ISO would be extracted
- */
- public static ExtractISOOptions url(String url) {
- return new ExtractISOOptions().url(url);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java
deleted file mode 100644
index 6c81f12..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-public class ExtractTemplateOptions extends BaseHttpRequestOptions {
-
- public static final ExtractTemplateOptions NONE = new ExtractTemplateOptions();
-
- /**
- * the url to which the ISO would be extracted
- */
- public ExtractTemplateOptions url(String url) {
- this.queryParameters.replaceValues("url", ImmutableSet.of(url));
- return this;
- }
-
- public static class Builder {
-
- public static ExtractTemplateOptions url(String url) {
- ExtractTemplateOptions options = new ExtractTemplateOptions();
- return options.url(url);
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java
deleted file mode 100644
index 11cc5ae..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalUsageApi.generateUsageOptions() API call
- */
-public class GenerateUsageRecordsOptions extends BaseHttpRequestOptions {
-
- public static final GenerateUsageRecordsOptions NONE = new GenerateUsageRecordsOptions();
-
- public static class Builder {
- public static GenerateUsageRecordsOptions domainId(String domainId) {
- GenerateUsageRecordsOptions options = new GenerateUsageRecordsOptions();
- return options.domainId(domainId);
- }
- }
-
- public GenerateUsageRecordsOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java
deleted file mode 100644
index d7419eb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what account information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api/user/listAccounts.html"
- * />
- */
-public class ListAccountsOptions extends AccountInDomainOptions {
-
- public static final ListAccountsOptions NONE = new ListAccountsOptions();
-
- /**
- * @param id
- * list account by account ID
- */
- public ListAccountsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param name
- * list account by account name
- */
- public ListAccountsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param state
- * list accounts by state. Valid states are enabled, disabled, and
- * locked.
- */
- public ListAccountsOptions state(String state) {
- this.queryParameters.replaceValues("state", ImmutableSet.of(state));
- return this;
- }
-
- /**
- * @param cleanupRequired
- * list accounts by cleanuprequred attribute
- */
- public ListAccountsOptions cleanupRequired(boolean cleanupRequired) {
- this.queryParameters.replaceValues("iscleanuprequired", ImmutableSet.of(cleanupRequired + ""));
- return this;
- }
-
- /**
- * @param recursive
- * defaults to false, but if true, lists all accounts from the
- * parent specified by the domain id till leaves.
- */
- public ListAccountsOptions recursive(boolean recursive) {
- this.queryParameters.replaceValues("isrecursive", ImmutableSet.of(recursive + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListAccountsOptions#accountInDomain
- */
- public static ListAccountsOptions accountInDomain(String account, String domain) {
- ListAccountsOptions options = new ListAccountsOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListAccountsOptions#domainId
- */
- public static ListAccountsOptions domainId(String id) {
- ListAccountsOptions options = new ListAccountsOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListAccountsOptions#id
- */
- public static ListAccountsOptions id(String id) {
- ListAccountsOptions options = new ListAccountsOptions();
- return options.id(id);
- }
-
- /**
- * @see ListAccountsOptions#name
- */
- public static ListAccountsOptions name(String name) {
- ListAccountsOptions options = new ListAccountsOptions();
- return options.name(name);
- }
-
- /**
- * @see ListAccountsOptions#state
- */
- public static ListAccountsOptions state(String state) {
- ListAccountsOptions options = new ListAccountsOptions();
- return options.state(state);
- }
-
- /**
- * @see ListAccountsOptions#cleanupRequired
- */
- public static ListAccountsOptions cleanupRequired(boolean cleanupRequired) {
- ListAccountsOptions options = new ListAccountsOptions();
- return options.cleanupRequired(cleanupRequired);
- }
-
- /**
- * @see ListAccountsOptions#recursive
- */
- public static ListAccountsOptions recursive(boolean recursive) {
- ListAccountsOptions options = new ListAccountsOptions();
- return options.recursive(recursive);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListAccountsOptions accountInDomain(String account, String domain) {
- return ListAccountsOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListAccountsOptions domainId(String domainId) {
- return ListAccountsOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java
deleted file mode 100644
index e5d7b10..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the listAlerts command.
- */
-public class ListAlertsOptions extends BaseHttpRequestOptions {
-
- public static final ListAlertsOptions NONE = new ListAlertsOptions();
-
- public ListAlertsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- public ListAlertsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListAlertsOptions type(String type) {
- this.queryParameters.replaceValues("type", ImmutableSet.of(type));
- return this;
- }
-
- public static class Builder {
-
- public static ListAlertsOptions id(String id) {
- final ListAlertsOptions options = new ListAlertsOptions();
- return options.id(id);
- }
-
- public static ListAlertsOptions keyword(String keyword) {
- final ListAlertsOptions options = new ListAlertsOptions();
- return options.keyword(keyword);
- }
-
- public static ListAlertsOptions type(String type) {
- final ListAlertsOptions options = new ListAlertsOptions();
- return options.type(type);
- }
-
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java
deleted file mode 100644
index e0f81e2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Date;
-
-import org.jclouds.date.DateService;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what asyncJobs information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api/user/listAsyncJobs.html"
- * />
- */
-public class ListAsyncJobsOptions extends AccountInDomainOptions {
- private static final DateService dateService = new SimpleDateFormatDateService();
-
- public static final ListAsyncJobsOptions NONE = new ListAsyncJobsOptions();
-
- /**
- * @param startDate
- * the start date of the async job
- */
- public ListAsyncJobsOptions startDate(Date startDate) {
- this.queryParameters.replaceValues("startdate",
- ImmutableSet.of(dateService.iso8601SecondsDateFormat(checkNotNull(startDate, "startDate"))));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListAsyncJobsOptions#startDate
- */
- public static ListAsyncJobsOptions startDate(Date startDate) {
- ListAsyncJobsOptions options = new ListAsyncJobsOptions();
- return options.startDate(startDate);
- }
-
- /**
- * @see ListAsyncJobsOptions#domainId
- */
- public static ListAsyncJobsOptions domainId(String id) {
- ListAsyncJobsOptions options = new ListAsyncJobsOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListAsyncJobsOptions#accountInDomain
- */
- public static ListAsyncJobsOptions accountInDomain(String account, String domain) {
- ListAsyncJobsOptions options = new ListAsyncJobsOptions();
- return options.accountInDomain(account, domain);
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListAsyncJobsOptions accountInDomain(String account, String domain) {
- return ListAsyncJobsOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListAsyncJobsOptions domainId(String domainId) {
- return ListAsyncJobsOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java
deleted file mode 100644
index cfeb605..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.Capacity;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the listCapacity command.
- */
-public class ListCapacityOptions extends BaseHttpRequestOptions {
-
- public static final ListCapacityOptions NONE = new ListCapacityOptions();
-
- public ListCapacityOptions hostId(String hostId) {
- this.queryParameters.replaceValues("hostid", ImmutableSet.of(hostId + ""));
- return this;
- }
-
- public ListCapacityOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListCapacityOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- public ListCapacityOptions type(Capacity.Type type) {
- this.queryParameters.replaceValues("type", ImmutableSet.of(type.ordinal() + ""));
- return this;
- }
-
- public ListCapacityOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- public static class Builder {
-
- public static ListCapacityOptions hostId(String hostId) {
- final ListCapacityOptions options = new ListCapacityOptions();
- return options.hostId(hostId);
- }
-
- public static ListCapacityOptions keyword(String keyword) {
- final ListCapacityOptions options = new ListCapacityOptions();
- return options.keyword(keyword);
- }
-
- public static ListCapacityOptions podId(String podId) {
- final ListCapacityOptions options = new ListCapacityOptions();
- return options.podId(podId);
- }
-
- public static ListCapacityOptions type(Capacity.Type type) {
- final ListCapacityOptions options = new ListCapacityOptions();
- return options.type(type);
- }
-
- public static ListCapacityOptions zoneId(String zoneId) {
- final ListCapacityOptions options = new ListCapacityOptions();
- return options.zoneId(zoneId);
- }
-
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java
deleted file mode 100644
index c42f0fb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what cluster information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/listClusters.html"
- * />
- */
-public class ListClustersOptions extends BaseHttpRequestOptions {
-
- public static final ListHostsOptions NONE = new ListHostsOptions();
-
- public ListClustersOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- public ListClustersOptions clusterType(Host.ClusterType clusterType) {
- this.queryParameters.replaceValues("clustertype", ImmutableSet.of(clusterType.toString()));
- return this;
- }
-
- public ListClustersOptions hypervisor(String hypervisor) {
- this.queryParameters.replaceValues("hypervisor", ImmutableSet.of(hypervisor));
- return this;
- }
-
- public ListClustersOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- public ListClustersOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListClustersOptions managedState(Cluster.ManagedState managedState) {
- this.queryParameters.replaceValues("managedstate", ImmutableSet.of(managedState.toString()));
- return this;
- }
-
- public ListClustersOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public ListClustersOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- public ListClustersOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- public static class Builder {
-
- public static ListClustersOptions allocationState(AllocationState allocationState) {
- return new ListClustersOptions().allocationState(allocationState);
- }
-
- public static ListClustersOptions clusterType(Host.ClusterType clusterType) {
- return new ListClustersOptions().clusterType(clusterType);
- }
-
- public static ListClustersOptions hypervisor(String hypervisor) {
- return new ListClustersOptions().hypervisor(hypervisor);
- }
-
- public static ListClustersOptions id(String id) {
- return new ListClustersOptions().id(id);
- }
-
- public static ListClustersOptions keyword(String keyword) {
- return new ListClustersOptions().keyword(keyword);
- }
-
- public static ListClustersOptions managedState(Cluster.ManagedState managedState) {
- return new ListClustersOptions().managedState(managedState);
- }
-
- public static ListClustersOptions name(String name) {
- return new ListClustersOptions().name(name);
- }
-
- public static ListClustersOptions podId(String podId) {
- return new ListClustersOptions().podId(podId);
- }
-
- public static ListClustersOptions zoneId(String zoneId) {
- return new ListClustersOptions().zoneId(zoneId);
- }
-
- }
-}
[28/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionExpectTest.java
deleted file mode 100644
index 07372a0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionExpectTest.java
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.extensions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.compute.functions.ZoneToLocationTest;
-import org.jclouds.cloudstack.internal.BaseCloudStackComputeServiceContextExpectTest;
-import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.compute.domain.SecurityGroupBuilder;
-import org.jclouds.compute.extensions.SecurityGroupExtension;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.net.domain.IpProtocol;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import com.google.inject.Module;
-
-@Test(groups = "unit", testName = "CloudStackSecurityGroupExtensionExpectTest")
-public class CloudStackSecurityGroupExtensionExpectTest extends BaseCloudStackComputeServiceContextExpectTest<ComputeService> {
-
- protected final HttpResponse addRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/authorizesecuritygroupingressresponse.json"))
- .build();
-
- protected final HttpResponse revokeRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/revokesecuritygroupingressresponse.json"))
- .build();
-
- protected final HttpRequest queryAsyncJobResultAuthorizeIngress = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "queryAsyncJobResult")
- .addQueryParam("jobid", "13330fc9-8b3e-4582-aa3e-90883c041010")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "y4gk3ckWAMPDNZM26LUK0gAhfiE%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse queryAsyncJobResultAuthorizeIngressResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/queryasyncjobresultresponse-authorizeingress.json"))
- .build();
-
- protected final HttpRequest getWithRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "13")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "TmlGaO2ICM%2BiXQr88%2BZCyWUniSw%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- protected final HttpResponse getEmptyResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_empty.json"))
- .build();
-
- @Override
- protected Properties setupProperties() {
- Properties overrides = super.setupProperties();
- overrides.setProperty("jclouds.zones", "MTV-Zone1");
- return overrides;
- }
-
- public void testListSecurityGroups() {
- HttpRequest listSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "o%2Bd8xxWT1Pa%2BI57SG2caFAblBYA%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listsecuritygroupsresponse.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(listSecurityGroups, listSecurityGroupsResponse)
- .build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap).getSecurityGroupExtension().get();
-
- Set<SecurityGroup> groups = extension.listSecurityGroups();
- assertEquals(groups.size(), 5);
- }
-
- public void testListSecurityGroupsForNode() {
- HttpRequest listSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("virtualmachineid", "some-node")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "x4f9fGMjIHXl5biaaFK5oOEONcg%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/listsecuritygroupsresponse.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(listSecurityGroups, listSecurityGroupsResponse)
- .build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap).getSecurityGroupExtension().get();
-
- Set<SecurityGroup> groups = extension.listSecurityGroupsForNode("some-node");
- assertEquals(groups.size(), 5);
- }
-
- public void testGetSecurityGroupById() {
- HttpRequest listSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "13")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "TmlGaO2ICM%2BiXQr88%2BZCyWUniSw%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(listSecurityGroups, listSecurityGroupsResponse)
- .build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap).getSecurityGroupExtension().get();
-
- SecurityGroup group = extension.getSecurityGroupById("13");
- assertEquals(group.getId(), "13");
- assertEquals(group.getIpPermissions().size(), 2);
- }
-
- public void testCreateSecurityGroup() {
- HttpRequest listSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("securitygroupname", "jclouds-test")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "zGp2rfHY6fBIGkgODRxyNzFfPFI%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZoneWithSecurityGroups, getZoneWithSecurityGroupsResponse)
- .put(listSecurityGroups, listSecurityGroupsResponse)
- .put(createSecurityGroup, createSecurityGroupResponse)
- .build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap).getSecurityGroupExtension().get();
-
- SecurityGroup group = extension.createSecurityGroup("test", ZoneToLocationTest.two);
- assertEquals(group.getId(), "30");
- assertEquals(group.getIpPermissions().size(), 0);
- }
-
- @Test(expectedExceptions = UncheckedExecutionException.class,
- expectedExceptionsMessageRegExp = "java.lang.IllegalArgumentException: .* does not support security groups")
- public void testCreateSecurityGroupBadZone() {
- HttpRequest listSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("securitygroupname", "jclouds-test")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "zGp2rfHY6fBIGkgODRxyNzFfPFI%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(getZone, getZoneResponse)
- .put(listSecurityGroups, listSecurityGroupsResponse)
- .put(createSecurityGroup, createSecurityGroupResponse)
- .build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap).getSecurityGroupExtension().get();
-
- SecurityGroup group = extension.createSecurityGroup("test", ZoneToLocationTest.one);
- assertEquals(group.getId(), "30");
- assertEquals(group.getIpPermissions().size(), 0);
- }
-
- public void testRemoveSecurityGroup() {
- HttpRequest listSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "13")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "TmlGaO2ICM%2BiXQr88%2BZCyWUniSw%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_empty.json"))
- .build();
-
- HttpRequest deleteSecurityGroup = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deleteSecurityGroup")
- .addQueryParam("id", "13")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "S1A2lYR/ibf4%2BHGFxVLdZvXZujQ%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse deleteSecurityGroupResponse = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/deletesecuritygroupresponse.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(listSecurityGroups, listSecurityGroupsResponse)
- .put(deleteSecurityGroup, deleteSecurityGroupResponse)
- .build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap).getSecurityGroupExtension().get();
-
- assertTrue(extension.removeSecurityGroup("13"), "Did not remove security group");
- }
-
- public void testRemoveSecurityGroupDoesNotExist() {
- HttpRequest listSecurityGroups = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listSecurityGroups")
- .addQueryParam("listAll", "true")
- .addQueryParam("id", "14")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "pWQ30A6l5qh4eaNypGwM9FoLnUM%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse listSecurityGroupsResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse.json"))
- .build();
-
- Map<HttpRequest, HttpResponse> requestResponseMap = ImmutableMap.<HttpRequest, HttpResponse> builder()
- .put(listTemplates, listTemplatesResponse)
- .put(listOsTypes, listOsTypesResponse)
- .put(listOsCategories, listOsCategoriesResponse)
- .put(listZones, listZonesResponse)
- .put(listServiceOfferings, listServiceOfferingsResponse)
- .put(listAccounts, listAccountsResponse)
- .put(listNetworks, listNetworksResponse)
- .put(listSecurityGroups, listSecurityGroupsResponse)
- .build();
-
- SecurityGroupExtension extension = requestsSendResponses(requestResponseMap).getSecurityGroupExtension().get();
-
- assertFalse(extension.removeSecurityGroup("14"), "Should not have found security group to remove");
- }
-
- public void testAddIpPermissionCidrFromIpPermission() {
- HttpRequest addRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("securitygroupid", "13")
- .addQueryParam("protocol", "UDP")
- .addQueryParam("startport", "11")
- .addQueryParam("endport", "11")
- .addQueryParam("cidrlist", "1.1.1.1/24")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "XyokGNutHwcyU7KQVFZOTHvc4RY%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_cidr.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(addRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(addRuleResponse, queryAsyncJobResultAuthorizeIngressResponse, getWithRuleResponse)
- ).getSecurityGroupExtension().get();
-
- IpPermission.Builder builder = IpPermission.builder();
-
- builder.ipProtocol(IpProtocol.UDP);
- builder.fromPort(11);
- builder.toPort(11);
- builder.cidrBlock("1.1.1.1/24");
-
- IpPermission perm = builder.build();
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.addIpPermission(perm, origGroup);
-
- assertEquals(1, newGroup.getIpPermissions().size());
-
- IpPermission newPerm = Iterables.getOnlyElement(newGroup.getIpPermissions());
-
- assertNotNull(newPerm);
- assertEquals(newPerm.getIpProtocol(), IpProtocol.UDP);
- assertEquals(newPerm.getFromPort(), 11);
- assertEquals(newPerm.getToPort(), 11);
- assertEquals(newPerm.getCidrBlocks().size(), 1);
- assertTrue(newPerm.getCidrBlocks().contains("1.1.1.1/24"));
- }
-
- public void testAddIpPermissionCidrFromParams() {
- HttpRequest addRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("securitygroupid", "13")
- .addQueryParam("protocol", "UDP")
- .addQueryParam("startport", "11")
- .addQueryParam("endport", "11")
- .addQueryParam("cidrlist", "1.1.1.1/24")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "XyokGNutHwcyU7KQVFZOTHvc4RY%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_cidr.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(addRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(addRuleResponse, queryAsyncJobResultAuthorizeIngressResponse, getWithRuleResponse)
- ).getSecurityGroupExtension().get();
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.addIpPermission(IpProtocol.UDP, 11, 11, emptyMultimap(),
- ImmutableSet.of("1.1.1.1/24"), emptyStringSet(), origGroup);
-
- assertEquals(1, newGroup.getIpPermissions().size());
-
- IpPermission newPerm = Iterables.getOnlyElement(newGroup.getIpPermissions());
-
- assertNotNull(newPerm);
- assertEquals(newPerm.getIpProtocol(), IpProtocol.UDP);
- assertEquals(newPerm.getFromPort(), 11);
- assertEquals(newPerm.getToPort(), 11);
- assertEquals(newPerm.getCidrBlocks().size(), 1);
- assertTrue(newPerm.getCidrBlocks().contains("1.1.1.1/24"));
- }
-
- public void testAddIpPermissionGroupFromIpPermission() {
- HttpRequest addRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("securitygroupid", "13")
- .addQueryParam("protocol", "TCP")
- .addQueryParam("startport", "22")
- .addQueryParam("endport", "22")
- .addQueryParam("usersecuritygrouplist[0].account", "adrian")
- .addQueryParam("usersecuritygrouplist[0].group", "adriancole")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "v2OgKc2IftwX9pfKq2Pw/Z2xh9w%3D")
- .addHeader("Accept", "application/json")
- .build();
-
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_group.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(addRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(addRuleResponse, queryAsyncJobResultAuthorizeIngressResponse, getWithRuleResponse)
- ).getSecurityGroupExtension().get();
-
- IpPermission.Builder builder = IpPermission.builder();
-
- builder.ipProtocol(IpProtocol.TCP);
- builder.fromPort(22);
- builder.toPort(22);
- builder.tenantIdGroupNamePair("adrian", "adriancole");
-
- IpPermission perm = builder.build();
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.addIpPermission(perm, origGroup);
-
- assertEquals(1, newGroup.getIpPermissions().size());
-
- IpPermission newPerm = Iterables.getOnlyElement(newGroup.getIpPermissions());
-
- assertNotNull(newPerm);
- assertEquals(newPerm.getIpProtocol(), IpProtocol.TCP);
- assertEquals(newPerm.getFromPort(), 22);
- assertEquals(newPerm.getToPort(), 22);
- assertEquals(newPerm.getCidrBlocks().size(), 0);
- assertEquals(newPerm.getTenantIdGroupNamePairs().size(), 1);
- assertTrue(newPerm.getTenantIdGroupNamePairs().containsEntry("adrian", "adriancole"));
- }
-
- public void testAddIpPermissionGroupFromParams() {
- HttpRequest addRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("securitygroupid", "13")
- .addQueryParam("protocol", "TCP")
- .addQueryParam("startport", "22")
- .addQueryParam("endport", "22")
- .addQueryParam("usersecuritygrouplist[0].account", "adrian")
- .addQueryParam("usersecuritygrouplist[0].group", "adriancole")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "v2OgKc2IftwX9pfKq2Pw/Z2xh9w%3D")
- .addHeader("Accept", "application/json")
- .build();
-
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_group.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(addRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(addRuleResponse, queryAsyncJobResultAuthorizeIngressResponse, getWithRuleResponse)
- ).getSecurityGroupExtension().get();
-
- ImmutableMultimap.Builder<String, String> permBuilder = ImmutableMultimap.builder();
- permBuilder.put("adrian", "adriancole");
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.addIpPermission(IpProtocol.TCP, 22, 22,
- permBuilder.build(), emptyStringSet(), emptyStringSet(), origGroup);
-
- assertEquals(1, newGroup.getIpPermissions().size());
-
- IpPermission newPerm = Iterables.getOnlyElement(newGroup.getIpPermissions());
-
- assertNotNull(newPerm);
- assertEquals(newPerm.getIpProtocol(), IpProtocol.TCP);
- assertEquals(newPerm.getFromPort(), 22);
- assertEquals(newPerm.getToPort(), 22);
- assertEquals(newPerm.getCidrBlocks().size(), 0);
- assertEquals(newPerm.getTenantIdGroupNamePairs().size(), 1);
- assertTrue(newPerm.getTenantIdGroupNamePairs().containsEntry("adrian", "adriancole"));
- }
-
- public void testRemoveIpPermissionCidrFromIpPermission() {
- HttpRequest revokeRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "revokeSecurityGroupIngress")
- .addQueryParam("id", "6")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "H7cY/MEYGN7df1hiz0mMAFVBfa8%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_cidr.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(getWithRule, revokeRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(getWithRuleResponse, revokeRuleResponse,
- queryAsyncJobResultAuthorizeIngressResponse, getEmptyResponse)
- ).getSecurityGroupExtension().get();
-
- IpPermission.Builder builder = IpPermission.builder();
-
- builder.ipProtocol(IpProtocol.UDP);
- builder.fromPort(11);
- builder.toPort(11);
- builder.cidrBlock("1.1.1.1/24");
-
- IpPermission perm = builder.build();
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.removeIpPermission(perm, origGroup);
-
- assertEquals(newGroup.getIpPermissions().size(), 0);
- }
-
- public void testRemoveIpPermissionCidrFromParams() {
- HttpRequest revokeRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "revokeSecurityGroupIngress")
- .addQueryParam("id", "6")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "H7cY/MEYGN7df1hiz0mMAFVBfa8%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_cidr.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(getWithRule, revokeRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(getWithRuleResponse, revokeRuleResponse,
- queryAsyncJobResultAuthorizeIngressResponse, getEmptyResponse)
- ).getSecurityGroupExtension().get();
-
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.removeIpPermission(IpProtocol.UDP, 11, 11, emptyMultimap(),
- ImmutableSet.of("1.1.1.1/24"), emptyStringSet(), origGroup);
-
- assertEquals(newGroup.getIpPermissions().size(), 0);
- }
-
- public void testRemoveIpPermissionGroupFromIpPermission() {
- HttpRequest revokeRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "revokeSecurityGroupIngress")
- .addQueryParam("id", "5")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "bEzvrLtO7aEWkIqJgUeTnd%2B0XbY%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_group.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(getWithRule, revokeRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(getWithRuleResponse, revokeRuleResponse,
- queryAsyncJobResultAuthorizeIngressResponse, getEmptyResponse)
- ).getSecurityGroupExtension().get();
-
- IpPermission.Builder builder = IpPermission.builder();
-
- builder.ipProtocol(IpProtocol.TCP);
- builder.fromPort(22);
- builder.toPort(22);
- builder.tenantIdGroupNamePair("adrian", "adriancole");
-
- IpPermission perm = builder.build();
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.removeIpPermission(perm, origGroup);
-
- assertEquals(newGroup.getIpPermissions().size(), 0);
- }
-
- public void testRemoveIpPermissionGroupFromParams() {
- HttpRequest revokeRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "revokeSecurityGroupIngress")
- .addQueryParam("id", "5")
- .addQueryParam("apiKey", "APIKEY")
- .addQueryParam("signature", "bEzvrLtO7aEWkIqJgUeTnd%2B0XbY%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- HttpResponse getWithRuleResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/getsecuritygroupresponse_extension_byid_with_group.json"))
- .build();
-
- SecurityGroupExtension extension = orderedRequestsSendResponses(
- ImmutableList.of(getWithRule, revokeRule, queryAsyncJobResultAuthorizeIngress, getWithRule),
- ImmutableList.of(getWithRuleResponse, revokeRuleResponse,
- queryAsyncJobResultAuthorizeIngressResponse, getEmptyResponse)
- ).getSecurityGroupExtension().get();
-
- ImmutableMultimap.Builder<String, String> permBuilder = ImmutableMultimap.builder();
- permBuilder.put("adrian", "adriancole");
-
- SecurityGroup origGroup = new SecurityGroupBuilder().id("13").build();
-
- SecurityGroup newGroup = extension.removeIpPermission(IpProtocol.TCP, 22, 22,
- permBuilder.build(), emptyStringSet(), emptyStringSet(), origGroup);
-
- assertEquals(newGroup.getIpPermissions().size(), 0);
- }
-
- @Override
- public ComputeService createClient(Function<HttpRequest, HttpResponse> fn, Module module, Properties props) {
- return clientFrom(createInjector(fn, module, props).getInstance(CloudStackContext.class));
- }
-
- @Override
- protected ComputeService clientFrom(CloudStackContext context) {
- return context.getComputeService();
- }
-
- private Multimap<String, String> emptyMultimap() {
- return LinkedHashMultimap.create();
- }
-
- private Set<String> emptyStringSet() {
- return Sets.newLinkedHashSet();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java
deleted file mode 100644
index af5b0fb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.extensions;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.extensions.internal.BaseSecurityGroupExtensionLiveTest;
-import org.jclouds.sshj.config.SshjSshClientModule;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.inject.Module;
-
-/**
- * Live test for CloudStack {@link org.jclouds.compute.extensions.SecurityGroupExtension} implementation.
- */
-@Test(groups = "live", singleThreaded = true, testName = "CloudStackSecurityGroupExtensionLiveTest")
-public class CloudStackSecurityGroupExtensionLiveTest extends BaseSecurityGroupExtensionLiveTest {
-
- protected Zone zone;
-
- public CloudStackSecurityGroupExtensionLiveTest() {
- provider = "cloudstack";
- }
-
- @BeforeClass(groups = { "integration", "live" })
- public void setupContext() {
- super.setupContext();
-
- CloudStackApi api = view.unwrapApi(CloudStackApi.class);
- for (Zone z : api.getZoneApi().listZones()) {
- if (z.isSecurityGroupsEnabled()) {
- zone = z;
- break;
- }
- }
-
- if (zone == null)
- securityGroupsSupported = false;
- }
-
- protected Module getSshModule() {
- return new SshjSshClientModule();
- }
-
- @Override
- public Template getNodeTemplate() {
- return view.getComputeService().templateBuilder().locationId(zone.getId()).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java
deleted file mode 100644
index 6b9122a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static com.google.common.collect.Iterables.transform;
-import static org.testng.Assert.assertEquals;
-
-
-import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.net.domain.IpProtocol;
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit", testName = "CloudStackSecurityGroupToSecurityGroupTest")
-public class CloudStackSecurityGroupToSecurityGroupTest {
-
- private static final IngressRuleToIpPermission ruleConverter = new IngressRuleToIpPermission();
-
- @Test
- public void testApply() {
- IngressRule ruleToConvert = IngressRule.builder()
- .id("some-id")
- .account("some-account")
- .securityGroupName("some-group-name")
- .protocol(IpProtocol.TCP.toString())
- .startPort(10)
- .endPort(20)
- .CIDR("0.0.0.0/0")
- .build();
-
- org.jclouds.cloudstack.domain.SecurityGroup origGroup = org.jclouds.cloudstack.domain.SecurityGroup.builder()
- .id("some-id")
- .name("some-group")
- .description("some-description")
- .account("some-account")
- .ingressRules(ImmutableSet.of(ruleToConvert))
- .build();
-
- CloudStackSecurityGroupToSecurityGroup parser = createGroupParser();
-
- SecurityGroup group = parser.apply(origGroup);
-
- assertEquals(group.getId(), origGroup.getId());
- assertEquals(group.getProviderId(), origGroup.getId());
- assertEquals(group.getName(), origGroup.getName());
- assertEquals(group.getOwnerId(), origGroup.getAccount());
- assertEquals(group.getIpPermissions(), ImmutableSet.copyOf(transform(origGroup.getIngressRules(), ruleConverter)));
- }
-
- private CloudStackSecurityGroupToSecurityGroup createGroupParser() {
- CloudStackSecurityGroupToSecurityGroup parser = new CloudStackSecurityGroupToSecurityGroup(ruleConverter);
-
- return parser;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
deleted file mode 100644
index aedf310..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermissionTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.net.domain.IpProtocol;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-
-/**
- * Tests for the function for transforming a cloudstack specific IngressRule into a generic
- * IpPermission object.
- */
-public class IngressRuleToIpPermissionTest {
-
- @Test
- public void testApplyWithTCP() {
- IngressRule ruleToConvert = IngressRule.builder()
- .id("some-id")
- .account("some-account")
- .securityGroupName("some-group-name")
- .protocol(IpProtocol.TCP.toString())
- .startPort(10)
- .endPort(20)
- .CIDR("0.0.0.0/0")
- .build();
-
- IngressRuleToIpPermission converter = new IngressRuleToIpPermission();
-
- IpPermission convertedPerm = converter.apply(ruleToConvert);
-
- assertEquals(convertedPerm.getIpProtocol(), IpProtocol.fromValue(ruleToConvert.getProtocol()));
- assertEquals(convertedPerm.getFromPort(), ruleToConvert.getStartPort());
- assertEquals(convertedPerm.getToPort(), ruleToConvert.getEndPort());
- assertEquals(convertedPerm.getCidrBlocks(), ImmutableSet.of("0.0.0.0/0"));
- assertEquals(convertedPerm.getTenantIdGroupNamePairs().size(), 1);
- assertEquals(convertedPerm.getGroupIds().size(), 0);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java
deleted file mode 100644
index 827d8ce..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.parse.ListServiceOfferingsResponseTest;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.domain.Processor;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests {@code ServiceOfferingToHardware}
- */
-@Test(groups = "unit")
-public class ServiceOfferingToHardwareTest {
-
- static ServiceOfferingToHardware function = new ServiceOfferingToHardware();
- static Hardware one = new HardwareBuilder().ids("1").name("Small Instance")
- .processors(ImmutableList.of(new Processor(1, 500))).ram(512).build();
- static Hardware two = new HardwareBuilder().ids("2").name("Medium Instance")
- .processors(ImmutableList.of(new Processor(1, 1000))).ram(1024).build();
-
- @Test
- public void test() {
-
- Set<Hardware> expected = ImmutableSet.of(one, two);
-
- Set<ServiceOffering> offerings = new ListServiceOfferingsResponseTest().expected();
-
- Iterable<Hardware> profiles = Iterables.transform(offerings, function);
-
- assertEquals(profiles.toString(), expected.toString());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java
deleted file mode 100644
index 11c9d9e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.parse.ListTemplatesResponseTest;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.Image.Status;
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.domain.Location;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests {@code TemplateToImage}
- */
-@Test(groups = "unit")
-public class TemplateToImageTest {
- static Supplier<Set<? extends Location>> locationSupplier = Suppliers
- .<Set<? extends Location>> ofInstance(ImmutableSet.<Location> of(ZoneToLocationTest.one,
- ZoneToLocationTest.two));
-
- static TemplateToImage function = new TemplateToImage(locationSupplier, TemplateToOperatingSystemTest.function);
-
- // location free image
- static Image one = new ImageBuilder().id("2").providerId("2").name("CentOS 5.3(64-bit) no GUI (XenServer)")
- .operatingSystem(TemplateToOperatingSystemTest.one).description("CentOS 5.3(64-bit) no GUI (XenServer)")
- .status(Status.AVAILABLE).build();
- // location free image
- static Image two = new ImageBuilder().id("4").providerId("4").name("CentOS 5.5(64-bit) no GUI (KVM)")
- .operatingSystem(TemplateToOperatingSystemTest.two).description("CentOS 5.5(64-bit) no GUI (KVM)")
- .status(Status.AVAILABLE).build();
- static Image three = new ImageBuilder().id("203").providerId("203").name("Windows 7 KVM")
- .operatingSystem(TemplateToOperatingSystemTest.three).description("Windows 7 KVM")
- .location(ZoneToLocationTest.two).status(Status.AVAILABLE).build();
- // location free image
- static Image four = new ImageBuilder().id("7").providerId("7").name("CentOS 5.3(64-bit) no GUI (vSphere)")
- .operatingSystem(TemplateToOperatingSystemTest.four).description("CentOS 5.3(64-bit) no GUI (vSphere)")
- .status(Status.AVAILABLE).build();
- static Image five = new ImageBuilder().id("241").providerId("241").name("kvmdev4")
- .operatingSystem(TemplateToOperatingSystemTest.five).description("v5.6.28_Dev4")
- .location(ZoneToLocationTest.two).status(Status.AVAILABLE).build();
-
- @Test
- public void test() {
-
- Set<Image> expected = ImmutableSet.of(one, two, three, four, five);
-
- Set<Template> offerings = new ListTemplatesResponseTest().expected();
-
- Iterable<Image> profiles = Iterables.transform(offerings, function);
-
- assertEquals(profiles.toString(), expected.toString());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java
deleted file mode 100644
index 3877807..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.parse.ListOSCategoriesResponseTest;
-import org.jclouds.cloudstack.parse.ListOSTypesResponseTest;
-import org.jclouds.cloudstack.parse.ListTemplatesResponseTest;
-import org.jclouds.compute.config.BaseComputeServiceContextModule;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.json.Json;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.inject.Guice;
-
-/**
- * Tests {@code TemplateToOperatingSystem}
- */
-@Test(groups = "unit")
-public class TemplateToOperatingSystemTest {
- static Map<String, OSType> ostypes = Maps.<String, OSType> uniqueIndex(new ListOSTypesResponseTest().expected(),
- new Function<OSType, String>() {
-
- @Override
- public String apply(OSType arg0) {
- return arg0.getId();
- }
- });
-
- static TemplateToOperatingSystem function = new TemplateToOperatingSystem(Suppliers.ofInstance(ostypes),
- Suppliers.ofInstance(new ListOSCategoriesResponseTest().expected()), new BaseComputeServiceContextModule() {
- }.provideOsVersionMap(new ComputeServiceConstants.ReferenceData(), Guice.createInjector(new GsonModule())
- .getInstance(Json.class)));
-
- static OperatingSystem one = OperatingSystem.builder().name("CentOS").family(OsFamily.CENTOS).is64Bit(false)
- .version("5.3").description("CentOS 5.3 (32-bit)").build();
- static OperatingSystem two = OperatingSystem.builder().name("CentOS").family(OsFamily.CENTOS).is64Bit(true)
- .version("5.5").description("CentOS 5.5 (64-bit)").build();
- static OperatingSystem three = OperatingSystem.builder().name("Windows").family(OsFamily.WINDOWS).is64Bit(false)
- .version("7").description("Windows 7 (32-bit)").build();
- static OperatingSystem four = OperatingSystem.builder().name("CentOS").family(OsFamily.CENTOS).is64Bit(true)
- .version("5.3").description("CentOS 5.3 (64-bit)").build();
- static OperatingSystem five = OperatingSystem.builder().name("CentOS").family(OsFamily.CENTOS).is64Bit(true)
- .version("5.4").description("CentOS 5.4 (64-bit)").build();
-
- @Test
- public void test() {
-
- Set<OperatingSystem> expected = ImmutableSet.of(one, two, three, four, five);
-
- Set<Template> offerings = new ListTemplatesResponseTest().expected();
-
- Iterable<OperatingSystem> profiles = Iterables.transform(offerings, function);
-
- assertEquals(profiles.toString(), expected.toString());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java
deleted file mode 100644
index 6c055f7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.UnknownHostException;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.NIC;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.parse.ListVirtualMachinesResponseTest;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeMetadata.Status;
-import org.jclouds.compute.domain.NodeMetadataBuilder;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.domain.Location;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.inject.Guice;
-
-@Test(groups = "unit", testName = "VirtualMachineToNodeMetadataTest")
-public class VirtualMachineToNodeMetadataTest {
-
- GroupNamingConvention.Factory namingConvention = Guice.createInjector().getInstance(GroupNamingConvention.Factory.class);
-
- @Test
- public void testApplyWhereVirtualMachineWithIPForwardingRule() throws UnknownHostException {
-
- Supplier<Set<? extends Location>> locationSupplier = Suppliers.<Set<? extends Location>> ofInstance(ImmutableSet
- .<Location>of(ZoneToLocationTest.one, ZoneToLocationTest.two));
-
- Supplier<Set<? extends Image>> imageSupplier = Suppliers.<Set<? extends Image>> ofInstance(ImmutableSet
- .<Image>of(TemplateToImageTest.one, TemplateToImageTest.two));
- VirtualMachineToNodeMetadata parser = new VirtualMachineToNodeMetadata(locationSupplier, imageSupplier,
- CacheBuilder.newBuilder().<String, Set<IPForwardingRule>> build(
- new CacheLoader<String, Set<IPForwardingRule>>() {
- @Override
- public Set<IPForwardingRule> load(String arg0) throws Exception {
- return ImmutableSet.of(IPForwardingRule.builder().id("1234l").IPAddress("1.1.1.1").build());
- }
- }), namingConvention);
-
- // notice if we've already parsed this properly here, we can rely on it.
- VirtualMachine guest = Iterables.get(new ListVirtualMachinesResponseTest().expected(), 0);
-
- NodeMetadata node = parser.apply(guest);
-
- assertEquals(
- node.toString(),
- new NodeMetadataBuilder().id("54").providerId("54").name("i-3-54-VM").group("i-3-54")
- .location(ZoneToLocationTest.one).status(Status.PENDING).hostname("i-3-54-VM")
- .privateAddresses(ImmutableSet.of("10.1.1.18")).publicAddresses(ImmutableSet.of("1.1.1.1"))
- .hardware(addHypervisor(ServiceOfferingToHardwareTest.one, "XenServer"))
- .imageId(TemplateToImageTest.one.getId())
- .operatingSystem(TemplateToImageTest.one.getOperatingSystem()).build().toString());
-
- }
-
- @Test
- public void testApplyWhereVirtualMachineHasNoIpForwardingRuleAndAPublicIP() throws UnknownHostException {
-
- Supplier<Set<? extends Location>> locationSupplier = Suppliers.<Set<? extends Location>> ofInstance(ImmutableSet
- .<Location>of(ZoneToLocationTest.one, ZoneToLocationTest.two));
-
- Supplier<Set<? extends Image>> imageSupplier = Suppliers.<Set<? extends Image>> ofInstance(ImmutableSet
- .<Image>of(TemplateToImageTest.one, TemplateToImageTest.two));
-
- VirtualMachineToNodeMetadata parser = new VirtualMachineToNodeMetadata(locationSupplier, imageSupplier,
- CacheBuilder.newBuilder().<String, Set<IPForwardingRule>> build(
- new CacheLoader<String, Set<IPForwardingRule>>() {
- @Override
- public Set<IPForwardingRule> load(String arg0) throws Exception {
- return ImmutableSet.of();
- }
- }), namingConvention);
-
- VirtualMachine guest = VirtualMachine.builder()
- .id("54")
- .name("i-3-54-VM")
- .displayName("i-3-54-VM")
- .account("adrian")
- .domainId("1")
- .domain("ROOT")
- .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-16T14:28:37-0800"))
- .state(VirtualMachine.State.STARTING)
- .isHAEnabled(false)
- .zoneId("1")
- .zoneName("San Jose 1")
- .templateId("2")
- .templateName("CentOS 5.3(64-bit) no GUI (XenServer)")
- .templateDisplayText("CentOS 5.3(64-bit) no GUI (XenServer)")
- .passwordEnabled(false)
- .serviceOfferingId("1")
- .serviceOfferingName("Small Instance")
- .cpuCount(1)
- .cpuSpeed(500)
- .memory(512)
- .guestOSId("11")
- .rootDeviceId("0")
- .rootDeviceType("NetworkFilesystem")
- .jobId("63l")
- .jobStatus(0)
- .nics(ImmutableSet.of(NIC.builder().id("72").networkId("204").netmask("255.255.255.0").gateway("1.1.1.1")
- .IPAddress("1.1.1.5").trafficType(TrafficType.GUEST).guestIPType(GuestIPType.VIRTUAL)
- .isDefault(true).build())).hypervisor("XenServer").build();
-
- NodeMetadata node = parser.apply(guest);
-
- assertEquals(
- node.toString(),
- new NodeMetadataBuilder().id("54").providerId("54").name("i-3-54-VM").group("i-3-54")
- .location(ZoneToLocationTest.one).status(Status.PENDING).hostname("i-3-54-VM")
- .privateAddresses(ImmutableSet.<String>of())
- .publicAddresses(ImmutableSet.<String>of("1.1.1.5"))
- .hardware(addHypervisor(ServiceOfferingToHardwareTest.one, "XenServer"))
- .imageId(TemplateToImageTest.one.getId())
- .operatingSystem(TemplateToImageTest.one.getOperatingSystem()).build().toString());
- }
-
- @Test
- public void testApplyWhereVirtualMachineWithNoPassword() throws UnknownHostException {
-
- Supplier<Set<? extends Location>> locationSupplier = Suppliers.<Set<? extends Location>> ofInstance(ImmutableSet
- .<Location>of(ZoneToLocationTest.one, ZoneToLocationTest.two));
-
- Supplier<Set<? extends Image>> imageSupplier = Suppliers.<Set<? extends Image>> ofInstance(ImmutableSet
- .<Image>of(TemplateToImageTest.one, TemplateToImageTest.two));
- VirtualMachineToNodeMetadata parser = new VirtualMachineToNodeMetadata(locationSupplier, imageSupplier,
- CacheBuilder.newBuilder().<String, Set<IPForwardingRule>> build(
- new CacheLoader<String, Set<IPForwardingRule>>() {
-
- @Override
- public Set<IPForwardingRule> load(String arg0) throws Exception {
- throw new ResourceNotFoundException("no ip forwarding rule for: " + arg0);
- }
-
- }), namingConvention);
-
- // notice if we've already parsed this properly here, we can rely on it.
- VirtualMachine guest = Iterables.get(new ListVirtualMachinesResponseTest().expected(), 0);
-
- NodeMetadata node = parser.apply(guest);
-
- assertEquals(
- node.toString(),
- new NodeMetadataBuilder().id("54").providerId("54").name("i-3-54-VM").group("i-3-54")
- .location(ZoneToLocationTest.one).status(Status.PENDING).hostname("i-3-54-VM")
- .privateAddresses(ImmutableSet.of("10.1.1.18"))
- .hardware(addHypervisor(ServiceOfferingToHardwareTest.one, "XenServer"))
- .imageId(TemplateToImageTest.one.getId())
- .operatingSystem(TemplateToImageTest.one.getOperatingSystem()).build().toString());
- }
-
- protected Hardware addHypervisor(Hardware in, String hypervisor) {
- return HardwareBuilder.fromHardware(in).hypervisor(hypervisor).build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java
deleted file mode 100644
index ab8c239..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-import java.net.URI;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.parse.ListZonesResponseTest;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.location.suppliers.all.JustProvider;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests {@code ZoneToLocation}
- */
-@Test(singleThreaded = true, groups = "unit")
-public class ZoneToLocationTest {
-
- public static final JustProvider justProvider = new JustProvider("cloudstack", Suppliers.ofInstance(URI.create("foo")),
- ImmutableSet.<String> of());
- public static final ZoneToLocation function = new ZoneToLocation(justProvider);
- public static final Location one = new LocationBuilder().parent(Iterables.get(justProvider.get(), 0)).scope(LocationScope.ZONE)
- .description("San Jose 1").id("1").build();
- public static final Location two = new LocationBuilder().parent(Iterables.get(justProvider.get(), 0)).scope(LocationScope.ZONE)
- .description("Chicago").id("2").build();
-
- @Test
- public void test() {
-
- Set<Location> expected = ImmutableSet.of(one, two);
-
- Set<Zone> zones = new ListZonesResponseTest().expected();
-
- Iterable<Location> locations = Iterables.transform(zones, function);
-
- assertEquals(locations.toString(), expected.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPairTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPairTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPairTest.java
deleted file mode 100644
index 1fbddae..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPairTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.loaders;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertEquals;
-
-import java.net.UnknownHostException;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.features.SSHKeyPairApi;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.TypeLiteral;
-
-@Test(groups = "unit", testName = "CreateUniqueKeyPairTest")
-public class CreateUniqueKeyPairTest {
-
- @Test
- public void testLoad() throws UnknownHostException {
- final CloudStackApi client = createMock(CloudStackApi.class);
- SSHKeyPairApi keyClient = createMock(SSHKeyPairApi.class);
-
- SshKeyPair pair = createMock(SshKeyPair.class);
-
- expect(client.getSSHKeyPairApi()).andReturn(keyClient);
- expect(keyClient.createSSHKeyPair("group-1")).andReturn(pair);
-
- replay(client, keyClient);
-
- CreateUniqueKeyPair parser = Guice.createInjector(new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<Supplier<String>>() {
- }).toInstance(Suppliers.ofInstance("1"));
- bind(CloudStackApi.class).toInstance(client);
- }
-
- }).getInstance(CreateUniqueKeyPair.class);
-
- assertEquals(parser.load("group-1"), pair);
-
- verify(client, keyClient);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java
deleted file mode 100644
index 87fabd8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreateTest.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.loaders;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.util.Predicates2.retry;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertEquals;
-
-import java.net.UnknownHostException;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-import org.jclouds.cloudstack.features.AsyncJobApi;
-import org.jclouds.cloudstack.features.SecurityGroupApi;
-import org.jclouds.cloudstack.features.ZoneApi;
-import org.jclouds.cloudstack.functions.CreateSecurityGroupIfNeeded;
-import org.jclouds.cloudstack.functions.ZoneIdToZone;
-import org.jclouds.cloudstack.predicates.JobComplete;
-import org.jclouds.cloudstack.suppliers.ZoneIdToZoneSupplier;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Provides;
-import com.google.inject.TypeLiteral;
-import com.google.inject.name.Names;
-
-@Test(groups = "unit", testName = "FindSecurityGroupOrCreateTest")
-public class FindSecurityGroupOrCreateTest {
-
- @Test
- public void testLoad() throws UnknownHostException {
- final CloudStackApi client = createMock(CloudStackApi.class);
- SecurityGroupApi secClient = createMock(SecurityGroupApi.class);
- ZoneApi zoneClient = createMock(ZoneApi.class);
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- SecurityGroup group = createMock(SecurityGroup.class);
-
- Zone zone = createMock(Zone.class);
-
- expect(group.getIngressRules()).andReturn(ImmutableSet.<IngressRule> of());
- expect(group.getId()).andReturn("sec-1234").anyTimes();
- expect(zone.isSecurityGroupsEnabled()).andReturn(true);
-
- expect(client.getSecurityGroupApi()).andReturn(secClient)
- .anyTimes();
- expect(client.getZoneApi()).andReturn(zoneClient);
- expect(client.getAsyncJobApi()).andReturn(jobClient).anyTimes();
-
- expect(zoneClient.getZone("zone-1")).andReturn(zone);
- expect(secClient.getSecurityGroupByName("group-1")).andReturn(null);
- expect(secClient.createSecurityGroup("group-1")).andReturn(group);
- expect(secClient.authorizeIngressPortsToCIDRs("sec-1234",
- "TCP",
- 22,
- 22,
- ImmutableSet.of("0.0.0.0/0"))).andReturn("job-1234");
-
- replay(client, secClient, zoneClient, zone, group);
-
- ZoneSecurityGroupNamePortsCidrs input = ZoneSecurityGroupNamePortsCidrs.builder()
- .zone("zone-1")
- .name("group-1")
- .ports(ImmutableSet.of(22))
- .cidrs(ImmutableSet.<String> of()).build();
-
- FindSecurityGroupOrCreate parser = Guice.createInjector(new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<Supplier<String>>() {
- }).toInstance(Suppliers.ofInstance("1"));
- bind(CloudStackApi.class).toInstance(client);
- bind(new TypeLiteral<CacheLoader<String, Zone>>() {}).
- to(ZoneIdToZone.class);
- bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {}).
- to(ZoneIdToZoneSupplier.class);
- bind(String.class).annotatedWith(Names.named(PROPERTY_SESSION_INTERVAL)).toInstance("60");
-
- bind(new TypeLiteral<Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup>>() {
- }).to(CreateSecurityGroupIfNeeded.class);
-
- bind(new TypeLiteral<CacheLoader<ZoneAndName, SecurityGroup>>() {
- }).to(FindSecurityGroupOrCreate.class);
- }
-
- @Provides
- @Singleton
- protected Predicate<String> jobComplete(JobComplete jobComplete) {
- return retry(jobComplete, 1200, 1, 5, SECONDS);
- }
-
- }).getInstance(FindSecurityGroupOrCreate.class);
-
- assertEquals(parser.load(input), group);
-
- verify(client, secClient, zoneClient, zone, group);
- }
-
-
- @Test
- public void testLoadAlreadyExists() throws UnknownHostException {
- final CloudStackApi client = createMock(CloudStackApi.class);
- SecurityGroupApi secClient = createMock(SecurityGroupApi.class);
- ZoneApi zoneClient = createMock(ZoneApi.class);
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- SecurityGroup group = createMock(SecurityGroup.class);
-
- Zone zone = createMock(Zone.class);
-
- expect(group.getId()).andReturn("sec-1234").anyTimes();
-
- expect(client.getSecurityGroupApi()).andReturn(secClient)
- .anyTimes();
- expect(client.getZoneApi()).andReturn(zoneClient);
- expect(client.getAsyncJobApi()).andReturn(jobClient).anyTimes();
-
- expect(secClient.getSecurityGroupByName("group-1")).andReturn(group);
-
- replay(client, secClient, zoneClient, zone, group);
-
- ZoneSecurityGroupNamePortsCidrs input = ZoneSecurityGroupNamePortsCidrs.builder()
- .zone("zone-1")
- .name("group-1")
- .ports(ImmutableSet.of(22))
- .cidrs(ImmutableSet.<String> of()).build();
-
- FindSecurityGroupOrCreate parser = Guice.createInjector(new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<Supplier<String>>() {
- }).toInstance(Suppliers.ofInstance("1"));
- bind(CloudStackApi.class).toInstance(client);
- bind(new TypeLiteral<CacheLoader<String, Zone>>() {}).
- to(ZoneIdToZone.class);
- bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {}).
- to(ZoneIdToZoneSupplier.class);
- bind(String.class).annotatedWith(Names.named(PROPERTY_SESSION_INTERVAL)).toInstance("60");
-
- bind(new TypeLiteral<Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup>>() {
- }).to(CreateSecurityGroupIfNeeded.class);
-
- bind(new TypeLiteral<CacheLoader<ZoneAndName, SecurityGroup>>() {
- }).to(FindSecurityGroupOrCreate.class);
- }
-
- @Provides
- @Singleton
- protected Predicate<String> jobComplete(JobComplete jobComplete) {
- return retry(jobComplete, 1200, 1, 5, SECONDS);
- }
-
- }).getInstance(FindSecurityGroupOrCreate.class);
-
- assertEquals(parser.load(input), group);
-
- verify(client, secClient, zoneClient, zone, group);
- }
-
- @Test(expectedExceptions = IllegalArgumentException.class)
- public void testLoadZoneNoSecurityGroups() throws UnknownHostException {
- final CloudStackApi client = createMock(CloudStackApi.class);
- SecurityGroupApi secClient = createMock(SecurityGroupApi.class);
- ZoneApi zoneClient = createMock(ZoneApi.class);
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- SecurityGroup group = createMock(SecurityGroup.class);
-
- Zone zone = createMock(Zone.class);
-
- expect(zone.isSecurityGroupsEnabled()).andReturn(false);
-
- expect(client.getSecurityGroupApi()).andReturn(secClient)
- .anyTimes();
- expect(client.getZoneApi()).andReturn(zoneClient);
- expect(client.getAsyncJobApi()).andReturn(jobClient).anyTimes();
-
- expect(zoneClient.getZone("zone-1")).andReturn(zone);
- expect(secClient.getSecurityGroupByName("group-1")).andReturn(null);
-
- replay(client, secClient, zoneClient, zone, group);
-
- ZoneSecurityGroupNamePortsCidrs input = ZoneSecurityGroupNamePortsCidrs.builder()
- .zone("zone-1")
- .name("group-1")
- .ports(ImmutableSet.of(22))
- .cidrs(ImmutableSet.<String> of()).build();
-
- FindSecurityGroupOrCreate parser = Guice.createInjector(new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<Supplier<String>>() {
- }).toInstance(Suppliers.ofInstance("1"));
- bind(CloudStackApi.class).toInstance(client);
- bind(new TypeLiteral<CacheLoader<String, Zone>>() {}).
- to(ZoneIdToZone.class);
- bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {}).
- to(ZoneIdToZoneSupplier.class);
- bind(String.class).annotatedWith(Names.named(PROPERTY_SESSION_INTERVAL)).toInstance("60");
-
- bind(new TypeLiteral<Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup>>() {
- }).to(CreateSecurityGroupIfNeeded.class);
-
- bind(new TypeLiteral<CacheLoader<ZoneAndName, SecurityGroup>>() {
- }).to(FindSecurityGroupOrCreate.class);
- }
-
- @Provides
- @Singleton
- protected Predicate<String> jobComplete(JobComplete jobComplete) {
- return retry(jobComplete, 1200, 1, 5, SECONDS);
- }
-
- }).getInstance(FindSecurityGroupOrCreate.class);
-
- assertEquals(parser.load(input), group);
-
- verify(client, secClient, zoneClient, zone, group);
- }
-
-}
[02/51] [abbrv] stratos git commit: works 6 oct
Posted by im...@apache.org.
works 6 oct
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bd9c0ec5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bd9c0ec5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bd9c0ec5
Branch: refs/heads/master
Commit: bd9c0ec5de19e5e69bb027a80e3037b7e946e7ca
Parents: a79cfaa
Author: asankasa <as...@wso2.com>
Authored: Mon Oct 6 19:34:34 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:26 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller/pom.xml | 5 +
.../cloud/controller/iaases/CloudstackIaas.java | 132 +-
.../cloud/controller/interfaces/Iaas.java | 2 +-
.../validate/CloudstackPartitionValidator.java | 30 +-
hs_err_pid19968.log | 1394 ++++++++++++++++++
5 files changed, 1543 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd9c0ec5/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index fa7af66..c1232b7 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -245,6 +245,11 @@
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
+ <artifactId>cloudstack</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-keystone</artifactId>
<version>${jclouds.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd9c0ec5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index 0d0e902..425e328 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -1,15 +1,28 @@
package org.apache.stratos.cloud.controller.iaases;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.exception.CloudControllerException;
import org.apache.stratos.cloud.controller.exception.InvalidHostException;
import org.apache.stratos.cloud.controller.exception.InvalidRegionException;
import org.apache.stratos.cloud.controller.exception.InvalidZoneException;
import org.apache.stratos.cloud.controller.interfaces.Iaas;
+import org.apache.stratos.cloud.controller.jcloud.ComputeServiceBuilderUtil;
import org.apache.stratos.cloud.controller.pojo.IaasProvider;
+import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import org.apache.stratos.cloud.controller.validate.CloudstackPartitionValidator;
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
+import org.jclouds.cloudstack.CloudStackApi;
+import org.jclouds.cloudstack.domain.Zone;
+import org.jclouds.cloudstack.options.ListZonesOptions;
+import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.NodeMetadata;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.jclouds.compute.domain.Template;
+import org.jclouds.compute.domain.TemplateBuilder;
+import org.jclouds.domain.Location;
+
+import java.util.Set;
public class CloudstackIaas extends Iaas{
@@ -22,83 +35,174 @@ public class CloudstackIaas extends Iaas{
@Override
public void buildComputeServiceAndTemplate() {
+ // builds and sets Compute Service
+ ComputeServiceBuilderUtil.buildDefaultComputeService(getIaasProvider());
+ // builds and sets Template
+ buildTemplate();
+
+ }
+
+
+ @Override
+ public void buildTemplate() {
+///todo implement this method
+
+ IaasProvider iaasInfo = getIaasProvider();
+ //if compute service is not available
+ if (iaasInfo.getComputeService() == null) {
+ String msg = "Compute service is null for IaaS provider: "
+ + iaasInfo.getName();
+ log.fatal(msg);
+ throw new CloudControllerException(msg);
+ }
+
+ //create templateBuilder
+ TemplateBuilder templateBuilder = iaasInfo.getComputeService()
+ .templateBuilder();
+
+ //todo what is this image id???
+ // set image id specified
+ templateBuilder.imageId(iaasInfo.getImage());
+
+ System.out.println("===========iaasInfo.getImage()=============== "+iaasInfo.getImage());
+
+ //logic
+
+ if(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
+ Set<? extends Location> locations = iaasInfo.getComputeService().listAssignableLocations();
+ for(Location location : locations) {
+ if(location.getScope().toString().equalsIgnoreCase(CloudControllerConstants.ZONE_ELEMENT) &&
+ location.getId().equals(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE))) {
+ templateBuilder.locationId(location.getId());
+ log.info("ZONE has been set as " + iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE)
+ + " with id: " + location.getId());
+ break;
+ }
+ }
+ }
+
+
+
+
+
+ //build the template
+ Template template = templateBuilder.build();
+ // set Template
+ iaasInfo.setTemplate(template);
}
@Override
public void setDynamicPayload() {
-
+ ///todo implement this method
}
@Override
public String associateAddress(NodeMetadata node) {
+
+ //todo implement this method
return null;
}
@Override
public String associatePredefinedAddress(NodeMetadata node, String ip) {
+
+ //todo implement this method
return null;
}
@Override
public void releaseAddress(String ip) {
-
+//todo implement this method
}
@Override
public boolean createKeyPairFromPublicKey(String region, String keyPairName, String publicKey) {
+ //todo implement this method
return false;
}
@Override
public boolean isValidRegion(String region) throws InvalidRegionException {
- return false;
+
+
+ //todo study more about this
+
+ IaasProvider iaasInfo = getIaasProvider();
+
+ //no such a method in jclouds
+ String msg = "Invalid region: " + region +" in the iaas: " +iaasInfo.getType();
+ log.error(msg);
+ throw new InvalidRegionException(msg);
}
@Override
public boolean isValidZone(String region, String zone) throws InvalidZoneException {
- return false;
+
+ IaasProvider iaasInfo = getIaasProvider();
+
+ ComputeServiceContext context = iaasInfo.getComputeService().getContext();
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+ ListZonesOptions listZonesOptions = new ListZonesOptions();
+ listZonesOptions.available(true);
+ Set<Zone> zoneSet = cloudStackApi.getZoneApi().listZones(listZonesOptions);
+
+ for(org.jclouds.cloudstack.domain.Zone configuredZone :zoneSet){
+ if(configuredZone.getName().equalsIgnoreCase(zone)){
+ return true;
+ }
+ }
+ String msg = "Invalid zone: " + zone +" in the iaas: "+iaasInfo.getType();
+ log.error(msg);
+ throw new InvalidZoneException(msg);
}
@Override
public boolean isValidHost(String zone, String host) throws InvalidHostException {
- return false;
+ //todo implement this method
+
+
+
+
+ return true;
}
@Override
public PartitionValidator getPartitionValidator() {
- return null;
+ return new CloudstackPartitionValidator();
}
- @Override
- public void buildTemplate() {
- }
@Override
public String createVolume(int sizeGB, String snapshotId) {
+
+ //todo implement this method
return null;
}
@Override
public String attachVolume(String instanceId, String volumeId, String deviceName) {
+
+ //todo implement this method
return null;
}
@Override
public void detachVolume(String instanceId, String volumeId) {
-
+//todo implement this method
}
@Override
public void deleteVolume(String volumeId) {
-
+//todo implement this method
}
@Override
- public String getIaasDevice(String device) {
+ public String getIaasDevice(String device)
+ {//todo implement this method
return null;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd9c0ec5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
index 1ae7dc5..00766de 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java
@@ -113,7 +113,7 @@ public abstract class Iaas {
* @return whether the zone is valid in the given region or not.
* @throws InvalidZoneException if the zone is invalid in a given region.
*/
- public abstract boolean isValidZone(String region, String zone) throws InvalidZoneException;
+ public abstract boolean isValidZone(String region, String zone) throws InvalidZoneException, InvalidRegionException;
/**
* Validate a given host id against a particular zone in an IaaS.
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd9c0ec5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
index a0277c3..46b7f99 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/CloudstackPartitionValidator.java
@@ -5,13 +5,14 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
import org.apache.stratos.cloud.controller.interfaces.Iaas;
import org.apache.stratos.cloud.controller.pojo.IaasProvider;
+import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
+import org.apache.stratos.messaging.domain.topology.Scope;
import java.util.Properties;
-/**
- * Created by sanjaya on 9/11/14.
- */
+
public class CloudstackPartitionValidator implements PartitionValidator {
@@ -29,8 +30,27 @@ public class CloudstackPartitionValidator implements PartitionValidator {
@Override
public IaasProvider validate(String partitionId, Properties properties) throws InvalidPartitionException {
- System.out.println("======================hey===================");
-
+ //todo remove this
+ iaas.buildComputeServiceAndTemplate();
+
+ try {
+ IaasProvider updatedIaasProvider = new IaasProvider(iaasProvider);
+ Iaas updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider);
+ updatedIaas.setIaasProvider(updatedIaasProvider);
+
+ if (properties.containsKey(Scope.zone.toString())) {
+ String zone = properties.getProperty(Scope.zone.toString());
+ iaas.isValidZone(null, zone);
+ updatedIaasProvider.setProperty(CloudControllerConstants.AVAILABILITY_ZONE, zone);
+ updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider);
+ updatedIaas.setIaasProvider(updatedIaasProvider);
+ }
+
+ } catch (Exception ex) {
+ String msg = "Invalid Partition Detected : "+partitionId+". Cause: "+ex.getMessage();
+ log.error(msg, ex);
+ throw new InvalidPartitionException(msg, ex);
+ }
return iaasProvider;
}
}
[20/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java
deleted file mode 100644
index 493630b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import java.net.URI;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-
-import static org.testng.Assert.assertNotNull;
-
-/**
-* Test the CloudStack VolumeApi
-*
-*/
-@Test(groups = "unit", testName = "VolumeApiExpectTest")
-public class VolumeApiExpectTest extends BaseCloudStackExpectTest<VolumeApi> {
-
- public void testCreateVolumeFromCustomDiskOffering() throws NoSuchAlgorithmException, CertificateException {
- VolumeApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=createVolume&name=VolumeApiExpectTest-jclouds-volume&diskofferingid=0473f5dd-bca5-4af4-a9b6-db9e8a88a2f6&zoneid=6f9a2921-b22a-4149-8b71-6ffc275a2177&size=1&apiKey=identity&signature=%2BoEjGobVFLr58k19LeAE81bZkKM%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/queryasyncjobresultresponse-createvolume.json"))
- .build());
-
- AsyncCreateResponse response = client.createVolumeFromCustomDiskOfferingInZone("VolumeApiExpectTest-jclouds-volume", "0473f5dd-bca5-4af4-a9b6-db9e8a88a2f6", "6f9a2921-b22a-4149-8b71-6ffc275a2177", 1);
- assertNotNull(response);
- }
-
- @Override
- protected VolumeApi clientFrom(CloudStackContext context) {
- return context.getApi().getVolumeApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java
deleted file mode 100644
index 7ffc3b4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiLiveTest.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNotSame;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertTrue;
-
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import javax.annotation.Resource;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.DiskOffering;
-import org.jclouds.cloudstack.domain.Snapshot;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListVolumesOptions;
-import org.jclouds.logging.Logger;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code VolumeApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "VolumeApiLiveTest")
-public class VolumeApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Resource Logger logger = Logger.NULL;
-
- protected String prefix = System.getProperty("user.name") + "-" + getClass().getSimpleName();
-
- private String zoneId;
-
- @BeforeMethod(groups = "live")
- public void setZoneId() {
- Set<Zone> zones = client.getZoneApi().listZones();
- assertNotNull(zones);
- assertFalse(zones.isEmpty());
- zoneId = Iterables.get(zones, 0).getId();
- }
-
- public void testListVolumes() {
- Set<Volume> volumes = client.getVolumeApi().listVolumes();
- assertNotNull(volumes);
- assertFalse(volumes.isEmpty());
-
- for (Volume volume : volumes) {
- checkVolume(volume);
- }
- }
-
- public void testListVolumesById() {
- Iterable<String> volumeIds = Iterables.transform(client.getVolumeApi().listVolumes(), new Function<Volume, String>() {
- public String apply(Volume input) {
- return input.getId();
- }
- });
- assertNotNull(volumeIds);
- assertFalse(Iterables.isEmpty(volumeIds));
-
- for (String id : volumeIds) {
- Set<Volume> found = client.getVolumeApi().listVolumes(ListVolumesOptions.Builder.id(id));
- assertNotNull(found);
- assertEquals(1, found.size());
- Volume volume = Iterables.getOnlyElement(found);
- assertEquals(id, volume.getId());
- checkVolume(volume);
- }
- }
-
- public void testListVolumesNonexistantId() {
- Set<Volume> found = client.getVolumeApi().listVolumes(ListVolumesOptions.Builder.id("foo"));
- assertNotNull(found);
- assertTrue(found.isEmpty());
- }
-
- public void testGetVolumeById() {
- Iterable<String> volumeIds = Iterables.transform(client.getVolumeApi().listVolumes(), new Function<Volume, String>() {
- public String apply(Volume input) {
- return input.getId();
- }
- });
- assertNotNull(volumeIds);
- assertFalse(Iterables.isEmpty(volumeIds));
-
- for (String id : volumeIds) {
- Volume found = client.getVolumeApi().getVolume(id);
- assertNotNull(found);
- assertEquals(id, found.getId());
- checkVolume(found);
- }
- }
-
- public void testGetVolumeNonexistantId() {
- Volume found = client.getVolumeApi().getVolume("foo");
- assertNull(found);
- }
-
- protected DiskOffering getPreferredDiskOffering() {
- for (DiskOffering candidate : client.getOfferingApi().listDiskOfferings()) {
- //any will do
- return candidate;
- }
- throw new AssertionError("No suitable DiskOffering found.");
- }
- protected Snapshot getPreferredSnapshot() {
- for (Snapshot candidate : client.getSnapshotApi().listSnapshots()) {
- if (candidate.getState() == Snapshot.State.BACKED_UP)
- return candidate;
- }
- throw new AssertionError("No suitable Snapshot found.");
- }
-
- protected VirtualMachine getPreferredVirtualMachine() {
- for (VirtualMachine candidate : client.getVirtualMachineApi().listVirtualMachines()) {
-// this is a guess::
- if (candidate.getState() == VirtualMachine.State.RUNNING || candidate.getState() == VirtualMachine.State.STOPPED)
- return candidate;
- }
- throw new AssertionError("No suitable VirtualMachine found.");
- }
-
- protected Volume createPreferredVolumeFromDisk() {
- AsyncCreateResponse job = client.getVolumeApi().createVolumeFromDiskOfferingInZone(prefix + "-jclouds-volume",
- getPreferredDiskOffering().getId(), zoneId);
- assertTrue(jobComplete.apply(job.getJobId()));
- logger.info("created volume " + job.getId());
- return findVolumeWithId(job.getId());
- }
-
- public void testCreateVolumeFromDiskofferingInZoneAndDeleteVolume() {
- logger.info("testCreateVolumeFromDiskofferingInZoneAndDeleteVolume");
- Volume volume = createPreferredVolumeFromDisk();
- checkVolume(volume);
- client.getVolumeApi().deleteVolume(volume.getId());
- }
-
- /** Test requires a custom disk offering to be available */
- public void testCreateVolumeFromCustomDiskOffering() {
- final int size = 1;
- DiskOffering offering = null;
- for (DiskOffering candidate : client.getOfferingApi().listDiskOfferings()) {
- if (candidate.isCustomized()) {
- offering = candidate;
- break;
- }
- }
-
- assertNotNull("No custom disk offering found!", offering);
-
- AsyncCreateResponse job = client.getVolumeApi().createVolumeFromCustomDiskOfferingInZone(
- prefix + "-jclouds-volume", offering.getId(), zoneId, size);
- assertTrue(jobComplete.apply(job.getJobId()));
- logger.info("created volume " + job.getId());
-
- Volume volume = findVolumeWithId(job.getId());
- try {
- checkVolume(volume);
- assertEquals(volume.getSize(), size * 1024 * 1024 * 1024);
- } finally {
- client.getVolumeApi().deleteVolume(volume.getId());
- }
- }
-
- /** test requires that a VM exist */
- public void testCreateVolumeFromDiskofferingInZoneAndAttachVolumeToVirtualMachineAndDetachAndDelete() {
- logger.info("testCreateVolumeFromDiskofferingInZoneAndAttachVolumeToVirtualMachineAndDetachAndDelete");
- final Volume volume = createPreferredVolumeFromDisk();
- try {
-
- checkVolume(volume);
-
- VirtualMachine virtualMachine = getPreferredVirtualMachine();
-
- logger.info("attaching volume %s to vm %s", volume, virtualMachine);
- AsyncCreateResponse job = client.getVolumeApi().attachVolume(volume.getId(), virtualMachine.getId());
- assertTrue(jobComplete.apply(job.getJobId()));
- Volume attachedVolume = findVolumeWithId(volume.getId());
-
- checkVolume(attachedVolume);
- assertEquals(virtualMachine.getId(), attachedVolume.getVirtualMachineId());
- assertNotNull(attachedVolume.getAttached());
-
- logger.info("detaching volume %s from vm %s", volume, virtualMachine);
- job = client.getVolumeApi().detachVolume(volume.getId());
- assertTrue(jobComplete.apply(job.getJobId()));
- Volume detachedVolume = findVolumeWithId(volume.getId());
-
- checkVolume(detachedVolume);
- assertNull(detachedVolume.getAttached());
-
- } finally {
- client.getVolumeApi().deleteVolume(volume.getId());
- }
- }
-
- public void testCreateVolumeFromSnapshotInZoneAndDeleteVolume() {
- logger.info("testCreateVolumeFromSnapshotInZoneAndDeleteVolume (takes ~3m)");
- assertNotNull(getPreferredSnapshot());
-
- AsyncCreateResponse job = client.getVolumeApi().createVolumeFromSnapshotInZone(prefix + "-jclouds-volume",
- getPreferredSnapshot().getId(), zoneId);
- assertTrue(jobComplete.apply(job.getJobId()));
- Volume volume = findVolumeWithId(job.getId());
-
- checkVolume(volume);
- client.getVolumeApi().deleteVolume(volume.getId());
- }
-
- static void checkVolume(final Volume volume) {
- assertNotNull(volume.getId());
- assertNotNull(volume.getName());
- assertNotSame(Volume.Type.UNRECOGNIZED, volume.getType());
- }
-
- Volume findVolumeWithId(final String id) {
- return findVolumeWithId(client, id);
- }
-
- static Volume findVolumeWithId(final CloudStackApi client, final String id) {
- for (Volume v : client.getVolumeApi().listVolumes())
- if (v.getId().equals(id)) return v;
- throw new NoSuchElementException("no volume with id " + id);
- }
-
-// //uncomment to force a cleanup of volumes (since test failures can leave messes)
-// public void deleteAllWeUsed() {
-// for (Volume v: client.getVolumeApi().listVolumes()) {
-// if (v.getName().startsWith(prefix)) {
-// logger.warn("found apparent detritus, deleting: %s", v);
-// try {
-// client.getVolumeApi().deleteVolume(v.getId());
-// } catch (Exception e) {
-// logger.warn(e, "failed to delete %s: %s", v, e);
-// }
-// }
-// }
-// }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java
deleted file mode 100644
index 9002f46..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListVolumesOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code EventApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "VolumeApiTest")
-public class VolumeApiTest extends BaseCloudStackApiTest<VolumeApi> {
-
- public void testListVolumes() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VolumeApi.class, "listVolumes", ListVolumesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listVolumes&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetVolume() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VolumeApi.class, "getVolume", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(111L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listVolumes&listAll=true&id=111 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest createVolumeFromSnapshot = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createVolume")
- .addQueryParam("name", "jclouds-volume")
- .addQueryParam("snapshotid", "999")
- .addQueryParam("zoneid", "111").build();
-
- public void testCreateVolumeWithSnapshot() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VolumeApi.class, "createVolumeFromSnapshotInZone", String.class, String.class,
- String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("jclouds-volume", 999L, 111l));
-
- assertRequestLineEquals(httpRequest, createVolumeFromSnapshot.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- checkFilters(httpRequest);
-
- }
-
- HttpRequest createVolumeFromDiskOffering = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createVolume")
- .addQueryParam("name", "jclouds-volume")
- .addQueryParam("diskofferingid", "999")
- .addQueryParam("zoneid", "111").build();
-
- public void testCreateVolumeFromDiskOffering() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VolumeApi.class, "createVolumeFromDiskOfferingInZone", String.class, String.class,
- String.class);
-
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("jclouds-volume", 999L, 111L));
-
- assertRequestLineEquals(httpRequest, createVolumeFromDiskOffering.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- checkFilters(httpRequest);
-
- }
-
- public void testAttachVolume() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VolumeApi.class, "attachVolume", String.class, String.class);
-
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(111L, 999L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=attachVolume&id=111&virtualmachineid=999 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- checkFilters(httpRequest);
-
- }
-
- public void testDetachVolume() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VolumeApi.class, "detachVolume", String.class);
-
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(111L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=detachVolume&id=111 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- checkFilters(httpRequest);
-
- }
-
- public void testDeleteVolume() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VolumeApi.class, "deleteVolume", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(111L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteVolume&id=111 HTTP/1.1");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java
deleted file mode 100644
index 2d709ad..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack ZoneApi
- */
-@Test(groups = "unit", testName = "ZoneApiExpectTest")
-public class ZoneApiExpectTest extends BaseCloudStackExpectTest<ZoneApi> {
-
-
- public void testListZonesWhenResponseIs2xx() {
- ZoneApi client = requestSendsResponse(
- HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "listZones")
- .addQueryParam("listAll", "true")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "8iHCtck0qfxFTqJ8reyAObRf31I%3D")
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listzonesresponse.json"))
- .build());
-
- assertEquals(client.listZones(),
- ImmutableSet.of(
- Zone.builder()
- .id("1")
- .name("San Jose 1")
- .networkType(NetworkType.ADVANCED)
- .securityGroupsEnabled(false).build(),
- Zone.builder()
- .id("2")
- .name("Chicago")
- .networkType(NetworkType.ADVANCED)
- .securityGroupsEnabled(true).build()));
- }
-
- public void testListZonesWhenResponseIs404() {
- ZoneApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listZones&listAll=true&apiKey=identity&signature=8iHCtck0qfxFTqJ8reyAObRf31I%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listZones(), ImmutableSet.of());
- }
-
- @Override
- protected ZoneApi clientFrom(CloudStackContext context) {
- return context.getApi().getZoneApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiLiveTest.java
deleted file mode 100644
index ae1b480..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiLiveTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListZonesOptions;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code ZoneApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "ZoneApiLiveTest")
-public class ZoneApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public void testListZones() throws Exception {
- Set<Zone> response = client.getZoneApi().listZones();
- assert null != response;
- long zoneCount = response.size();
- assertTrue(zoneCount >= 0);
- for (Zone zone : response) {
- Zone newDetails = Iterables.getOnlyElement(client.getZoneApi().listZones(
- ListZonesOptions.Builder.id(zone.getId())));
- assertEquals(zone, newDetails);
- assertEquals(zone, client.getZoneApi().getZone(zone.getId()));
- assert zone.getId() != null : zone;
- assert zone.getName() != null : zone;
- assert zone.getNetworkType() != null && zone.getNetworkType() != NetworkType.UNRECOGNIZED : zone;
- switch (zone.getNetworkType()) {
- case ADVANCED:
- // TODO
- // assert zone.getVLAN() != null : zone;
- // assert zone.getDomain() == null : zone;
- // assert zone.getDomainId() == null : zone;
- // assert zone.getGuestCIDRAddress() != null : zone;
- break;
- case BASIC:
- assert zone.getVLAN() == null : zone;
- assert zone.getDNS().size() >= 0 : zone;
- assert zone.getInternalDNS().size() >= 0 : zone;
- assert zone.getDomain() == null : zone;
- assert zone.getDomainId() == null : zone;
- assert zone.getGuestCIDRAddress() == null : zone;
- break;
- }
-
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiTest.java
deleted file mode 100644
index bb5674f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ZoneApiTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListZonesOptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code ZoneApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "ZoneApiTest")
-public class ZoneApiTest extends BaseCloudStackApiTest<ZoneApi> {
- public void testListZones() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ZoneApi.class, "listZones", ListZonesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listZones&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- // now make sure request filters apply by replaying
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
- httpRequest = (GeneratedHttpRequest) Iterables.getOnlyElement(httpRequest.getFilters()).filter(httpRequest);
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listZones&listAll=true&apiKey=identity&signature=8iHCtck0qfxFTqJ8reyAObRf31I%3D HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListZonesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ZoneApi.class, "listZones", ListZonesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListZonesOptions.Builder.available(true).domainId("5")
- .id("6")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listZones&listAll=true&available=true&domainid=5&id=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetZone() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ZoneApi.class, "getZone", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(6));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listZones&listAll=true&id=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java
deleted file mode 100644
index 2af22ba..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.filters;
-
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.ContextBuilder;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.IntegrationTestClient;
-import org.jclouds.logging.config.NullLoggingModule;
-import org.jclouds.providers.AnonymousProviderMetadata;
-import org.jclouds.rest.internal.BaseRestApiTest.MockModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-/**
- * Tests behavior of {@code QuerySigner}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "QuerySignerTest")
-public class QuerySignerTest {
- public static final Injector INJECTOR = ContextBuilder
- .newBuilder(
- AnonymousProviderMetadata.forApiOnEndpoint(IntegrationTestClient.class,
- "http://localhost:8080/client/api"))
- .credentials("apiKey", "secretKey")
- .apiVersion("2.2")
- .modules(ImmutableList.<Module> of(new MockModule(), new NullLoggingModule())).buildInjector();
-
-
- @Test
- void testCreateStringToSign() {
- QuerySigner filter = INJECTOR.getInstance(QuerySigner.class);
-
- assertEquals(
- filter.createStringToSign(HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api?command=listZones").build()),
- "apikey=apikey&command=listzones");
- }
-
- @Test
- void testCreateStringToSignWithBrackets() {
- // This test asserts that key *names* are not URL-encoded - only values
- // should be encoded, according to "CloudStack API Developer’s Guide".
- QuerySigner filter = INJECTOR.getInstance(QuerySigner.class);
-
- assertEquals(
- filter.createStringToSign(HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api?command=deployVirtualMachine&iptonetworklist[0].ip=127.0.0.1&iptonetworklist[0].networkid=1").build()),
- "apikey=apikey&command=deployvirtualmachine&iptonetworklist[0].ip=127.0.0.1&iptonetworklist[0].networkid=1");
- }
-
- @Test
- void testFilter() {
- QuerySigner filter = INJECTOR.getInstance(QuerySigner.class);
-
- assertEquals(
- filter.filter(
- HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api?command=listZones").build())
- .getRequestLine(),
- "GET http://localhost:8080/client/api?command=listZones&apiKey=apiKey&signature=2UG8AcnMaozL3BINdjgkJ%2BRzjEY%3D HTTP/1.1");
- }
-
- @Test
- void testFilterTwice() {
- QuerySigner filter = INJECTOR.getInstance(QuerySigner.class);
- HttpRequest request = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api?command=listZones").build();
- for (int i = 0; i < 2; i++) {
- request = filter.filter(request);
- assertEquals(
- request.getRequestLine(),
- "GET http://localhost:8080/client/api?command=listZones&apiKey=apiKey&signature=2UG8AcnMaozL3BINdjgkJ%2BRzjEY%3D HTTP/1.1");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java
deleted file mode 100644
index 85c7c6c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.AsyncJobError;
-import org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode;
-import org.jclouds.cloudstack.features.AsyncJobApi;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-
-@Test(groups = "unit", testName = "BlockUntilJobCompletesAndReturnResultTest")
-public class BlockUntilJobCompletesAndReturnResultTest {
-
- public void testApply() {
- String id = "1";
- String jobId = "2";
-
- CloudStackApi client = createMock(CloudStackApi.class);
- Predicate<String> jobComplete = Predicates.alwaysTrue();
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- expect(client.getAsyncJobApi()).andReturn(jobClient).atLeastOnce();
- expect(jobClient.getAsyncJob(jobId)).andReturn(AsyncJob.builder().id(jobId).result("foo").build()).atLeastOnce();
-
- replay(client);
- replay(jobClient);
-
- assertEquals(
- new BlockUntilJobCompletesAndReturnResult(client, jobComplete).<String>apply(AsyncCreateResponse.builder().id(id).jobId(
- jobId).build()), "foo");
-
- verify(client);
- verify(jobClient);
-
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testJobDoesntCompleteThrowsIllegalStateException() {
- String id = "1";
- String jobId = "2";
-
- CloudStackApi client = createMock(CloudStackApi.class);
- // the alwaysfalse predicate should blow up with IllegalStateException
- Predicate<String> jobComplete = Predicates.alwaysFalse();
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- expect(client.getAsyncJobApi()).andReturn(jobClient).atLeastOnce();
- expect(jobClient.getAsyncJob(jobId)).andReturn(AsyncJob.builder().id(jobId).result("foo").build()).atLeastOnce();
-
- replay(client);
- replay(jobClient);
-
- assertEquals(
- new BlockUntilJobCompletesAndReturnResult(client, jobComplete).<String>apply(
- AsyncCreateResponse.builder().id(id).jobId(jobId).build()), "foo");
-
- verify(client);
- verify(jobClient);
-
- }
-
- @Test(expectedExceptions = UncheckedExecutionException.class)
- public void testJobWithErrorThrowsUncheckedExecutionException() {
- String id = "1";
- String jobId = "2";
-
- CloudStackApi client = createMock(CloudStackApi.class);
- Predicate<String> jobComplete = Predicates.alwaysTrue();
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- expect(client.getAsyncJobApi()).andReturn(jobClient).atLeastOnce();
- expect(jobClient.getAsyncJob(jobId)).andReturn(
- AsyncJob.builder().id(jobId)
- .error(AsyncJobError.builder().errorCode(ErrorCode.INTERNAL_ERROR).errorText("ERRROR").build())
- .result("foo").build())
- .atLeastOnce();
-
- replay(client);
- replay(jobClient);
-
- assertEquals(
- new BlockUntilJobCompletesAndReturnResult(client, jobComplete).<String>apply(
- AsyncCreateResponse.builder().id(id).jobId(jobId).build()), "foo");
-
- verify(client);
- verify(jobClient);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java
deleted file mode 100644
index 7d840dc..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeededTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.util.Predicates2.retry;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.testng.Assert.assertEquals;
-
-import java.net.UnknownHostException;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-import org.jclouds.cloudstack.features.AsyncJobApi;
-import org.jclouds.cloudstack.features.SecurityGroupApi;
-import org.jclouds.cloudstack.features.ZoneApi;
-import org.jclouds.cloudstack.predicates.JobComplete;
-import org.jclouds.cloudstack.suppliers.ZoneIdToZoneSupplier;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Provides;
-import com.google.inject.TypeLiteral;
-import com.google.inject.name.Names;
-
-@Test(groups = "unit", testName = "CreateSecurityGroupIfNeededTest")
-public class CreateSecurityGroupIfNeededTest {
-
- @Test
- public void testApply() throws UnknownHostException {
- final CloudStackApi client = createMock(CloudStackApi.class);
- SecurityGroupApi secClient = createMock(SecurityGroupApi.class);
- ZoneApi zoneClient = createMock(ZoneApi.class);
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- SecurityGroup group = createMock(SecurityGroup.class);
-
- Zone zone = createMock(Zone.class);
-
- expect(group.getIngressRules()).andReturn(ImmutableSet.<IngressRule> of());
- expect(group.getId()).andReturn("sec-1234").anyTimes();
- expect(zone.isSecurityGroupsEnabled()).andReturn(true);
-
- expect(client.getSecurityGroupApi()).andReturn(secClient)
- .anyTimes();
- expect(client.getZoneApi()).andReturn(zoneClient);
- expect(client.getAsyncJobApi()).andReturn(jobClient).anyTimes();
-
- expect(zoneClient.getZone("zone-abc1")).andReturn(zone);
- expect(secClient.createSecurityGroup("group-1")).andReturn(group);
- expect(secClient.authorizeIngressPortsToCIDRs("sec-1234",
- "TCP",
- 22,
- 22,
- ImmutableSet.of("0.0.0.0/0"))).andReturn("job-1234");
-
- replay(client, secClient, zoneClient, zone, group);
-
- ZoneSecurityGroupNamePortsCidrs input = ZoneSecurityGroupNamePortsCidrs.builder()
- .zone("zone-abc1")
- .name("group-1")
- .ports(ImmutableSet.of(22))
- .cidrs(ImmutableSet.<String> of()).build();
-
- CreateSecurityGroupIfNeeded parser = Guice.createInjector(new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<Supplier<String>>() {
- }).toInstance(Suppliers.ofInstance("1"));
- bind(CloudStackApi.class).toInstance(client);
- bind(new TypeLiteral<CacheLoader<String, Zone>>() {}).
- to(ZoneIdToZone.class);
- bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {}).
- to(ZoneIdToZoneSupplier.class);
- bind(String.class).annotatedWith(Names.named(PROPERTY_SESSION_INTERVAL)).toInstance("60");
- }
-
- @Provides
- @Singleton
- protected Predicate<String> jobComplete(JobComplete jobComplete) {
- return retry(jobComplete, 1200, 1, 5, SECONDS);
- }
-
- }).getInstance(CreateSecurityGroupIfNeeded.class);
-
- assertEquals(parser.apply(input), group);
-
- verify(client, secClient, zoneClient, zone, group);
- }
-
-
- @Test
- public void testApplyGroupAlreadyExists() throws UnknownHostException {
- final CloudStackApi client = createMock(CloudStackApi.class);
- SecurityGroupApi secClient = createMock(SecurityGroupApi.class);
- ZoneApi zoneClient = createMock(ZoneApi.class);
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- SecurityGroup group = createMock(SecurityGroup.class);
-
- Zone zone = createMock(Zone.class);
-
- expect(group.getId()).andReturn("sec-1234").anyTimes();
- expect(zone.isSecurityGroupsEnabled()).andReturn(true);
-
- expect(client.getSecurityGroupApi()).andReturn(secClient)
- .anyTimes();
- expect(client.getZoneApi()).andReturn(zoneClient);
- expect(client.getAsyncJobApi()).andReturn(jobClient).anyTimes();
-
- expect(zoneClient.getZone("zone-abc2")).andReturn(zone);
- expect(secClient.createSecurityGroup("group-1")).andThrow(new IllegalStateException());
- expect(secClient.getSecurityGroupByName("group-1")).andReturn(group);
-
- replay(client, secClient, zoneClient, zone, group);
-
- ZoneSecurityGroupNamePortsCidrs input = ZoneSecurityGroupNamePortsCidrs.builder()
- .zone("zone-abc2")
- .name("group-1")
- .ports(ImmutableSet.of(22))
- .cidrs(ImmutableSet.<String> of()).build();
-
- CreateSecurityGroupIfNeeded parser = Guice.createInjector(new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<Supplier<String>>() {
- }).toInstance(Suppliers.ofInstance("1"));
- bind(CloudStackApi.class).toInstance(client);
- bind(new TypeLiteral<CacheLoader<String, Zone>>() {}).
- to(ZoneIdToZone.class);
- bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {}).
- to(ZoneIdToZoneSupplier.class);
- bind(String.class).annotatedWith(Names.named(PROPERTY_SESSION_INTERVAL)).toInstance("60");
- }
-
- @Provides
- @Singleton
- protected Predicate<String> jobComplete(JobComplete jobComplete) {
- return retry(jobComplete, 1200, 1, 5, SECONDS);
- }
-
- }).getInstance(CreateSecurityGroupIfNeeded.class);
-
- assertEquals(parser.apply(input), group);
-
- verify(client, secClient, zoneClient, zone, group);
- }
-
- @Test(expectedExceptions = IllegalArgumentException.class)
- public void testApplyZoneNoSecurityGroups() throws UnknownHostException {
- final CloudStackApi client = createMock(CloudStackApi.class);
- SecurityGroupApi secClient = createMock(SecurityGroupApi.class);
- ZoneApi zoneClient = createMock(ZoneApi.class);
- AsyncJobApi jobClient = createMock(AsyncJobApi.class);
-
- SecurityGroup group = createMock(SecurityGroup.class);
-
- Zone zone = createMock(Zone.class);
-
- expect(zone.isSecurityGroupsEnabled()).andReturn(false);
-
- expect(client.getZoneApi()).andReturn(zoneClient);
-
- expect(zoneClient.getZone("zone-abc3")).andReturn(zone);
-
- replay(client, zoneClient, zone);
-
- ZoneSecurityGroupNamePortsCidrs input = ZoneSecurityGroupNamePortsCidrs.builder()
- .zone("zone-abc3")
- .name("group-1")
- .ports(ImmutableSet.of(22))
- .cidrs(ImmutableSet.<String> of()).build();
-
- CreateSecurityGroupIfNeeded parser = Guice.createInjector(new AbstractModule() {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<Supplier<String>>() {
- }).toInstance(Suppliers.ofInstance("1"));
- bind(CloudStackApi.class).toInstance(client);
- bind(new TypeLiteral<CacheLoader<String, Zone>>() {}).
- to(ZoneIdToZone.class);
- bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {}).
- to(ZoneIdToZoneSupplier.class);
- bind(String.class).annotatedWith(Names.named(PROPERTY_SESSION_INTERVAL)).toInstance("60");
- }
-
- @Provides
- @Singleton
- protected Predicate<String> jobComplete(JobComplete jobComplete) {
- return retry(jobComplete, 1200, 1, 5, SECONDS);
- }
-
- }).getInstance(CreateSecurityGroupIfNeeded.class);
-
- assertEquals(parser.apply(input), group);
-
- verify(client, zoneClient, zone);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java
deleted file mode 100644
index 04aeee3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.io.InputStream;
-
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.AsyncJob.ResultCode;
-import org.jclouds.cloudstack.domain.AsyncJob.Status;
-import org.jclouds.cloudstack.domain.AsyncJobError;
-import org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateExtraction;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.domain.JsonBall;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ParseAsyncJobFromHttpResponseTest {
-
- Injector i = Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
-
- public void testWithNoResult() {
- String input = "{ \"queryasyncjobresultresponse\" : {\"jobid\":860,\"jobstatus\":0,\"jobprocstatus\":0,\"jobresultcode\":0} }";
-
- AsyncJob<PublicIPAddress> expects = AsyncJob.<PublicIPAddress>builder()
- .id("860")
- .status(Status.IN_PROGRESS)
- .progress(0)
- .resultCode(ResultCode.SUCCESS).build();
-
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- @SuppressWarnings("unchecked")
- AsyncJob<PublicIPAddress> response = (AsyncJob<PublicIPAddress>) parser.apply(HttpResponse.builder()
- .statusCode(200).message("ok")
- .payload(input).build());
-
- assertEquals(response, expects);
- }
-
- public void testWithSuccessTrueResultSetsNullResult() {
- String input = "{ \"queryasyncjobresultresponse\" : {\"jobid\":1138,\"jobstatus\":1,\"jobprocstatus\":0,\"jobresultcode\":0,\"jobresulttype\":\"object\",\"jobresult\":{\"success\":true}} }";
-
- AsyncJob<PublicIPAddress> expects = AsyncJob.<PublicIPAddress>builder()
- .id("1138")
- .status(Status.SUCCEEDED)
- .progress(0)
- .resultType("object")
- .resultCode(ResultCode.SUCCESS).build();
-
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- @SuppressWarnings("unchecked")
- AsyncJob<PublicIPAddress> response = (AsyncJob<PublicIPAddress>) parser.apply(HttpResponse.builder()
- .statusCode(200).message("ok")
- .payload(input).build());
- assertEquals(response, expects);
- }
-
- public void testWithErrorSetsResultNullSoToAvoidClassCastExceptions() {
- String input = "{ \"queryasyncjobresultresponse\" : {\"jobid\":1103,\"jobstatus\":2,\"jobprocstatus\":0,\"jobresultcode\":530,\"jobresulttype\":\"object\",\"jobresult\":{\"errorcode\":530,\"errortext\":\"Internal error executing command, please contact your system administrator\"}} }";
-
- AsyncJob<PublicIPAddress> expects = AsyncJob
- .<PublicIPAddress>builder()
- .id("1103")
- .status(Status.FAILED)
- .progress(0)
- .resultType("object")
- .error(AsyncJobError.builder().errorCode(ErrorCode.INTERNAL_ERROR).errorText("Internal error executing " +
- "command, please contact your system administrator").build())
- .resultCode(ResultCode.FAIL).build();
-
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- @SuppressWarnings("unchecked")
- AsyncJob<PublicIPAddress> response = (AsyncJob<PublicIPAddress>) parser.apply(HttpResponse.builder()
- .statusCode(200).message("ok")
- .payload(input).build());
- assertEquals(response, expects);
- }
-
- public void testWithUnknownResultReturnsStringifiedJson() {
- String input = "{ \"queryasyncjobresultresponse\" : {\"jobid\":860,\"jobstatus\":0,\"jobprocstatus\":0,\"jobresultcode\":0,\"jobresult\":{\"foo\":{\"bar\":1}}}}";
-
- AsyncJob<?> expects = AsyncJob.builder()
- .id("860")
- .status(Status.IN_PROGRESS)
- .progress(0)
- .resultCode(ResultCode.SUCCESS)
- .result("{\"bar\":1}")
- .build();
-
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- @SuppressWarnings("unchecked")
- AsyncJob<PublicIPAddress> response = (AsyncJob<PublicIPAddress>) parser.apply(HttpResponse.builder()
- .statusCode(200).message("ok")
- .payload(input).build());
- assertEquals(response, expects);
- }
-
- public void testWithBadResultReturnsMap() {
- // Not the best result object, but this is an unexpected error case.
- // Cloud.com have verified
- // that this case will not happen. This code is only here to prevent
- // exceptions from being
- // thrown in case they change their minds.
- String input = "{ \"queryasyncjobresultresponse\" : {\"jobid\":860,\"jobstatus\":0,\"jobprocstatus\":0,\"jobresultcode\":0,\"jobresult\":{\"foo\":{\"bar\":1},\"foo2\":{\"bar2\":2}}}}";
-
- AsyncJob<?> expects = AsyncJob.builder()
- .id("860")
- .status(Status.IN_PROGRESS)
- .progress(0)
- .resultCode(ResultCode.SUCCESS)
- .result(ImmutableMap.of("foo", new JsonBall("{\"bar\":1}"), "foo2", new JsonBall("{\"bar2\":2}"))).build();
-
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- @SuppressWarnings("unchecked")
- AsyncJob<PublicIPAddress> response = (AsyncJob<PublicIPAddress>) parser.apply(HttpResponse.builder()
- .statusCode(200).message("ok")
- .payload(input).build());
- assertEquals(response, expects);
- }
-
- public void testPublicIPAddress() {
- InputStream is = getClass().getResourceAsStream("/queryasyncjobresultresponse-ipaddress.json");
- AsyncJob<PublicIPAddress> expects = AsyncJob
- .<PublicIPAddress>builder()
- .id("860")
- .status(Status.SUCCEEDED)
- .progress(0)
- .resultType("object")
- .resultCode(ResultCode.SUCCESS)
- .result(
- PublicIPAddress
- .builder()
- .id("6")
- .IPAddress("72.52.126.35")
- .allocated(
- new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-02-23T20:15:01-0800"))
- .zoneId("1").zoneName("San Jose 1").isSourceNAT(false).account("adrian").domainId("1")
- .domain("ROOT").usesVirtualNetwork(true).isStaticNAT(false).associatedNetworkId("204")
- .networkId("200").state(PublicIPAddress.State.ALLOCATING).build()
-
- ).build();
-
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- @SuppressWarnings("unchecked")
- AsyncJob<PublicIPAddress> response = (AsyncJob<PublicIPAddress>) parser.apply(HttpResponse.builder()
- .statusCode(200).message("ok")
- .payload(is).build());
- assertEquals(response, expects);
- }
-
- public void testIPForwardingRule() {
- InputStream is = getClass().getResourceAsStream("/queryasyncjobresultresponse-ipforwardingrule.json");
- AsyncJob<IPForwardingRule> expects = AsyncJob
- .<IPForwardingRule>builder()
- .id("1133")
- .status(Status.SUCCEEDED)
- .progress(0)
- .resultType("object")
- .resultCode(ResultCode.SUCCESS)
- .result(
- IPForwardingRule.builder().id("109").protocol("tcp").virtualMachineId("226")
- .virtualMachineName("i-3-226-VM").IPAddressId("36").IPAddress("72.52.126.65").startPort(22)
- .endPort(22).state("Active").build()).build();
-
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- @SuppressWarnings("unchecked")
- AsyncJob<IPForwardingRule> response = (AsyncJob<IPForwardingRule>) parser.apply(HttpResponse.builder()
- .statusCode(200).message("ok")
- .payload(is).build());
- assertEquals(response, expects);
- }
-
- public void testOverloadedKeyName() {
- InputStream is = getClass().getResourceAsStream("/queryasyncjobresultresponse-createtemplate.json");
- ParseAsyncJobFromHttpResponse parser = i.getInstance(ParseAsyncJobFromHttpResponse.class);
- AsyncJob<?> response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
- assertTrue(response.getResult() instanceof Template, "response expected to be Template, actually is " + response.getResult().getClass());
-
- is = getClass().getResourceAsStream("/queryasyncjobresultresponse-extracttemplate.json");
- response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
- assertTrue(response.getResult() instanceof TemplateExtraction, "response expected to be TemplateExtraction, actually is " + response.getResult().getClass());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java
deleted file mode 100644
index bb04433..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static org.testng.Assert.assertEquals;
-
-import java.io.InputStream;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.json.config.GsonModule;
-import org.testng.annotations.Test;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-@Test(groups = "unit")
-public class ParseAsyncJobsFromHttpResponseTest {
-
- Injector injector = Guice.createInjector(new GsonModule() {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(Iso8601DateAdapter.class);
- super.configure();
- }
-
- });
-
- public void testCanParse() {
- InputStream is = getClass().getResourceAsStream("/listasyncjobsresponse.json");
-
- ParseAsyncJobsFromHttpResponse parser = injector.getInstance(ParseAsyncJobsFromHttpResponse.class);
- Set<AsyncJob<?>> response = parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
-
- assertEquals(response.size(), 77);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java
deleted file mode 100644
index 327e1c1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jclouds.cloudstack.options.AssociateIPAddressOptions.Builder.networkId;
-import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.allocatedOnly;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.features.AddressApi;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-@Test(groups = "unit")
-public class ReuseOrAssociateNewPublicIPAddressTest {
- String networkId = "99l";
- String zoneId = "100l";
- // note that it is associated network, not networkId
- PublicIPAddress address = PublicIPAddress.builder().id("200").state(PublicIPAddress.State.ALLOCATED)
- .associatedNetworkId(networkId).zoneId(zoneId).build();
-
- public void testReuseWorks() throws SecurityException, NoSuchMethodException {
-
- // create mocks
- CloudStackApi client = createMock(CloudStackApi.class);
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult = createMock(BlockUntilJobCompletesAndReturnResult.class);
- AddressApi addressClient = createMock(AddressApi.class);
- expect(client.getAddressApi()).andReturn(addressClient).atLeastOnce();
-
- // an address is available
- expect(addressClient.listPublicIPAddresses(allocatedOnly(true).networkId(networkId))).andReturn(
- ImmutableSet.<PublicIPAddress> of(address));
-
- replay(client);
- replay(blockUntilJobCompletesAndReturnResult);
- replay(addressClient);
-
- assertEquals(
- new ReuseOrAssociateNewPublicIPAddress(client, blockUntilJobCompletesAndReturnResult).apply(Network
- .builder().id(networkId).zoneId(zoneId).build()), address);
-
- verify(client);
- verify(blockUntilJobCompletesAndReturnResult);
- verify(addressClient);
-
- }
-
- public void testAssociateWorks() throws SecurityException, NoSuchMethodException {
-
- // create mocks
- CloudStackApi client = createMock(CloudStackApi.class);
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult = createMock(BlockUntilJobCompletesAndReturnResult.class);
- AddressApi addressClient = createMock(AddressApi.class);
- expect(client.getAddressApi()).andReturn(addressClient).atLeastOnce();
-
- // no ip addresses available
- expect(addressClient.listPublicIPAddresses(allocatedOnly(true).networkId(networkId))).andReturn(
- ImmutableSet.<PublicIPAddress> of());
-
- AsyncCreateResponse job = AsyncCreateResponse.builder().id("1").jobId("2").build();
- // make sure we created the job relating to a new ip
- expect(addressClient.associateIPAddressInZone(zoneId, networkId(networkId))).andReturn(job);
-
- expect(blockUntilJobCompletesAndReturnResult.apply(job)).andReturn(address);
-
- replay(client);
- replay(addressClient);
- replay(blockUntilJobCompletesAndReturnResult);
-
- assertEquals(
- new ReuseOrAssociateNewPublicIPAddress(client, blockUntilJobCompletesAndReturnResult).apply(Network
- .builder().id(networkId).zoneId(zoneId).build()), address);
-
- verify(client);
- verify(addressClient);
- verify(blockUntilJobCompletesAndReturnResult);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java
deleted file mode 100644
index 75bfd18..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.find;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.testng.Assert.assertEquals;
-
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.features.NATApiLiveTest;
-import org.jclouds.cloudstack.features.VirtualMachineApiLiveTest;
-import org.jclouds.cloudstack.predicates.NetworkPredicates;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.net.HostAndPort;
-
-/**
- * Tests behavior of {@code StaticNATVirtualMachineInNetwork}
- */
-@Test(groups = "live", singleThreaded = true, testName = "StaticNATVirtualMachineInNetworkLiveTest")
-public class StaticNATVirtualMachineInNetworkLiveTest extends NATApiLiveTest {
- private PublicIPAddress ip = null;
- private VirtualMachine vm;
- private IPForwardingRule rule;
- private Network network;
- private boolean networksDisabled;
-
- @BeforeGroups(groups = "live")
- public void setupClient() {
- super.setupContext();
- prefix += "nat";
- try {
- network = find(client.getNetworkApi().listNetworks(), NetworkPredicates.supportsStaticNAT());
- String defaultTemplate = template != null ? template.getImageId() : null;
- vm = VirtualMachineApiLiveTest.createVirtualMachineInNetwork(network,
- defaultTemplateOrPreferredInZone(defaultTemplate, client, network.getZoneId()), client, jobComplete,
- virtualMachineRunning);
- if (vm.getPassword() != null && !loginCredentials.getOptionalPassword().isPresent())
- loginCredentials = loginCredentials.toBuilder().password(vm.getPassword()).build();
- } catch (NoSuchElementException e) {
- networksDisabled = true;
- }
- }
-
- public void testCreateIPForwardingRule() throws Exception {
- if (networksDisabled)
- return;
- BlockUntilJobCompletesAndReturnResult blocker = new BlockUntilJobCompletesAndReturnResult(client, jobComplete);
- StaticNATVirtualMachineInNetwork fn = new StaticNATVirtualMachineInNetwork(client, reuseOrAssociate, network);
- CreatePortForwardingRulesForIP createPortForwardingRulesForIP = new CreatePortForwardingRulesForIP(client,
- blocker, CacheBuilder.newBuilder().<String, Set<IPForwardingRule>> build(
- new GetIPForwardingRulesByVirtualMachine(client)));
-
- // logger
- injector.injectMembers(blocker);
- injector.injectMembers(fn);
- injector.injectMembers(createPortForwardingRulesForIP);
-
- ip = fn.apply(vm);
-
- createPortForwardingRulesForIP.apply(ip, ImmutableSet.of(22));
-
- rule = getOnlyElement(filter(client.getNATApi().getIPForwardingRulesForIPAddress(ip.getId()),
- new Predicate<IPForwardingRule>() {
- @Override
- public boolean apply(IPForwardingRule rule) {
- return rule != null && rule.getStartPort() == 22;
- }
- }));
- assertEquals(rule.getIPAddressId(), ip.getId());
- assertEquals(rule.getVirtualMachineId(), vm.getId());
- assertEquals(rule.getStartPort(), 22);
- assertEquals(rule.getProtocol(), "tcp");
- checkRule(rule);
- HostAndPort socket = HostAndPort.fromParts(ip.getIPAddress(), 22);
- checkSSH(socket);
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (rule != null) {
- client.getNATApi().deleteIPForwardingRule(rule.getId());
- }
- if (vm != null) {
- jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vm.getId()));
- }
- if (ip != null) {
- client.getAddressApi().disassociateIPAddress(ip.getId());
- }
- super.tearDownContext();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedDataTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedDataTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedDataTest.java
deleted file mode 100644
index a59ecad..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedDataTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.functions;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-
-import org.jclouds.cloudstack.domain.EncryptedPasswordAndPrivateKey;
-import org.jclouds.date.DateService;
-import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.encryption.internal.JCECrypto;
-import org.testng.annotations.Test;
-
-public class WindowsLoginCredentialsFromEncryptedDataTest {
-
- private static final String PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\n" +
- "MIIEowIBAAKCAQEAmN6GOSMnyGNWN19ETBh11tJB5OGs3Dps8kPWqAhF9RyL/mKwkW26vH+h/5Z5\n" +
- "cA5T80pK72kNnXObFaMHNoX3lavrc6yXF+8F3f1tlFX2Z+iB1pYXz1oBPqT6oOmc2XzcsJuJRakd\n" +
- "zwRwHDaqljpaW7+TZlxhMa1DmUkD/HHMxDCK8jbUIZDc6BZSrnj2uPwHwW737NRE4aC3fcu4LMwf\n" +
- "b2VotbNGNiAnNmrb/vtIIGkFE8NYEMpiz0WYTWX4eVKpJImv1PR6G1fMLSvudJs0ARObuLDvuonn\n" +
- "SCFFdkibrwMKYbHVGGh6FoY1Vy0sqI55dgQU1kSNouiDgOGxgx+TIwIDAQABAoIBAHCS/nk5QGS7\n" +
- "cpRYXa1EHhNSxx/MaUXM6MoH1x3q6cm1egqdlrWh/vAtdZkIsOkqQ/xX65Me493dcomegwNN6KOZ\n" +
- "9Uw7/xCq/sEZjga8vzaJ7IOgCGy0NVJyn/a70rv+zW5pO8/G2KLI+95rC3iSBFSoYd3xjcnNdIh/\n" +
- "UqYnD8oxYpKmf7418pMPsBrkglkFlbVBPiDXdpoSziqSN6uWQG4Yh0WR87aElhM9JJW50Hh6h7g5\n" +
- "OvgCBzS8G+KXCjqimk108+/ed5Nl6VhPAf79yCVZUueKBhaf2r0Kkyxg7M/Y+LJwcoUusIP7Cv7G\n" +
- "xyzG2vi21prWRCm2sVCUDyQy5qECgYEA92jGVAaB3OGEUIXn7eVE3U3FQH37XcJMGsHqBIzDG13p\n" +
- "C97HdN21rwRkz+G2eAsIxA+p9BsO7dSmtKC60kl6iMRgltS3W7xoC37N9BtjhpciHcLg8c70oyDx\n" +
- "qHiLKuDi90mZ1FPmWupO4FJnGEB3evHUKZSpTrVVMzt+tyEn/psCgYEAni1hrYoMkQgN3sEC3CKB\n" +
- "0jQkrOMvY219B8Tdf9LXSuP6z9POagDBDhkeT3xn8rAOmOfVGHYdO0CvPqmAkmXhf+g+OREdecQa\n" +
- "uY0FmvcTt+Dx0c6pRZmm5AhvUVXFXqONsSg79iviXbUy5Hik0k5HTs5E6B4obrh5W+xfMTUXghkC\n" +
- "gYBn92uAW8uumkYT4HF6EuJBbTD6zPYYjFGW3O4OQ2ip02jfSBrhDVoP1fTXNq6K+3gPi9WLcuNv\n" +
- "JfF37iMTwzTuzDcaqwDyV9YRHpRFhEzqfhAkGYSVmLZM5scmWKGCv0YhTJiMFUWz5sqGkZopIs4S\n" +
- "qBTT9FjBbooDIXk6U4CPCQKBgFdVBxEhnz6UC9RpDIMuKi88yuMJrChhUx7u+ryQVH3s0ZXdg6HT\n" +
- "OMPn6mxIa7v6qJSTq3wN+qW0WQ1n2Kz7wz0zpOctI/EO7RJ1YhrlP+XONLV6PMtIwnQ0lAF8MbTG\n" +
- "6HxfknugTyMd4DN0yMu0nHpOOI1P2VMIVzkBkK1CevBBAoGBALROGR7a+eijHdp0/A0chfUoBmud\n" +
- "/TsUt+0g/vf1p69rMt6DqEGMgMtp2jIRnwvLElS7gVqnCTEclxNU/0rCXR+V7ImJm8J4f0ff8m0Y\n" +
- "Fir9nfCYStszo25NvLFfynS9d/aoBuvqGJaiQyNXiyBJ4MaxxFYagzAWTnDX+kzTlkZ2\n" +
- "-----END RSA PRIVATE KEY-----";
- private static final String ENCRYPTED_PASSWORD = "gO1oMoIjjIifv2iqcfIKiQD7ziOTVXsuaBJFEQrZdb8uJH/LsAiJXZeGKEeXlHl/oMoR3HEIoYuHxl+p5iHdrpP889RmxWBDGOWC5iTUzK6CRa5mFmF1I5Lpt7v2YeVoQWihSM8B19BEdBdY1svQp9nyhPB4AqLDrY28x/OrmRh/qYq953i6Y4Z8c76OHqqGcUYM4ePysRlcizSgQjdkEDmKC10Ak3OFRRx3/LqYsFIMiOHeg47APg+UANNTyRiTIia5FDhSeHJzaeYCBRQ7UYH0z2rg4cX3YjOz/MoznjHiaaN4MO+5N3v84VawnqwKOvlwPyI2bmz0+9Tr6DKzqA==";
-
- protected final DateService dateService = new SimpleDateFormatDateService();
-
- @Test
- public void testApply() throws Exception {
- WindowsLoginCredentialsFromEncryptedData f = new WindowsLoginCredentialsFromEncryptedData(new JCECrypto());
-
- LoginCredentials credentials = f.apply(new EncryptedPasswordAndPrivateKey(ENCRYPTED_PASSWORD, PRIVATE_KEY));
-
- assertEquals(credentials.getUser(), "Administrator");
- assertEquals(credentials.getOptionalPassword().get(), "u4.y9mb;nR.");
- assertFalse(credentials.getOptionalPrivateKey().isPresent());
- }
-}
[11/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json
deleted file mode 100644
index 4530108..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/revokesecuritygroupingressresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
- { "revokesecuritygroupingressresponse" :
- {"jobid":"13330fc9-8b3e-4582-aa3e-90883c041010"} }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json
deleted file mode 100644
index b526cd1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/stopvirtualmachineresponse-imageextension.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "stopvirtualmachineresponse" : {"jobid":"a7d5127b-24a2-4a44-a4a7-25a6d057b453"} }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json
deleted file mode 100644
index 4a03ca3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateclusterresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "updateclusterresponse" : { "cluster" : {"warning":"this test data is fabricated","id":1,"name":"Xen Clust 1","podid":1,"podname":"Dev Pod 1","zoneid":1,"zonename":"Dev Zone 1","hypervisortype":"XenServer","clustertype":"CloudManaged","allocationstate":"Enabled","managedstate":"Managed"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json
deleted file mode 100644
index 6013bd5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updateconfigurationsresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "updateconfigurationresponse" : { "configuration" :
- {"category":"Advanced","name":"expunge.delay","value":"11","description":"Determines how long (in seconds) to wait before actually expunging destroyed vm. The default value = the default value of expunge.interval"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json
deleted file mode 100644
index 1745eac..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatedomainresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "updatedomainresponse" : { "domain" :
- {"id":10,"name":"test-2","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json
deleted file mode 100644
index cb70ddd..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatehostresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "updatehostresponse" : { "host" :
- {"warning":"This test data is fabricated","id":1,"name":"cs2-xevsrv.alucloud.local","state":"Up","type":"Routing","ipaddress":"10.26.26.107","zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","version":"2.2.12.20110928142833","hypervisor":"XenServer","cpunumber":24,"cpuspeed":2266,"cpuallocated":"2.76%","cpuused":"0.1%","cpuwithoverprovisioning":"54384.0","networkkbsread":4443,"networkkbswrite":15048,"memorytotal":100549733760,"memoryallocated":3623878656,"memoryused":3623878656,"capabilities":"xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"clusterid":1,"clustername":"Xen Clust 1","clustertype":"CloudManaged","islocalstorageactive":false,"created":"2011-11-26T23:28:36+0200","events":"PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance;
ShutdownRequested; Ping","hosttags":"","hasEnoughCapacity":false,"allocationstate":"Enabled"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json
deleted file mode 100644
index b9479a7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatepodresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "updatepodresponse" : { "pod" : {"id":7,"name":"richard-updatedpod","zoneid":11,"zonename":"richard-zone","gateway":"172.21.0.254","netmask":"255.255.255.128","startip":"172.21.0.129","endip":"172.21.0.250","allocationstate":"Disabled"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json
deleted file mode 100644
index 240c49d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/updatezoneresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "updatezoneresponse" : { "zone" :
- {"id":6,"name":"test-zone","dns1":"8.8.8.8","internaldns1":"10.10.10.10","networktype":"Basic",
- "securitygroupsenabled":true,"allocationstate":"Enabled","zonetoken":"7b6e27df-30a6-3024-9d8b-7971a3127f64",
- "dhcpprovider":"DhcpServer"} } }
\ No newline at end of file
[23/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java
deleted file mode 100644
index ea432f0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LimitApiTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListResourceLimitsOptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-
-/**
- * Tests behavior of {@code LimitApi}
- */
-@Test(groups = "unit", testName = "LimitApiTest")
-public class LimitApiTest extends BaseCloudStackApiTest<LimitApi> {
-
- public void testListResourceLimits() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(LimitApi.class, "listResourceLimits", ListResourceLimitsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listResourceLimits&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListResourceLimitsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(LimitApi.class, "listResourceLimits", ListResourceLimitsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListResourceLimitsOptions.Builder.account("jclouds" , "23")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listResourceLimits&listAll=true&account=jclouds&domainid=23 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiLiveTest.java
deleted file mode 100644
index 82d3a62..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiLiveTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.find;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.hasLoadBalancerService;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.isVirtualNetwork;
-import static org.jclouds.util.Predicates2.retry;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.JobResult;
-import org.jclouds.cloudstack.domain.LoadBalancerRule;
-import org.jclouds.cloudstack.domain.LoadBalancerRule.Algorithm;
-import org.jclouds.cloudstack.domain.LoadBalancerRule.State;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.predicates.LoadBalancerRuleActive;
-import org.jclouds.ssh.SshException;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.net.HostAndPort;
-
-/**
- * Tests behavior of {@code LoadBalancerApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "LoadBalancerApiLiveTest")
-public class LoadBalancerApiLiveTest extends BaseCloudStackApiLiveTest {
- private PublicIPAddress ip = null;
- private VirtualMachine vm;
- private LoadBalancerRule rule;
- private Predicate<LoadBalancerRule> loadBalancerRuleActive;
- private Network network;
- private boolean networksDisabled;
-
- @BeforeGroups(groups = "live")
- public void setupContext() {
- super.setupContext();
- loadBalancerRuleActive = retry(new LoadBalancerRuleActive(client), 60, 1, 1, SECONDS);
- prefix += "rule";
- try {
- network = find(client.getNetworkApi().listNetworks(),
- Predicates.and(hasLoadBalancerService(), isVirtualNetwork(),
- new Predicate<Network>() {
- @Override
- public boolean apply(Network network) {
- return network.isDefault()
- && !network.isSecurityGroupEnabled()
- && !network.isSystem()
- && network.getAccount().equals(user.getName());
- }
- }));
- } catch (NoSuchElementException e) {
- networksDisabled = true;
- }
- }
-
- public void testCreateVm() {
- if (networksDisabled)
- return;
- String defaultTemplate = template != null ? template.getImageId() : null;
- vm = VirtualMachineApiLiveTest.createVirtualMachineInNetwork(network,
- defaultTemplateOrPreferredInZone(defaultTemplate, client, network.getZoneId()),
- client, jobComplete, virtualMachineRunning);
- if (vm.getPassword() != null && !loginCredentials.getOptionalPassword().isPresent())
- loginCredentials = loginCredentials.toBuilder().password(vm.getPassword()).build();
- }
-
- @Test(dependsOnMethods = "testCreateVm")
- public void testCreateLoadBalancerRule() throws Exception {
- if (networksDisabled)
- return;
- int attempts = 0;
- while (rule == null && attempts < 10) {
- ip = reuseOrAssociate.apply(network);
- try {
- String jobId = client.getLoadBalancerApi().createLoadBalancerRuleForPublicIP(ip.getId(),
- Algorithm.LEASTCONN, prefix, 22, 22);
- assertTrue(jobComplete.apply(jobId));
- AsyncJob<LoadBalancerRule> asyncJob = client.getAsyncJobApi().getAsyncJob(jobId);
- LoadBalancerRule result = asyncJob.getResult();
- rule = result;
- } catch (IllegalStateException e) {
- // very likely an ip conflict, so retry;
- attempts++;
- }
- }
- assertNotNull(rule, "Failed to get a load balancer rule after " + attempts + " attempts");
- assert rule.getPublicIPId() == ip.getId() : rule;
- assertEquals(rule.getPublicPort(), 22);
- assertEquals(rule.getPrivatePort(), 22);
- assertEquals(rule.getAlgorithm(), Algorithm.LEASTCONN);
- assertEquals(rule.getName(), prefix);
- assertEquals(rule.getState(), State.ADD);
- assertEquals(client.getLoadBalancerApi().listVirtualMachinesAssignedToLoadBalancerRule(rule.getId()).size(), 0);
- checkRule(rule);
-
- }
-
- @Test(dependsOnMethods = "testCreateLoadBalancerRule")
- public void testAssignToLoadBalancerRule() throws Exception {
- if (networksDisabled)
- return;
- String jobId = client.getLoadBalancerApi().assignVirtualMachinesToLoadBalancerRule(rule.getId(), vm.getId());
- assertTrue(jobComplete.apply(jobId));
- AsyncJob<JobResult> result = client.getAsyncJobApi().getAsyncJob(jobId);
- assertTrue(result.hasSucceed());
- Set<VirtualMachine> machines = client.getLoadBalancerApi().listVirtualMachinesAssignedToLoadBalancerRule(
- rule.getId());
- assertEquals(machines.size(), 1);
- assertTrue(loadBalancerRuleActive.apply(rule), rule.toString());
- }
-
- @Test(dependsOnMethods = "testAssignToLoadBalancerRule")
- public void testCanSshInThroughNewLoadBalancerRule() throws Exception {
- loopAndCheckSSH();
- }
-
- // note that when in LB mode, there's a chance you'll have a connection
- // failure
- private void loopAndCheckSSH() throws IOException {
- for (int i = 0; i < 5; i++) {// retry loop TODO replace with predicate.
- try {
- checkSSH(HostAndPort.fromParts(ip.getIPAddress(), 22));
- return;
- } catch (SshException e) {
- e.printStackTrace();
- try {
- Thread.sleep(10 * 1000);
- } catch (InterruptedException e1) {
- }
- continue;
- }
- }
- }
-
- @Test(dependsOnMethods = "testAssignToLoadBalancerRule", expectedExceptions = SshException.class)
- public void testRemoveFromLoadBalancerRule() throws Exception {
- if (networksDisabled)
- throw new SshException();
- assertTrue(jobComplete.apply(client.getLoadBalancerApi().removeVirtualMachinesFromLoadBalancerRule(
- rule.getId(), vm.getId())));
- assertEquals(client.getLoadBalancerApi().listVirtualMachinesAssignedToLoadBalancerRule(rule.getId()).size(), 0);
- assertEquals(rule.getState(), State.ADD);
- checkSSH(HostAndPort.fromParts(ip.getIPAddress(), 22));
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (rule != null) {
- assertTrue(jobComplete.apply(client.getLoadBalancerApi().deleteLoadBalancerRule(rule.getId())));
- }
- if (vm != null) {
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vm.getId())));
- }
- if (ip != null) {
- client.getAddressApi().disassociateIPAddress(ip.getId());
- }
- super.tearDownContext();
- }
-
- public void testListLoadBalancerRules() throws Exception {
- Set<LoadBalancerRule> response = client.getLoadBalancerApi().listLoadBalancerRules();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (LoadBalancerRule rule : response) {
- LoadBalancerRule newDetails = findRuleWithId(rule.getId());
- assertEquals(rule.getId(), newDetails.getId());
- checkRule(rule);
- }
- }
-
- private LoadBalancerRule findRuleWithId(final String id) {
- return find(client.getLoadBalancerApi().listLoadBalancerRules(), new Predicate<LoadBalancerRule>() {
-
- @Override
- public boolean apply(LoadBalancerRule arg0) {
- return arg0.getId() == id;
- }
-
- });
- }
-
- protected void checkRule(LoadBalancerRule rule) {
- assertEquals(rule.getId(), findRuleWithId(rule.getId()).getId());
- assert rule.getId() != null : rule;
- assert rule.getAccount() != null : rule;
- assert rule.getAlgorithm() != null : rule;
- assert rule.getPrivatePort() > 0 : rule;
- assert rule.getPublicPort() > 0 : rule;
- assert rule.getDomain() != null : rule;
- assert rule.getDomainId() != null : rule;
- assert rule.getState() != null : rule;
- assert rule.getName() != null : rule;
- assert rule.getPublicIP() != null : rule;
- assert rule.getPublicIPId() != null : rule;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiTest.java
deleted file mode 100644
index 5656072..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/LoadBalancerApiTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.LoadBalancerRule.Algorithm;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateLoadBalancerRuleOptions;
-import org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions;
-import org.jclouds.cloudstack.options.UpdateLoadBalancerRuleOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code LoadBalancerApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "LoadBalancerApiTest")
-public class LoadBalancerApiTest extends BaseCloudStackApiTest<LoadBalancerApi> {
- public void testListLoadBalancerRules() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(LoadBalancerApi.class, "listLoadBalancerRules",
- ListLoadBalancerRulesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listLoadBalancerRules&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListLoadBalancerRulesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(LoadBalancerApi.class, "listLoadBalancerRules",
- ListLoadBalancerRulesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListLoadBalancerRulesOptions.Builder.publicIPId("3")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listLoadBalancerRules&listAll=true&publicipid=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest createLoadBalancerRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createLoadBalancerRule")
- .addQueryParam("publicipid", "6")
- .addQueryParam("algorithm", "leastconn")
- .addQueryParam("name", "tcp")
- .addQueryParam("privateport", "22")
- .addQueryParam("publicport", "22").build();
-
- public void testCreateLoadBalancerRuleForPublicIP() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(LoadBalancerApi.class, "createLoadBalancerRuleForPublicIP", String.class,
- Algorithm.class, String.class, int.class, int.class, CreateLoadBalancerRuleOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(6, Algorithm.LEASTCONN, "tcp", 22, 22));
-
- assertRequestLineEquals(httpRequest, createLoadBalancerRule.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testUpdateLoadBalancerRule() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(LoadBalancerApi.class, "updateLoadBalancerRule", String.class, UpdateLoadBalancerRuleOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateLoadBalancerRule&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDeleteLoadBalancerRule() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(LoadBalancerApi.class, "deleteLoadBalancerRule", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteLoadBalancerRule&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListVirtualMachinesAssignedToLoadBalancerRule() throws SecurityException, NoSuchMethodException,
- IOException {
- Invokable<?, ?> method = method(LoadBalancerApi.class, "listVirtualMachinesAssignedToLoadBalancerRule",
- String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listLoadBalancerRuleInstances&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiLiveTest.java
deleted file mode 100644
index 2ecd4b6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiLiveTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code NATApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "NATApiLiveTest")
-public class NATApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(enabled = false)
- // takes too long
- public void testListIPForwardingRules() throws Exception {
- Set<IPForwardingRule> response = client.getNATApi().listIPForwardingRules();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (IPForwardingRule rule : response) {
- IPForwardingRule newDetails = getOnlyElement(client.getNATApi().listIPForwardingRules(
- ListIPForwardingRulesOptions.Builder.id(rule.getId())));
- assertEquals(rule.getId(), newDetails.getId());
- checkRule(rule);
- }
- }
-
- protected void checkRule(IPForwardingRule rule) {
- assertEquals(rule.getId(), client.getNATApi().getIPForwardingRule(rule.getId()).getId());
- assert rule.getId() != null : rule;
- assert rule.getIPAddress() != null : rule;
- assert rule.getIPAddressId() != null : rule;
- assert rule.getStartPort() > 0 : rule;
- assert rule.getProtocol() != null : rule;
- assert rule.getEndPort() > 0 : rule;
- assert rule.getState() != null : rule;
- assert rule.getVirtualMachineId() != null : rule;
- assert rule.getVirtualMachineName() != null : rule;
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiTest.java
deleted file mode 100644
index 2308e01..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NATApiTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateIPForwardingRuleOptions;
-import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code NATApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "NATApiTest")
-public class NATApiTest extends BaseCloudStackApiTest<NATApi> {
- public void testListIPForwardingRules() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NATApi.class, "listIPForwardingRules", ListIPForwardingRulesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listIpForwardingRules&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListIPForwardingRulesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NATApi.class, "listIPForwardingRules", ListIPForwardingRulesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ListIPForwardingRulesOptions.Builder.virtualMachineId("3")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listIpForwardingRules&listAll=true&virtualmachineid=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetIPForwardingRule() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NATApi.class, "getIPForwardingRule", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listIpForwardingRules&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest createIpForwardingRule = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createIpForwardingRule")
- .addQueryParam("ipaddressid", "7")
- .addQueryParam("protocol", "tcp")
- .addQueryParam("startport", "22").build();
-
- public void testCreateIPForwardingRuleForVirtualMachine() throws SecurityException, NoSuchMethodException,
- IOException {
- Invokable<?, ?> method = method(NATApi.class, "createIPForwardingRule", String.class, String.class, int.class,
- CreateIPForwardingRuleOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(7, "tcp", 22));
-
- assertRequestLineEquals(httpRequest, createIpForwardingRule.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest createIpForwardingRuleOptions = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createIpForwardingRule")
- .addQueryParam("ipaddressid", "7")
- .addQueryParam("protocol", "tcp")
- .addQueryParam("startport", "22")
- .addQueryParam("endport", "22").build();
-
- public void testCreateIPForwardingRuleForVirtualMachineOptions() throws SecurityException, NoSuchMethodException,
- IOException {
- Invokable<?, ?> method = method(NATApi.class, "createIPForwardingRule", String.class, String.class, int.class,
- CreateIPForwardingRuleOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(7, "tcp", 22,
- CreateIPForwardingRuleOptions.Builder.endPort(22)));
-
- assertRequestLineEquals(httpRequest, createIpForwardingRuleOptions.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testEnableStaticNATForVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NATApi.class, "enableStaticNATForVirtualMachine", String.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5, 6));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=enableStaticNat&virtualmachineid=5&ipaddressid=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDisableStaticNATOnPublicIP() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NATApi.class, "disableStaticNATOnPublicIP", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=disableStaticNat&ipaddressid=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDeleteIPForwardingRule() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NATApi.class, "deleteIPForwardingRule", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteIpForwardingRule&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiLiveTest.java
deleted file mode 100644
index 23978c9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiLiveTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.find;
-import static com.google.common.collect.Iterables.get;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.specifyVLAN;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.id;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.predicates.NetworkOfferingPredicates;
-import org.jclouds.cloudstack.predicates.ZonePredicates;
-import org.testng.annotations.BeforeGroups;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code NetworkApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "NetworkApiLiveTest")
-public class NetworkApiLiveTest extends BaseCloudStackApiLiveTest {
-
- private boolean networksSupported;
- private Zone zone;
-
- @BeforeGroups(groups = "live")
- public void setupContext() {
- super.setupContext();
-
- try {
- zone = find(client.getZoneApi().listZones(), ZonePredicates.supportsAdvancedNetworks());
- networksSupported = true;
- } catch (NoSuchElementException e) {
- }
- }
-
- @Test
- public void testCreateGuestVirtualNetwork() {
- if (!networksSupported)
- return;
- final NetworkOffering offering;
- try {
- offering = find(client.getOfferingApi().listNetworkOfferings(),
- NetworkOfferingPredicates.supportsGuestVirtualNetworks());
-
- } catch (NoSuchElementException e) {
- Logger.getAnonymousLogger().log(Level.SEVERE, "guest networks not supported, skipping test");
- return;
- }
- String name = prefix + "-virtual";
-
- Network network = null;
- try {
- network = client.getNetworkApi().createNetworkInZone(zone.getId(), offering.getId(), name, name);
- checkNetwork(network);
- } catch (IllegalStateException e) {
- Logger.getAnonymousLogger().log(Level.SEVERE, "couldn't create a network, skipping test", e);
- } finally {
- if (network != null) {
- String jobId = client.getNetworkApi().deleteNetwork(network.getId());
- if (jobId != null)
- jobComplete.apply(jobId);
- }
- }
- }
-
- @Test
- public void testCreateVLANNetwork() {
- skipIfNotDomainAdmin();
- if (!networksSupported)
- return;
-
- final NetworkOffering offering;
- try {
- offering = get(
- cloudStackContext.getApi().getOfferingApi().listNetworkOfferings(specifyVLAN(true).zoneId(zone.getId())), 0);
- } catch (NoSuchElementException e) {
- Logger.getAnonymousLogger().log(Level.SEVERE, "VLAN networks not supported, skipping test");
- return;
- }
- String name = prefix + "-vlan";
-
- Network network = null;
- try {
- network = domainAdminClient
- .getNetworkApi()
- // startIP/endIP/netmask/gateway must be specified together
- .createNetworkInZone(zone.getId(), offering.getId(), name, name,
- vlan("65").startIP("192.168.1.2").netmask("255.255.255.0").gateway("192.168.1.1"));
- checkNetwork(network);
- } catch (IllegalStateException e) {
- Logger.getAnonymousLogger().log(Level.SEVERE, "couldn't create a network, skipping test", e);
- } finally {
- if (network != null) {
- String jobId = adminClient.getNetworkApi().deleteNetwork(network.getId());
- if (jobId != null)
- adminJobComplete.apply(jobId);
- }
- }
- }
-
- @Test
- public void testListNetworks() throws Exception {
- if (!networksSupported)
- return;
- Set<Network> response = client.getNetworkApi().listNetworks(
- accountInDomain(user.getAccount(), user.getDomainId()));
- assert null != response;
- long networkCount = response.size();
- assertTrue(networkCount >= 0);
- for (Network network : response) {
- Network newDetails = getOnlyElement(client.getNetworkApi().listNetworks(id(network.getId())));
- assertEquals(network, newDetails);
- assertEquals(network, client.getNetworkApi().getNetwork(network.getId()));
- checkNetwork(network);
- }
- }
-
- private void checkNetwork(Network network) {
- assert network.getId() != null : network;
- assert network.getName() != null : network;
- assert network.getDNS().size() != 0 : network;
- assert network.getGuestIPType() != null && network.getGuestIPType() != GuestIPType.UNRECOGNIZED : network;
- assert network.getBroadcastDomainType() != null : network;
- assert network.getDisplayText() != null : network;
- // Network domain can be null sometimes
- // assert network.getNetworkDomain() != null : network;
- assert network.getNetworkOfferingAvailability() != null : network;
- assert network.getNetworkOfferingDisplayText() != null : network;
- assert network.getNetworkOfferingId() != null : network;
- assert network.getNetworkOfferingName() != null : network;
- assert network.getRelated() != null : network;
- assert network.getServices().size() != 0 : network;
- assert network.getState() != null : network;
- assert network.getTrafficType() != null : network;
- assert network.getZoneId() != null : network;
- assert network.getDomain() != null : network;
- switch (network.getGuestIPType()) {
- case VIRTUAL:
- assert network.getNetmask() == null : network;
- assert network.getGateway() == null : network;
- assert network.getVLAN() == null : network;
- assert network.getStartIP() == null : network;
- assert network.getEndIP() == null : network;
- break;
- case DIRECT:
- // TODO: I've found a network that doesn't have a netmask associated
- assert network.getNetmask() != null : network;
- assert network.getGateway() != null : network;
- assert network.getVLAN() != null : network;
- assertEquals(network.getBroadcastURI(), URI.create("vlan://" + network.getVLAN()));
- assert network.getStartIP() != null : network;
- assert network.getEndIP() != null : network;
- break;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiTest.java
deleted file mode 100644
index b53fc5f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/NetworkApiTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateNetworkOptions;
-import org.jclouds.cloudstack.options.ListNetworksOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code NetworkApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "NetworkApiTest")
-public class NetworkApiTest extends BaseCloudStackApiTest<NetworkApi> {
- public void testListNetworks() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NetworkApi.class, "listNetworks", ListNetworksOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listNetworks&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListNetworksOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NetworkApi.class, "listNetworks", ListNetworksOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListNetworksOptions.Builder.type(NetworkType.ADVANCED)
- .domainId("6").id("5")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listNetworks&listAll=true&type=Advanced&domainid=6&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetNetwork() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NetworkApi.class, "getNetwork", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("id"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listNetworks&listAll=true&id=id HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest createNetwork = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createNetwork")
- .addQueryParam("zoneid", "1")
- .addQueryParam("networkofferingid", "2")
- .addQueryParam("name", "named")
- .addQueryParam("displaytext", "lovely").build();
-
- public void testCreateNetworkInZone() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NetworkApi.class, "createNetworkInZone", String.class, String.class, String.class,
- String.class, CreateNetworkOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1, 2, "named", "lovely"));
-
- assertRequestLineEquals(httpRequest, createNetwork.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest createNetworkOptions = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createNetwork")
- .addQueryParam("zoneid", "1")
- .addQueryParam("networkofferingid", "2")
- .addQueryParam("name", "named")
- .addQueryParam("displaytext", "lovely")
- .addQueryParam("netmask", "255.255.255.0")
- .addQueryParam("domainid", "6").build();
-
- public void testCreateNetworkInZoneOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NetworkApi.class, "createNetworkInZone", String.class, String.class, String.class,
- String.class, CreateNetworkOptions[].class);
-
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1, 2, "named", "lovely", CreateNetworkOptions.Builder
- .netmask("255.255.255.0").domainId("6")));
-
- assertRequestLineEquals(httpRequest, createNetworkOptions.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDeleteNetwork() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(NetworkApi.class, "deleteNetwork", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteNetwork&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiLiveTest.java
deleted file mode 100644
index 2bbdf20..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiLiveTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.DiskOffering;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.StorageType;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListDiskOfferingsOptions;
-import org.jclouds.cloudstack.options.ListNetworkOfferingsOptions;
-import org.jclouds.cloudstack.options.ListServiceOfferingsOptions;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code OfferingApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "OfferingApiLiveTest")
-public class OfferingApiLiveTest extends BaseCloudStackApiLiveTest {
-
- public void testListDiskOfferings() throws Exception {
- Set<DiskOffering> response = client.getOfferingApi().listDiskOfferings();
- assert null != response;
- long offeringCount = response.size();
- assertTrue(offeringCount >= 0);
- for (DiskOffering offering : response) {
- try {
- DiskOffering newDetails = Iterables.getOnlyElement(client.getOfferingApi().listDiskOfferings(
- ListDiskOfferingsOptions.Builder.id(offering.getId())));
- assertEquals(offering, newDetails);
- assertEquals(offering, client.getOfferingApi().getDiskOffering(offering.getId()));
- assert offering.getId() != null : offering;
- assert offering.getName() != null : offering;
- assert offering.getCreated() != null : offering;
- assert offering.getDisplayText() != null : offering;
- assert offering.getDiskSize() > 0 || (offering.getDiskSize() == 0 && offering.isCustomized()) : offering;
- assert offering.getTags() != null : offering;
-
- } catch (NoSuchElementException e) {
- // This bug is present both in 2.2.8 and 2.2.12
- assertTrue(Predicates.in(ImmutableSet.of("2.2.8", "2.2.12")).apply(apiVersion));
- }
- }
- }
-
- public void testListServiceOfferings() throws Exception {
- Set<ServiceOffering> response = client.getOfferingApi().listServiceOfferings();
- assert null != response;
- long offeringCount = response.size();
- assertTrue(offeringCount >= 0);
- for (ServiceOffering offering : response) {
- ServiceOffering newDetails = Iterables.getOnlyElement(client.getOfferingApi().listServiceOfferings(
- ListServiceOfferingsOptions.Builder.id(offering.getId())));
- assertEquals(offering, newDetails);
-
- assert offering.getId() != null : offering;
- assert offering.getName() != null : offering;
- assert offering.getDisplayText() != null : offering;
- assert offering.getCpuNumber() > 0 : offering;
- assert offering.getCpuSpeed() > 0 : offering;
- assert offering.getMemory() > 0 : offering;
- assert offering.getStorageType() != null && StorageType.UNRECOGNIZED != offering.getStorageType() : offering;
- assert offering.getTags() != null : offering;
- }
- }
-
- public void testListNetworkOfferings() throws Exception {
- Set<NetworkOffering> response = client.getOfferingApi().listNetworkOfferings();
- assert null != response;
- long offeringCount = response.size();
- assertTrue(offeringCount >= 0);
- for (NetworkOffering offering : response) {
- NetworkOffering newDetails = Iterables.getOnlyElement(client.getOfferingApi().listNetworkOfferings(
- ListNetworkOfferingsOptions.Builder.id(offering.getId())));
- assertEquals(offering, newDetails);
- assertEquals(offering, client.getOfferingApi().getNetworkOffering(offering.getId()));
- assert offering.getId() != null : offering;
- assert offering.getName() != null : offering;
- assert offering.getDisplayText() != null : offering;
- assert offering.getMaxConnections() == null || offering.getMaxConnections() > 0 : offering;
- assert offering.getTrafficType() != null && TrafficType.UNRECOGNIZED != offering.getTrafficType() : offering;
- assert offering.getTags() != null : offering;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiTest.java
deleted file mode 100644
index 6315fea..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/OfferingApiTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.DEFAULT;
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListDiskOfferingsOptions;
-import org.jclouds.cloudstack.options.ListNetworkOfferingsOptions;
-import org.jclouds.cloudstack.options.ListServiceOfferingsOptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code OfferingApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "OfferingApiTest")
-public class OfferingApiTest extends BaseCloudStackApiTest<OfferingApi> {
- public void testListDiskOfferings() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "listDiskOfferings", ListDiskOfferingsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listDiskOfferings&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListDiskOfferingsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "listDiskOfferings", ListDiskOfferingsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListDiskOfferingsOptions.Builder.domainId("6").id("5")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listDiskOfferings&listAll=true&domainid=6&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetDiskOffering() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "getDiskOffering", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("5"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listDiskOfferings&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListNetworkOfferings() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "listNetworkOfferings", ListNetworkOfferingsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listNetworkOfferings&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListNetworkOfferingsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "listNetworkOfferings", ListNetworkOfferingsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ListNetworkOfferingsOptions.Builder.availability(DEFAULT).isShared(true).id("6")));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listNetworkOfferings&listAll=true&availability=Default&isshared=true&id=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetNetworkOffering() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "getNetworkOffering", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("5"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listNetworkOfferings&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListServiceOfferings() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "listServiceOfferings", ListServiceOfferingsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listServiceOfferings&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListServiceOfferingsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "listServiceOfferings", ListServiceOfferingsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListServiceOfferingsOptions.Builder.virtualMachineId("4")
- .domainId("5").id("6")));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listServiceOfferings&listAll=true&virtualmachineid=4&domainid=5&id=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetServiceOffering() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(OfferingApi.class, "getServiceOffering", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("5"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listServiceOfferings&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiExpectTest.java
deleted file mode 100644
index b7665be..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiExpectTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.Project;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack ProjectApi
- */
-@Test(groups = "unit", testName = "ProjectApiExpectTest")
-public class ProjectApiExpectTest extends BaseCloudStackExpectTest<ProjectApi> {
-
-
- public void testListProjectsWhenResponseIs2xx() {
-
- ProjectApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=listProjects&listAll=true&apiKey=identity&signature=vtCqaYXfXttr6mD18Es0e22QBIQ%3D")
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listprojectsresponse.json"))
- .build());
-
- Set<Project> projects = ImmutableSet.of(
- Project.builder()
- .id("489da162-0b77-489d-b044-ce39aa018b1f")
- .account("thyde")
- .displayText("")
- .domain("ROOT")
- .domainId("41a4917b-7952-499d-ba7f-4c57464d3dc8")
- .name("NN-HA-T1")
- .state(Project.State.ACTIVE).build(),
- Project.builder()
- .id("1c11f22c-15ac-4fa7-b833-4d748df317b7")
- .account("prasadm")
- .displayText("Hive")
- .domain("ROOT")
- .domainId("41a4917b-7952-499d-ba7f-4c57464d3dc8")
- .name("hive")
- .state(Project.State.ACTIVE).build());
-
- assertEquals(client.listProjects(), projects);
- }
-
- @Override
- protected ProjectApi clientFrom(CloudStackContext context) {
- return context.getApi().getProjectApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
deleted file mode 100644
index 071c9d9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiLiveTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-
-import org.jclouds.cloudstack.domain.Project;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code ProjectApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "ProjectApiLiveTest")
-public class ProjectApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testListAccounts() throws Exception {
- for (Project project : client.getProjectApi().listProjects())
- checkProject(project);
- }
-
- protected void checkProject(Project project) {
- assertNotNull(project.getId());
- assertEquals(project.toString(), client.getProjectApi().getProject(project.getId()).toString());
- assertNotNull(project.getState());
- assertNotEquals(project.getState(), Project.State.UNRECOGNIZED);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiTest.java
deleted file mode 100644
index 6b06c93..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/ProjectApiTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListProjectsOptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-
-/**
- * Tests behavior of {@code ProjectApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "ProjectApiTest")
-public class ProjectApiTest extends BaseCloudStackApiTest<ProjectApi> {
-
- public void testListProjects() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ProjectApi.class, "listProjects", ListProjectsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listProjects&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListProjectsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ProjectApi.class, "listProjects", ListProjectsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ListProjectsOptions.Builder.accountInDomain("jclouds", "123")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listProjects&listAll=true&account=jclouds&domainid=123 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetAccount() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(ProjectApi.class, "getProject", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("3"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listProjects&listAll=true&id=3 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
-}
[33/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java
deleted file mode 100644
index d3ff66e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what configuration entries are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/listConfigurations.html"
- * />
- */
-public class ListConfigurationEntriesOptions extends BaseHttpRequestOptions {
-
- public static final ListConfigurationEntriesOptions NONE = new ListConfigurationEntriesOptions();
-
- /**
- * @param category
- * list by category name
- */
- public ListConfigurationEntriesOptions category(String category) {
- this.queryParameters.replaceValues("category", ImmutableSet.of(category));
- return this;
- }
-
- /**
- * @param keyword
- * list by keyword
- */
- public ListConfigurationEntriesOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param name
- * list by entry name
- */
- public ListConfigurationEntriesOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public ListConfigurationEntriesOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- public ListConfigurationEntriesOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListConfigurationEntriesOptions#category
- */
- public static ListConfigurationEntriesOptions category(String category) {
- ListConfigurationEntriesOptions options = new ListConfigurationEntriesOptions();
- return options.category(category);
- }
-
- /**
- * @see ListConfigurationEntriesOptions#keyword
- */
- public static ListConfigurationEntriesOptions keyword(String keyword) {
- ListConfigurationEntriesOptions options = new ListConfigurationEntriesOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListConfigurationEntriesOptions#name
- */
- public static ListConfigurationEntriesOptions name(String name) {
- ListConfigurationEntriesOptions options = new ListConfigurationEntriesOptions();
- return options.name(name);
- }
-
- /**
- * @see ListConfigurationEntriesOptions#page
- */
- public static ListConfigurationEntriesOptions page(long page) {
- ListConfigurationEntriesOptions options = new ListConfigurationEntriesOptions();
- return options.page(page);
- }
-
- /**
- * @see ListConfigurationEntriesOptions#pageSize
- */
- public static ListConfigurationEntriesOptions pageSize(long pageSize) {
- ListConfigurationEntriesOptions options = new ListConfigurationEntriesOptions();
- return options.pageSize(pageSize);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java
deleted file mode 100644
index b85c739..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what disk offerings are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/listDiskOfferings.html"
- * />
- */
-public class ListDiskOfferingsOptions extends BaseHttpRequestOptions {
-
- public static final ListDiskOfferingsOptions NONE = new ListDiskOfferingsOptions();
-
- /**
- * @param id
- * the ID of the disk offering
- */
- public ListDiskOfferingsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param domainId
- * the ID of the domain associated with the disk offering
- */
- public ListDiskOfferingsOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
-
- }
-
- /**
- * @param name
- * the disk offering name
- */
- public ListDiskOfferingsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListDiskOfferingsOptions#name
- */
- public static ListDiskOfferingsOptions name(String name) {
- ListDiskOfferingsOptions options = new ListDiskOfferingsOptions();
- return options.name(name);
- }
-
- /**
- * @see ListDiskOfferingsOptions#domainId
- */
- public static ListDiskOfferingsOptions domainId(String id) {
- ListDiskOfferingsOptions options = new ListDiskOfferingsOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListDiskOfferingsOptions#id
- */
- public static ListDiskOfferingsOptions id(String id) {
- ListDiskOfferingsOptions options = new ListDiskOfferingsOptions();
- return options.id(id);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java
deleted file mode 100644
index 9d936fc..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what domain children are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/domain_admin/listDomains.html"
- * />
- */
-public class ListDomainChildrenOptions extends BaseHttpRequestOptions {
-
- public static final ListDomainChildrenOptions NONE = new ListDomainChildrenOptions();
-
- /**
- * @param parentDomainId
- * firewall rule ID
- */
- public ListDomainChildrenOptions parentDomainId(String parentDomainId) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(parentDomainId + ""));
- return this;
- }
-
- /**
- * @param isRecursive
- * to return the entire tree, use the value "true". To return
- * the first level children, use the value "false".
- */
- public ListDomainChildrenOptions isRecursive(boolean isRecursive) {
- this.queryParameters.replaceValues("isrecursive", ImmutableSet.of(isRecursive + ""));
- return this;
- }
-
- /**
- * @param keyword
- * list by keyword
- */
- public ListDomainChildrenOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param name
- * list by domain name
- */
- public ListDomainChildrenOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public ListDomainChildrenOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- public ListDomainChildrenOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListDomainChildrenOptions#parentDomainId
- */
- public static ListDomainChildrenOptions parentDomainId(String parentDomainId) {
- ListDomainChildrenOptions options = new ListDomainChildrenOptions();
- return options.parentDomainId(parentDomainId);
- }
-
- /**
- * @see ListDomainChildrenOptions#isRecursive
- */
- public static ListDomainChildrenOptions isRecursive(boolean isRecursive) {
- ListDomainChildrenOptions options = new ListDomainChildrenOptions();
- return options.isRecursive(isRecursive);
- }
-
- /**
- * @see ListDomainChildrenOptions#keyword
- */
- public static ListDomainChildrenOptions keyword(String keyword) {
- ListDomainChildrenOptions options = new ListDomainChildrenOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListDomainChildrenOptions#name
- */
- public static ListDomainChildrenOptions name(String name) {
- ListDomainChildrenOptions options = new ListDomainChildrenOptions();
- return options.name(name);
- }
-
- /**
- * @see ListDomainChildrenOptions#page
- */
- public static ListDomainChildrenOptions page(long page) {
- ListDomainChildrenOptions options = new ListDomainChildrenOptions();
- return options.page(page);
- }
-
- /**
- * @see ListDomainChildrenOptions#pageSize
- */
- public static ListDomainChildrenOptions pageSize(long pageSize) {
- ListDomainChildrenOptions options = new ListDomainChildrenOptions();
- return options.pageSize(pageSize);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java
deleted file mode 100644
index 094d6ea..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what domains are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/domain_admin/listDomains.html"
- * />
- */
-public class ListDomainsOptions extends BaseHttpRequestOptions {
-
- public static final ListDomainsOptions NONE = new ListDomainsOptions();
-
- /**
- * @param id
- * firewall rule ID
- */
- public ListDomainsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param keyword
- * list by keyword
- */
- public ListDomainsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param level
- * list by domain level
- */
- public ListDomainsOptions level(long level) {
- this.queryParameters.replaceValues("level", ImmutableSet.of(level + ""));
- return this;
- }
-
- /**
- * @param name
- * list by domain name
- */
- public ListDomainsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public ListDomainsOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- public ListDomainsOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListDomainsOptions#id
- */
- public static ListDomainsOptions id(String id) {
- ListDomainsOptions options = new ListDomainsOptions();
- return options.id(id);
- }
-
- /**
- * @see ListDomainsOptions#keyword
- */
- public static ListDomainsOptions keyword(String keyword) {
- ListDomainsOptions options = new ListDomainsOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListDomainsOptions#level
- */
- public static ListDomainsOptions level(long level) {
- ListDomainsOptions options = new ListDomainsOptions();
- return options.level(level);
- }
-
- /**
- * @see ListDomainsOptions#name
- */
- public static ListDomainsOptions name(String name) {
- ListDomainsOptions options = new ListDomainsOptions();
- return options.name(name);
- }
-
- /**
- * @see ListDomainsOptions#page
- */
- public static ListDomainsOptions page(long page) {
- ListDomainsOptions options = new ListDomainsOptions();
- return options.page(page);
- }
-
- /**
- * @see ListDomainsOptions#pageSize
- */
- public static ListDomainsOptions pageSize(long pageSize) {
- ListDomainsOptions options = new ListDomainsOptions();
- return options.pageSize(pageSize);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEgressFirewallRulesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEgressFirewallRulesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEgressFirewallRulesOptions.java
deleted file mode 100644
index 2f2ce02..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEgressFirewallRulesOptions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what egress firewall rules are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/3.0.6/api_3.0.6/root_admin/listEgressFirewallRules.html"
- * />
- */
-public class ListEgressFirewallRulesOptions extends AccountInDomainOptions {
-
- public static final ListEgressFirewallRulesOptions NONE = new ListEgressFirewallRulesOptions();
-
- /**
- * @param id
- * firewall rule ID
- */
- public ListEgressFirewallRulesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param networkId
- * the id of network of the firewall services
- */
- public ListEgressFirewallRulesOptions networkId(String networkId) {
- this.queryParameters.replaceValues("networkid", ImmutableSet.of(networkId + ""));
- return this;
- }
-
- /**
- * @param ipAddressId
- * the id of IP address of the firewall services
- */
- public ListEgressFirewallRulesOptions ipAddressId(String ipAddressId) {
- this.queryParameters.replaceValues("ipaddressid", ImmutableSet.of(ipAddressId + ""));
- return this;
- }
-
- /**
- * @param projectId
- * List firewall rules in this project.
- */
- public ListEgressFirewallRulesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- /**
- * @param keyword
- * list by keyword
- */
- public ListEgressFirewallRulesOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListEgressFirewallRulesOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- public ListEgressFirewallRulesOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListEgressFirewallRulesOptions#id
- */
- public static ListEgressFirewallRulesOptions id(String id) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#networkId
- */
- public static ListEgressFirewallRulesOptions networkId(String networkId) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.networkId(networkId);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#ipAddressId
- */
- public static ListEgressFirewallRulesOptions ipAddressId(String ipAddressId) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.ipAddressId(ipAddressId);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#projectId(String)
- */
- public static ListEgressFirewallRulesOptions projectId(String projectId) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.projectId(projectId);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#keyword
- */
- public static ListEgressFirewallRulesOptions keyword(String keyword) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#page
- */
- public static ListEgressFirewallRulesOptions page(long page) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.page(page);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#pageSize
- */
- public static ListEgressFirewallRulesOptions pageSize(long pageSize) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.pageSize(pageSize);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#accountInDomain
- */
- public static ListEgressFirewallRulesOptions accountInDomain(String account, String domain) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListEgressFirewallRulesOptions#domainId
- */
- public static ListEgressFirewallRulesOptions domainId(String id) {
- ListEgressFirewallRulesOptions options = new ListEgressFirewallRulesOptions();
- return options.domainId(id);
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListEgressFirewallRulesOptions accountInDomain(String account, String domain) {
- return ListEgressFirewallRulesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListEgressFirewallRulesOptions domainId(String domainId) {
- return ListEgressFirewallRulesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java
deleted file mode 100644
index bdb5587..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Date;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what events are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/user/listEvents.html"
- * />
- */
-public class ListEventsOptions extends BaseHttpRequestOptions {
- public static final ListEventsOptions NONE = new ListEventsOptions();
-
- public ListEventsOptions account(String account) {
- this.queryParameters.replaceValues("account", ImmutableSet.of(account));
- return this;
- }
-
- public ListEventsOptions domainId(String domainId) {
- this.queryParameters.replaceValues("domainid", ImmutableSet.of(domainId + ""));
- return this;
- }
-
- public ListEventsOptions duration(String duration) {
- this.queryParameters.replaceValues("duration", ImmutableSet.of(duration));
- return this;
- }
-
- public ListEventsOptions endDate(Date enddate) {
- this.queryParameters.replaceValues("enddate", ImmutableSet.of(enddate + ""));
- return this;
- }
-
- public ListEventsOptions entryTime(Date entrytime) {
- this.queryParameters.replaceValues("entrytime", ImmutableSet.of(entrytime + ""));
- return this;
- }
-
- public ListEventsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id));
- return this;
- }
-
- public ListEventsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- public ListEventsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListEventsOptions level(String level) {
- this.queryParameters.replaceValues("level", ImmutableSet.of(level));
- return this;
- }
-
- public ListEventsOptions type(String type) {
- this.queryParameters.replaceValues("type", ImmutableSet.of(type));
- return this;
- }
-
-
- public static class Builder {
- public static ListEventsOptions account(String account) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.account(account);
- }
-
- public static ListEventsOptions domainId(String domainId) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.domainId(domainId);
- }
-
- public static ListEventsOptions duration(String duration) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.duration(duration);
- }
-
- public static ListEventsOptions endDate(Date enddate) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.endDate(enddate);
- }
-
- public static ListEventsOptions entryTime(Date entrytime) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.entryTime(entrytime);
- }
-
- public static ListEventsOptions id(String id) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.id(id);
- }
-
- public static ListEventsOptions projectId(String projectId) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.projectId(projectId);
- }
-
- public static ListEventsOptions keyword(String keyword) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.keyword(keyword);
- }
-
- public static ListEventsOptions level(String level) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.level(level);
- }
-
- public static ListEventsOptions type(String type) {
- final ListEventsOptions options = new ListEventsOptions();
- return options.type(type);
- }
-
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java
deleted file mode 100644
index 7f83213..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what firewall rules are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/listFirewallRules.html"
- * />
- */
-public class ListFirewallRulesOptions extends AccountInDomainOptions {
-
- public static final ListFirewallRulesOptions NONE = new ListFirewallRulesOptions();
-
- /**
- * @param id
- * firewall rule ID
- */
- public ListFirewallRulesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param ipAddressId
- * the id of IP address of the firewall services
- */
- public ListFirewallRulesOptions ipAddressId(String ipAddressId) {
- this.queryParameters.replaceValues("ipaddressid", ImmutableSet.of(ipAddressId + ""));
- return this;
- }
-
- /**
- * @param projectId
- * List firewall rules in this project.
- */
- public ListFirewallRulesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- /**
- * @param keyword
- * list by keyword
- */
- public ListFirewallRulesOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListFirewallRulesOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- public ListFirewallRulesOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListFirewallRulesOptions#id
- */
- public static ListFirewallRulesOptions id(String id) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListFirewallRulesOptions#ipAddressId
- */
- public static ListFirewallRulesOptions ipAddressId(String ipAddressId) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.ipAddressId(ipAddressId);
- }
-
- /**
- * @see ListFirewallRulesOptions#projectId(String)
- */
- public static ListFirewallRulesOptions projectId(String projectId) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.projectId(projectId);
- }
-
- /**
- * @see ListFirewallRulesOptions#keyword
- */
- public static ListFirewallRulesOptions keyword(String keyword) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListFirewallRulesOptions#page
- */
- public static ListFirewallRulesOptions page(long page) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.page(page);
- }
-
- /**
- * @see ListFirewallRulesOptions#pageSize
- */
- public static ListFirewallRulesOptions pageSize(long pageSize) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.pageSize(pageSize);
- }
-
- /**
- * @see ListFirewallRulesOptions#accountInDomain
- */
- public static ListFirewallRulesOptions accountInDomain(String account, String domain) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListFirewallRulesOptions#domainId
- */
- public static ListFirewallRulesOptions domainId(String id) {
- ListFirewallRulesOptions options = new ListFirewallRulesOptions();
- return options.domainId(id);
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListFirewallRulesOptions accountInDomain(String account, String domain) {
- return ListFirewallRulesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListFirewallRulesOptions domainId(String domainId) {
- return ListFirewallRulesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListHostsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListHostsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListHostsOptions.java
deleted file mode 100644
index 8ecd62b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListHostsOptions.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Host;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what hosts information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/global_admin/listHosts.html"
- * />
- */
-public class ListHostsOptions extends AccountInDomainOptions {
-
- public static final ListHostsOptions NONE = new ListHostsOptions();
-
- /**
- * @param id the id of the host
- */
- public ListHostsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param allocationState list hosts by allocation state
- */
- public ListHostsOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- /**
- * @param clusterId lists hosts existing in particular cluster
- */
- public ListHostsOptions clusterId(String clusterId) {
- this.queryParameters.replaceValues("clusterid", ImmutableSet.of(clusterId + ""));
- return this;
- }
-
- /**
- * @param keyword List by keyword
- */
- public ListHostsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param name List by name
- */
- public ListHostsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param page
- */
- public ListHostsOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- /**
- * @param pageSize the page size
- */
- public ListHostsOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
- /**
- * @param podId the Pod ID for the host
- */
- public ListHostsOptions podId(String podId) {
- this.queryParameters.replaceValues("podid", ImmutableSet.of(podId + ""));
- return this;
- }
-
- /**
- * @param state the state of the host
- */
- public ListHostsOptions state(String state) {
- this.queryParameters.replaceValues("state", ImmutableSet.of(state));
- return this;
- }
-
- /**
- * @param type the type of the host
- */
- public ListHostsOptions type(Host.Type type) {
- this.queryParameters.replaceValues("type", ImmutableSet.of(type.toString()));
- return this;
- }
-
- /**
- * @param virtualMachineId lists hosts in the same cluster as this VM and flag hosts with
- * enough CPU/RAm to host this VM
- */
- public ListHostsOptions virtualMachineId(String virtualMachineId) {
- this.queryParameters.replaceValues("virtualmachineid", ImmutableSet.of(virtualMachineId + ""));
- return this;
- }
-
- /**
- * @param zoneId the Zone ID for the host
- */
- public ListHostsOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListHostsOptions accountInDomain(String account, String domain) {
- return ListHostsOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListHostsOptions domainId(String domainId) {
- return ListHostsOptions.class.cast(super.domainId(domainId));
- }
-
- public static class Builder {
- /**
- * @see ListHostsOptions#id
- */
- public static ListHostsOptions id(String id) {
- ListHostsOptions options = new ListHostsOptions();
- return options.id(id);
- }
-
- /**
- * @see ListHostsOptions#allocationState
- */
- public static ListHostsOptions allocationState(AllocationState allocationState) {
- ListHostsOptions options = new ListHostsOptions();
- return options.allocationState(allocationState);
- }
-
- /**
- * @see ListHostsOptions#clusterId
- */
- public static ListHostsOptions clusterId(String clusterId) {
- ListHostsOptions options = new ListHostsOptions();
- return options.clusterId(clusterId);
- }
-
- /**
- * @see ListHostsOptions#keyword(String)
- */
- public static ListHostsOptions keyword(String keyword) {
- ListHostsOptions options = new ListHostsOptions();
- return options.keyword(keyword);
- }
-
- /**
- * @see ListHostsOptions#name(String)
- */
- public static ListHostsOptions name(String name) {
- ListHostsOptions options = new ListHostsOptions();
- return options.name(name);
- }
-
- /**
- * @see ListHostsOptions#page
- */
- public static ListHostsOptions page(long page) {
- ListHostsOptions options = new ListHostsOptions();
- return options.page(page);
- }
-
- /**
- * @see ListHostsOptions#pageSize
- */
- public static ListHostsOptions pageSize(long pageSize) {
- ListHostsOptions options = new ListHostsOptions();
- return options.pageSize(pageSize);
- }
-
- /**
- * @see ListHostsOptions#podId
- */
- public static ListHostsOptions podId(String podId) {
- ListHostsOptions options = new ListHostsOptions();
- return options.podId(podId);
- }
-
- /**
- * @see ListHostsOptions#state
- */
- public static ListHostsOptions state(String state) {
- ListHostsOptions options = new ListHostsOptions();
- return options.state(state);
- }
-
- /**
- * @see ListHostsOptions#type
- */
- public static ListHostsOptions type(Host.Type type) {
- ListHostsOptions options = new ListHostsOptions();
- return options.type(type);
- }
-
- /**
- * @see ListHostsOptions#virtualMachineId
- */
- public static ListHostsOptions virtualMachineId(String virtualMachineId) {
- ListHostsOptions options = new ListHostsOptions();
- return options.virtualMachineId(virtualMachineId);
- }
-
- /**
- * @see ListHostsOptions#zoneId
- */
- public static ListHostsOptions zoneId(String zoneId) {
- ListHostsOptions options = new ListHostsOptions();
- return options.zoneId(zoneId);
- }
-
- /**
- * @see ListHostsOptions#accountInDomain
- */
- public static ListHostsOptions accountInDomain(String account, String domain) {
- ListHostsOptions options = new ListHostsOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListHostsOptions#domainId
- */
- public static ListHostsOptions domainId(String domainId) {
- ListHostsOptions options = new ListHostsOptions();
- return options.domainId(domainId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java
deleted file mode 100644
index a55936e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what ip forwarding rules are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/listIpForwardingRules.html"
- * />
- */
-public class ListIPForwardingRulesOptions extends AccountInDomainOptions {
-
- public static final ListIPForwardingRulesOptions NONE = new ListIPForwardingRulesOptions();
-
- /**
- * @param id
- * Lists rule with the specified ID.
- */
- public ListIPForwardingRulesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param IPAddressId
- * list the rule belonging to this public ip address
- */
- public ListIPForwardingRulesOptions IPAddressId(String IPAddressId) {
- this.queryParameters.replaceValues("ipaddressid", ImmutableSet.of(IPAddressId + ""));
- return this;
-
- }
-
- /**
- * @param virtualMachineId
- * Lists all rules applied to the specified Vm.
- */
- public ListIPForwardingRulesOptions virtualMachineId(String virtualMachineId) {
- this.queryParameters.replaceValues("virtualmachineid", ImmutableSet.of(virtualMachineId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * Lists all rules applied to VMs in the given project.
- */
- public ListIPForwardingRulesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
-
- }
-
- public static class Builder {
-
- /**
- * @see ListIPForwardingRulesOptions#accountInDomain
- */
- public static ListIPForwardingRulesOptions accountInDomain(String account, String domain) {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListIPForwardingRulesOptions#IPAddressId
- */
- public static ListIPForwardingRulesOptions IPAddressId(String IPAddressId) {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions();
- return options.IPAddressId(IPAddressId);
- }
-
- /**
- * @see ListIPForwardingRulesOptions#domainId
- */
- public static ListIPForwardingRulesOptions domainId(String id) {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListIPForwardingRulesOptions#id
- */
- public static ListIPForwardingRulesOptions id(String id) {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListIPForwardingRulesOptions#virtualMachineId
- */
- public static ListIPForwardingRulesOptions virtualMachineId(String virtualMachineId) {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions();
- return options.virtualMachineId(virtualMachineId);
- }
-
- /**
- * @see ListIPForwardingRulesOptions#projectId(String)
- */
- public static ListIPForwardingRulesOptions projectId(String projectId) {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions();
- return options.projectId(projectId);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListIPForwardingRulesOptions accountInDomain(String account, String domain) {
- return ListIPForwardingRulesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListIPForwardingRulesOptions domainId(String domainId) {
- return ListIPForwardingRulesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java
deleted file mode 100644
index 0659d51..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ISO;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options for the ISO listISOs method.
- *
- * @see org.jclouds.cloudstack.features.ISOApi#listISOs
- * @see org.jclouds.cloudstack.features.ISOApi#listISOs
- */
-public class ListISOsOptions extends AccountInDomainOptions {
- public static final ListISOsOptions NONE = new ListISOsOptions();
-
- private static final Set<String> TRUE = ImmutableSet.of(Boolean.toString(true));
- private static final Set<String> FALSE = ImmutableSet.of(Boolean.toString(false));
-
- /**
- * the ISO is bootable
- */
- public ListISOsOptions bootable() {
- this.queryParameters.replaceValues("bootable", TRUE);
- return this;
- }
-
- /**
- * the ISO is bootable
- */
- public ListISOsOptions notBootable() {
- this.queryParameters.replaceValues("bootable", FALSE);
- return this;
- }
-
- /**
- * @param hypervisor the hypervisor for which to restrict the search
- */
- public ListISOsOptions hypervisor(String hypervisor) {
- this.queryParameters.replaceValues("hypervisor", ImmutableSet.of(hypervisor));
- return this;
- }
-
- /**
- * @param id list all isos by id
- */
- public ListISOsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id));
- return this;
- }
-
- /**
- * @param projectId list ISOs in the given project
- */
- public ListISOsOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- /**
- * @param isoFilter possible values are "featured", "self", "self-executable","executable", and "community".
- */
- public ListISOsOptions isoFilter(ISO.ISOFilter isoFilter) {
- this.queryParameters.replaceValues("isofilter", ImmutableSet.of(isoFilter.name()));
- return this;
- }
-
- /**
- * the ISO is publicly available to all users
- */
- public ListISOsOptions isPublic() {
- this.queryParameters.replaceValues("ispublic", TRUE);
- return this;
- }
-
- /**
- * the ISO is not publicly available to all users
- */
- public ListISOsOptions isPrivate() {
- this.queryParameters.replaceValues("ispublic", FALSE);
- return this;
- }
-
- /**
- * this ISO is ready to be deployed
- */
- public ListISOsOptions isReady() {
- this.queryParameters.replaceValues("isready", TRUE);
- return this;
- }
-
- /**
- * this ISO is not ready to be deployed
- */
- public ListISOsOptions isNotReady() {
- this.queryParameters.replaceValues("isready", FALSE);
- return this;
- }
-
- /**
- * @param keyword List by keyword
- */
- public ListISOsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- /**
- * @param name list all isos by name
- */
- public ListISOsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param zoneId the ID of the zone
- */
- public ListISOsOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId));
- return this;
- }
-
- public static class Builder {
- /**
- * @param account the account of the ISO file. Must be used with the domainId parameter.
- */
- public static ListISOsOptions accountInDomain(String account, String domainId) {
- return (ListISOsOptions) new ListISOsOptions().accountInDomain(account, domainId);
- }
-
- /**
- * the ISO is bootable
- */
- public static ListISOsOptions bootable() {
- return new ListISOsOptions().bootable();
- }
-
- /**
- * the ISO is bootable
- */
- public static ListISOsOptions notBootable() {
- return new ListISOsOptions().notBootable();
- }
-
- /**
- * @param domainId lists all available ISO files by ID of a domain. If used with the account parameter, lists all available ISO files for the account in the ID of a domain.
- */
- public static ListISOsOptions domainId(String domainId) {
- return (ListISOsOptions) new ListISOsOptions().domainId(domainId);
- }
-
- /**
- * @param hypervisor the hypervisor for which to restrict the search
- */
- public static ListISOsOptions hypervisor(String hypervisor) {
- return new ListISOsOptions().hypervisor(hypervisor);
- }
-
- /**
- * @param id list all isos by id
- */
- public static ListISOsOptions id(String id) {
- return new ListISOsOptions().id(id);
- }
-
- /**
- * @param projectId list ISOs in project
- */
- public static ListISOsOptions projectId(String projectId) {
- return new ListISOsOptions().projectId(projectId);
- }
-
- /**
- * @param isoFilter possible values are "featured", "self", "self-executable","executable", and "community".
- */
- public static ListISOsOptions isoFilter(ISO.ISOFilter isoFilter) {
- return new ListISOsOptions().isoFilter(isoFilter);
- }
-
- /**
- * the ISO is publicly available to all users
- */
- public static ListISOsOptions isPublic() {
- return new ListISOsOptions().isPublic();
- }
-
- /**
- * the ISO is not publicly available to all users
- */
- public static ListISOsOptions isPrivate() {
- return new ListISOsOptions().isPrivate();
- }
-
- /**
- * this ISO is ready to be deployed
- */
- public static ListISOsOptions isReady() {
- return new ListISOsOptions().isReady();
- }
-
- /**
- * this ISO is not ready to be deployed
- */
- public static ListISOsOptions isNotReady() {
- return new ListISOsOptions().isNotReady();
- }
-
- /**
- * @param keyword List by keyword
- */
- public static ListISOsOptions keyword(String keyword) {
- return new ListISOsOptions().keyword(keyword);
- }
-
- /**
- * @param name list all isos by name
- */
- public static ListISOsOptions name(String name) {
- return new ListISOsOptions().name(name);
- }
-
- /**
- * @param zoneId the ID of the zone
- */
- public static ListISOsOptions zoneId(String zoneId) {
- return new ListISOsOptions().zoneId(zoneId);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java
deleted file mode 100644
index 78a2315..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what load balancer rules are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api/user/listLoadBalancerRules.html"
- * />
- */
-public class ListLoadBalancerRulesOptions extends AccountInDomainOptions {
-
- public static final ListLoadBalancerRulesOptions NONE = new ListLoadBalancerRulesOptions();
-
- /**
- * @param id
- * Lists rule with the specified ID.
- */
- public ListLoadBalancerRulesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param name
- * the name of the load balancer rule
- */
- public ListLoadBalancerRulesOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param publicIPId
- * the public IP address id of the load balancer rule
- */
- public ListLoadBalancerRulesOptions publicIPId(String publicIPId) {
- this.queryParameters.replaceValues("publicipid", ImmutableSet.of(publicIPId + ""));
- return this;
- }
-
- /**
- * @param virtualMachineId
- * the ID of the virtual machine of the load balancer rule
- */
- public ListLoadBalancerRulesOptions virtualMachineId(String virtualMachineId) {
- this.queryParameters.replaceValues("virtualmachineid", ImmutableSet.of(virtualMachineId + ""));
- return this;
- }
-
- /**
- * @param zoneId the availability zone ID
- */
- public ListLoadBalancerRulesOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- /**
- * @param projectId the project ID
- */
- public ListLoadBalancerRulesOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
- }
-
- /**
- * @param page the number of the page
- */
- public ListLoadBalancerRulesOptions page(long page) {
- this.queryParameters.replaceValues("page", ImmutableSet.of(page + ""));
- return this;
- }
-
- /**
- * @param pageSize
- */
- public ListLoadBalancerRulesOptions pageSize(long pageSize) {
- this.queryParameters.replaceValues("pagesize", ImmutableSet.of(pageSize + ""));
- return this;
- }
-
- public static class Builder {
-
- /**
- * @see ListLoadBalancerRulesOptions#accountInDomain
- */
- public static ListLoadBalancerRulesOptions accountInDomain(String account, String domain) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#publicIPId
- */
- public static ListLoadBalancerRulesOptions publicIPId(String publicIPId) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.publicIPId(publicIPId);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#domainId
- */
- public static ListLoadBalancerRulesOptions domainId(String id) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.domainId(id);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#name
- */
- public static ListLoadBalancerRulesOptions name(String name) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.name(name);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#id
- */
- public static ListLoadBalancerRulesOptions id(String id) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#virtualMachineId
- */
- public static ListLoadBalancerRulesOptions virtualMachineId(String virtualMachineId) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.virtualMachineId(virtualMachineId);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#zoneId
- */
- public static ListLoadBalancerRulesOptions zoneId(String zoneId) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.zoneId(zoneId);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#projectId(String)
- */
- public static ListLoadBalancerRulesOptions projectId(String projectId) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.projectId(projectId);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#page
- */
- public static ListLoadBalancerRulesOptions page(long page) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.page(page);
- }
-
- /**
- * @see ListLoadBalancerRulesOptions#pageSize
- */
- public static ListLoadBalancerRulesOptions pageSize(long pageSize) {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions();
- return options.pageSize(pageSize);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListLoadBalancerRulesOptions accountInDomain(String account, String domain) {
- return ListLoadBalancerRulesOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListLoadBalancerRulesOptions domainId(String domainId) {
- return ListLoadBalancerRulesOptions.class.cast(super.domainId(domainId));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java
deleted file mode 100644
index 292f180..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what network offerings are returned
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/user/listNetworkOfferings.html"
- * />
- */
-public class ListNetworkOfferingsOptions extends BaseHttpRequestOptions {
-
- public static final ListNetworkOfferingsOptions NONE = new ListNetworkOfferingsOptions();
-
- /**
- * @param zoneId
- * list network offerings available for network creation in specific zone
- */
- public ListNetworkOfferingsOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
- /**
- * @param id
- * the ID of the network offering
- */
- public ListNetworkOfferingsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param name
- * the network offering name
- */
- public ListNetworkOfferingsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- /**
- * @param displayText
- * network offerings by display text
- */
- public ListNetworkOfferingsOptions displayText(String displayText) {
- this.queryParameters.replaceValues("displaytext", ImmutableSet.of(displayText));
- return this;
- }
-
- /**
- * @param availability
- * the availability of network offering. Default value is Required
- */
- public ListNetworkOfferingsOptions availability(NetworkOfferingAvailabilityType availability) {
- this.queryParameters.replaceValues("availability", ImmutableSet.of(availability.toString()));
- return this;
- }
-
- /**
- * @param isDefault
- * true if network offering is default, false otherwise
- */
- public ListNetworkOfferingsOptions isDefault(boolean isDefault) {
- this.queryParameters.replaceValues("isdefault", ImmutableSet.of(isDefault + ""));
- return this;
- }
-
- /**
- * @param isShared
- * true if network offering is shared, false otherwise
- */
- public ListNetworkOfferingsOptions isShared(boolean isShared) {
- this.queryParameters.replaceValues("isshared", ImmutableSet.of(isShared + ""));
- return this;
- }
-
- /**
- * @param specifyVLAN
- * True if we allow the network supports vlan, false otherwise. If
- * you create network using this offering, you must specify vlan.
- */
- public ListNetworkOfferingsOptions specifyVLAN(boolean specifyVLAN) {
- this.queryParameters.replaceValues("specifyvlan", ImmutableSet.of(specifyVLAN + ""));
- return this;
- }
-
- /**
- * @param trafficType
- * type of the traffic
- */
- public ListNetworkOfferingsOptions trafficType(TrafficType trafficType) {
- this.queryParameters.replaceValues("traffictype", ImmutableSet.of(trafficType.toString()));
- return this;
- }
-
- public static class Builder {
- /**
- * @see ListNetworkOfferingsOptions#specifyVLAN
- */
- public static ListNetworkOfferingsOptions specifyVLAN(boolean specifyVLAN) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.specifyVLAN(specifyVLAN);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#isDefault
- */
- public static ListNetworkOfferingsOptions isDefault(boolean isDefault) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.isDefault(isDefault);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#isShared
- */
- public static ListNetworkOfferingsOptions isShared(boolean isShared) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.isShared(isShared);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#displayText
- */
- public static ListNetworkOfferingsOptions displayText(String displayText) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.displayText(displayText);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#name
- */
- public static ListNetworkOfferingsOptions name(String name) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.name(name);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#availability
- */
- public static ListNetworkOfferingsOptions availability(NetworkOfferingAvailabilityType availability) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.availability(availability);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#id
- */
- public static ListNetworkOfferingsOptions id(String id) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.id(id);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#zoneId
- */
- public static ListNetworkOfferingsOptions zoneId(String zoneId) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.zoneId(zoneId);
- }
-
- /**
- * @see ListNetworkOfferingsOptions#trafficType
- */
- public static ListNetworkOfferingsOptions trafficType(TrafficType trafficType) {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions();
- return options.trafficType(trafficType);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java
deleted file mode 100644
index 94e9de7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.TrafficType;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what networks information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api/user/listNetworks.html"
- * />
- */
-public class ListNetworksOptions extends AccountInDomainOptions {
-
- public static final ListNetworksOptions NONE = new ListNetworksOptions();
-
- /**
- * @param isDefault
- * true if network is default, false otherwise
- */
- public ListNetworksOptions isDefault(boolean isDefault) {
- this.queryParameters.replaceValues("isdefault", ImmutableSet.of(isDefault + ""));
- return this;
- }
-
- /**
- * @param isShared
- * true if network is shared, false otherwise
- */
- public ListNetworksOptions isShared(boolean isShared) {
- this.queryParameters.replaceValues("isshared", ImmutableSet.of(isShared + ""));
- return this;
- }
-
- /**
- * @param isSystem
- * true if network is system, false otherwise
- */
- public ListNetworksOptions isSystem(boolean isSystem) {
- this.queryParameters.replaceValues("issystem", ImmutableSet.of(isSystem + ""));
- return this;
- }
-
- /**
- * @param type
- * the type of the network
- */
- public ListNetworksOptions type(NetworkType type) {
- this.queryParameters.replaceValues("type", ImmutableSet.of(type.toString()));
- return this;
- }
-
- /**
- * @param id
- * list networks by id
- */
- public ListNetworksOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param zoneId
- * the Zone ID of the network
- */
- public ListNetworksOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
-
- }
-
- /**
- * @param projectId
- * the project ID of the network
- */
- public ListNetworksOptions projectId(String projectId) {
- this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + ""));
- return this;
-
- }
-
- /**
- * @param trafficType
- * type of the traffic
- */
- public ListNetworksOptions trafficType(TrafficType trafficType) {
- this.queryParameters.replaceValues("traffictype", ImmutableSet.of(trafficType.toString()));
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListNetworksOptions accountInDomain(String account, String domain) {
- return ListNetworksOptions.class.cast(super.accountInDomain(account, domain));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ListNetworksOptions domainId(String domainId) {
- return ListNetworksOptions.class.cast(super.domainId(domainId));
- }
-
- public static class Builder {
- /**
- * @see ListNetworksOptions#isDefault
- */
- public static ListNetworksOptions isDefault(boolean isDefault) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.isDefault(isDefault);
- }
-
- /**
- * @see ListNetworksOptions#isShared
- */
- public static ListNetworksOptions isShared(boolean isShared) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.isShared(isShared);
- }
-
- /**
- * @see ListNetworksOptions#isSystem
- */
- public static ListNetworksOptions isSystem(boolean isSystem) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.isSystem(isSystem);
- }
-
- /**
- * @see ListNetworksOptions#type
- */
- public static ListNetworksOptions type(NetworkType type) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.type(type);
- }
-
- /**
- * @see ListNetworksOptions#id
- */
- public static ListNetworksOptions id(String id) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.id(id);
- }
-
- /**
- * @see ListNetworksOptions#zoneId
- */
- public static ListNetworksOptions zoneId(String id) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.zoneId(id);
- }
-
- /**
- * @see ListNetworksOptions#projectId(String)
- */
- public static ListNetworksOptions projectId(String id) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.projectId(id);
- }
-
- /**
- * @see ListNetworksOptions#trafficType
- */
- public static ListNetworksOptions trafficType(TrafficType trafficType) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.trafficType(trafficType);
- }
-
- /**
- * @see ListNetworksOptions#accountInDomain
- */
- public static ListNetworksOptions accountInDomain(String account, String domain) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.accountInDomain(account, domain);
- }
-
- /**
- * @see ListNetworksOptions#domainId
- */
- public static ListNetworksOptions domainId(String domainId) {
- ListNetworksOptions options = new ListNetworksOptions();
- return options.domainId(domainId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java
deleted file mode 100644
index 74329bf..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options used to control what OSType information is returned
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api/user/listOsTypes.html"
- * />
- */
-public class ListOSTypesOptions extends BaseHttpRequestOptions {
-
- public static final ListOSTypesOptions NONE = new ListOSTypesOptions();
-
- /**
- * @param id
- * list by Os type Id
- */
- public ListOSTypesOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- /**
- * @param OSCategoryId
- * list by Os Category id
- */
- public ListOSTypesOptions OSCategoryId(String OSCategoryId) {
- this.queryParameters.replaceValues("oscategoryid", ImmutableSet.of(OSCategoryId + ""));
- return this;
- }
-
- public static class Builder {
- /**
- * @see ListOSTypesOptions#id
- */
- public static ListOSTypesOptions id(String id) {
- ListOSTypesOptions options = new ListOSTypesOptions();
- return options.id(id);
- }
-
- /**
- * @see ListOSTypesOptions#OSCategoryId
- */
- public static ListOSTypesOptions OSCategoryId(String id) {
- ListOSTypesOptions options = new ListOSTypesOptions();
- return options.OSCategoryId(id);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.java
deleted file mode 100644
index db5bd89..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.http.options.BaseHttpRequestOptions;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Options to the GlobalPodApi.listPods API call.
- */
-public class ListPodsOptions extends BaseHttpRequestOptions {
-
- public static final ListPodsOptions NONE = new ListPodsOptions();
-
- public static class Builder {
-
- public static ListPodsOptions allocationState(AllocationState allocationState) {
- return new ListPodsOptions().allocationState(allocationState);
- }
-
- public static ListPodsOptions id(String id) {
- return new ListPodsOptions().id(id);
- }
-
- public static ListPodsOptions keyword(String keyword) {
- return new ListPodsOptions().keyword(keyword);
- }
-
- public static ListPodsOptions name(String name) {
- return new ListPodsOptions().name(name);
- }
-
- public static ListPodsOptions zoneId(String zoneId) {
- return new ListPodsOptions().zoneId(zoneId);
- }
-
- }
-
- public ListPodsOptions allocationState(AllocationState allocationState) {
- this.queryParameters.replaceValues("allocationstate", ImmutableSet.of(allocationState.toString()));
- return this;
- }
-
- public ListPodsOptions id(String id) {
- this.queryParameters.replaceValues("id", ImmutableSet.of(id + ""));
- return this;
- }
-
- public ListPodsOptions keyword(String keyword) {
- this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword));
- return this;
- }
-
- public ListPodsOptions name(String name) {
- this.queryParameters.replaceValues("name", ImmutableSet.of(name));
- return this;
- }
-
- public ListPodsOptions zoneId(String zoneId) {
- this.queryParameters.replaceValues("zoneid", ImmutableSet.of(zoneId + ""));
- return this;
- }
-
-}
[12/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json
deleted file mode 100644
index 09c1e43..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapabilitiesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listcapabilitiesresponse" : { "capability" : {"securitygroupsenabled":true,"cloudstackversion":"2.2","userpublictemplateenabled":true} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json
deleted file mode 100644
index ec31e1d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listcapacityresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listcapacityresponse" : { "count":2 ,"capacity" : [ {"type":3,"zoneid":1,"zonename":"Dev Zone 1","podid":"null","podname":"All","capacityused":34057748480,"capacitytotal":1796712955904,"percentused":"1.9"}, {"type":3,"zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","capacityused":34057748480,"capacitytotal":1796712955904,"percentused":"1.9"} ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json
deleted file mode 100644
index 64dd052..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listclustersresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listclustersresponse" : { "count":2 ,"cluster" : [ {"id":1,"name":"Xen Clust 1","podid":1,"podname":"Dev Pod 1","zoneid":1,"zonename":"Dev Zone 1","hypervisortype":"XenServer","clustertype":"CloudManaged","allocationstate":"Enabled","managedstate":"Managed"}, {"id":2,"name":"Xen Clust 1","podid":2,"podname":"Dev Pod 2","zoneid":2,"zonename":"Dev Zone 2","hypervisortype":"XenServer","clustertype":"CloudManaged","allocationstate":"Enabled","managedstate":"Managed"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json
deleted file mode 100644
index 25bc7a1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listconfigurationsresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "listconfigurationsresponse" : { "count":2 ,"configuration" : [
- {"category":"Advanced","name":"account.cleanup.interval","value":"86400","description":"The interval (in seconds) between cleanup for removed accounts"},
- {"category":"Advanced","name":"agent.lb.enabled","value":"true","description":"If agent load balancing enabled in cluster setup"}]
-}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json
deleted file mode 100644
index 4c7e703..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdiskofferingsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listdiskofferingsresponse" : { "diskoffering" : [ {"id":3,"domainid":1,"domain":"ROOT","name":"Small","displaytext":"Small Disk, 5 GB","disksize":5,"created":"2011-02-11T15:22:32-0800","iscustomized":false}, {"id":4,"domainid":1,"domain":"ROOT","name":"Medium","displaytext":"Medium Disk, 20 GB","disksize":20,"created":"2011-02-11T15:22:32-0800","iscustomized":false}, {"id":5,"domainid":1,"domain":"ROOT","name":"Large","displaytext":"Large Disk, 100 GB","disksize":100,"created":"2011-02-11T15:22:32-0800","iscustomized":false} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json
deleted file mode 100644
index 5cd2289..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainchildrenresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "listdomainchildrenresponse" : { "count":2 ,"domain" : [
- {"id":2,"name":"jclouds1","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false},
- {"id":3,"name":"jclouds2","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json
deleted file mode 100644
index 79d7e00..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listdomainsresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "listdomainsresponse" : { "count":2 ,"domain" : [
- {"id":1,"name":"ROOT","level":0,"haschild":true},
- {"id":2,"name":"jclouds1","level":1,"parentdomainid":1,"parentdomainname":"ROOT","haschild":false} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json
deleted file mode 100644
index c76b216..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listegressfirewallrulesresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "listegressfirewallrulesresponse" : { "count":3 ,"firewallrule" : [
- {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
- {"id":2016,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
- {"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json
deleted file mode 100644
index 1b75dab..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listeventtypesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listeventtypesresponse" : { "count":123 ,"eventtype" : [ {"name":"VM.CREATE"}, {"name":"VM.DESTROY"}, {"name":"VM.START"}, {"name":"VM.STOP"}, {"name":"VM.REBOOT"}, {"name":"VM.UPDATE"}, {"name":"VM.UPGRADE"}, {"name":"VM.RESETPASSWORD"}, {"name":"VM.MIGRATE"}, {"name":"ROUTER.CREATE"}, {"name":"ROUTER.DESTROY"}, {"name":"ROUTER.START"}, {"name":"ROUTER.STOP"}, {"name":"ROUTER.REBOOT"}, {"name":"ROUTER.HA"}, {"name":"ROUTER.UPGRADE"}, {"name":"PROXY.CREATE"}, {"name":"PROXY.DESTROY"}, {"name":"PROXY.START"}, {"name":"PROXY.STOP"}, {"name":"PROXY.REBOOT"}, {"name":"PROXY.HA"}, {"name":"VNC.CONNECT"}, {"name":"VNC.DISCONNECT"}, {"name":"NET.IPASSIGN"}, {"name":"NET.IPRELEASE"}, {"name":"NET.RULEADD"}, {"name":"NET.RULEDELETE"}, {"name":"NET.RULEMODIFY"}, {"name":"NETWORK.CREATE"}, {"name":"NETWORK.DELETE"}, {"name":"NETWORK.UPDATE"}, {"name":"LB.ASSIGN.TO.RULE"}, {"name":"LB.REMOVE.FROM.RULE"}, {"name":"LB.CREATE"}, {"name":"LB.DELETE"}, {"name":"LB.UPDATE"}, {"name":"ACCOUNT.DISA
BLE"}, {"name":"ACCOUNT.CREATE"}, {"name":"ACCOUNT.DELETE"}, {"name":"USER.LOGIN"}, {"name":"USER.LOGOUT"}, {"name":"USER.CREATE"}, {"name":"USER.DELETE"}, {"name":"USER.DISABLE"}, {"name":"USER.UPDATE"}, {"name":"USER.ENABLE"}, {"name":"TEMPLATE.CREATE"}, {"name":"TEMPLATE.DELETE"}, {"name":"TEMPLATE.UPDATE"}, {"name":"TEMPLATE.DOWNLOAD.START"}, {"name":"TEMPLATE.DOWNLOAD.SUCCESS"}, {"name":"TEMPLATE.DOWNLOAD.FAILED"}, {"name":"TEMPLATE.COPY"}, {"name":"TEMPLATE.EXTRACT"}, {"name":"TEMPLATE.UPLOAD"}, {"name":"TEMPLATE.CLEANUP"}, {"name":"VOLUME.CREATE"}, {"name":"VOLUME.DELETE"}, {"name":"VOLUME.ATTACH"}, {"name":"VOLUME.DETACH"}, {"name":"VOLUME.EXTRACT"}, {"name":"VOLUME.UPLOAD"}, {"name":"DOMAIN.CREATE"}, {"name":"DOMAIN.DELETE"}, {"name":"DOMAIN.UPDATE"}, {"name":"SNAPSHOT.CREATE"}, {"name":"SNAPSHOT.DELETE"}, {"name":"SNAPSHOTPOLICY.CREATE"}, {"name":"SNAPSHOTPOLICY.UPDATE"}, {"name":"SNAPSHOTPOLICY.DELETE"}, {"name":"ISO.CREATE"}, {"name":"ISO.DELETE"}, {"name":"ISO.COPY"}, {
"name":"ISO.ATTACH"}, {"name":"ISO.DETACH"}, {"name":"ISO.EXTRACT"}, {"name":"ISO.UPLOAD"}, {"name":"SSVM.CREATE"}, {"name":"SSVM.DESTROY"}, {"name":"SSVM.START"}, {"name":"SSVM.STOP"}, {"name":"SSVM.REBOOT"}, {"name":"SSVM.HA"}, {"name":"SERVICE.OFFERING.CREATE"}, {"name":"SERVICE.OFFERING.EDIT"}, {"name":"SERVICE.OFFERING.DELETE"}, {"name":"DISK.OFFERING.CREATE"}, {"name":"DISK.OFFERING.EDIT"}, {"name":"DISK.OFFERING.DELETE"}, {"name":"NETWORK.OFFERING.CREATE"}, {"name":"NETWORK.OFFERING.ASSIGN"}, {"name":"NETWORK.OFFERING.EDIT"}, {"name":"NETWORK.OFFERING.REMOVE"}, {"name":"NETWORK.OFFERING.DELETE"}, {"name":"POD.CREATE"}, {"name":"POD.EDIT"}, {"name":"POD.DELETE"}, {"name":"ZONE.CREATE"}, {"name":"ZONE.EDIT"}, {"name":"ZONE.DELETE"}, {"name":"VLAN.IP.RANGE.CREATE"}, {"name":"VLAN.IP.RANGE.DELETE"}, {"name":"CONFIGURATION.VALUE.EDIT"}, {"name":"SG.AUTH.INGRESS"}, {"name":"SG.REVOKE.INGRESS"}, {"name":"SG.CREATE"}, {"name":"SG.DELETE"}, {"name":"HOST.RECONNECT"}, {"name":"MAINT.CA
NCEL"}, {"name":"MAINT.CANCEL.PS"}, {"name":"MAINT.PREPARE"}, {"name":"MAINT.PREPARE.PS"}, {"name":"VPN.REMOTE.ACCESS.CREATE"}, {"name":"VPN.REMOTE.ACCESS.DESTROY"}, {"name":"VPN.USER.ADD"}, {"name":"VPN.USER.REMOVE"}, {"name":"NETWORK.RESTART"}, {"name":"UPLOAD.CUSTOM.CERTIFICATE"}, {"name":"STATICNAT.ENABLE"}, {"name":"STATICNAT.DISABLE"}, {"name":"ZONE.VLAN.ASSIGN"}, {"name":"ZONE.VLAN.RELEASE"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json
deleted file mode 100644
index e93d76e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listfirewallrulesresponse.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "listfirewallrulesresponse" : { "count":3 ,"firewallrule" : [
- {"id":2017,"protocol":"tcp","startport":"30","endport":"35","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
- {"id":2016,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":2,"ipaddress":"10.27.27.51","state":"Active","cidrlist":"0.0.0.0/0"},
- {"id":10,"protocol":"tcp","startport":"22","endport":"22","ipaddressid":8,"ipaddress":"10.27.27.57","state":"Active","cidrlist":"0.0.0.0/0"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json
deleted file mode 100644
index 5d1fcf3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhostsresponse.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "listhostsresponse" : { "count":4 ,"host" : [
- {"id":1,"name":"cs2-xevsrv.alucloud.local","state":"Up","type":"Routing","ipaddress":"10.26.26.107","zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","version":"2.2.12.20110928142833","hypervisor":"XenServer","cpunumber":24,"cpuspeed":2266,"cpuallocated":"2.76%","cpuused":"0.1%","cpuwithoverprovisioning":"54384.0","networkkbsread":4443,"networkkbswrite":15048,"memorytotal":100549733760,"memoryallocated":3623878656,"memoryused":3623878656,"capabilities":"xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"clusterid":1,"clustername":"Xen Clust 1","clustertype":"CloudManaged","islocalstorageactive":false,"created":"2011-11-26T23:28:36+0200","events":"PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping","hosttags":"","h
asEnoughCapacity":false,"allocationstate":"Enabled"},
- {"id":2,"name":"nfs://10.26.26.165/mnt/nfs/cs_sec","state":"Alert","disconnected":"2011-11-26T23:33:38+0200","type":"SecondaryStorage","ipaddress":"nfs","zoneid":1,"zonename":"Dev Zone 1","version":"2.2.12.20110928142833","hypervisor":"None","lastpinged":"1970-01-16T00:42:30+0200","islocalstorageactive":false,"created":"2011-11-26T23:33:38+0200","events":"ManagementServerDown; AgentDisconnected; Remove; MaintenanceRequested; AgentConnected; Ping","hasEnoughCapacity":false,"allocationstate":"Enabled"},
- {"id":3,"name":"s-1-VM","state":"Up","type":"SecondaryStorageVM","ipaddress":"10.26.26.81","zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","version":"2.2.12.20110928142833","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"islocalstorageactive":false,"created":"2011-11-26T23:35:51+0200","events":"PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping","hasEnoughCapacity":false,"allocationstate":"Enabled"},
- {"id":4,"name":"v-2-VM","state":"Up","type":"ConsoleProxy","ipaddress":"10.26.26.96","zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","version":"2.2.12.20110928142833","lastpinged":"1970-01-16T00:54:43+0200","managementserverid":223098941760041,"islocalstorageactive":false,"created":"2011-11-26T23:36:46+0200","events":"PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping","hasEnoughCapacity":false,"allocationstate":"Enabled"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json
deleted file mode 100644
index a8afd87..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listhypervisorsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listhypervisorsresponse" : { "hypervisor" : [ {"name":"KVM"}, {"name":"VMware"}, {"name":"XenServer"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json
deleted file mode 100644
index 984f6ee..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listipforwardingrulesresponse.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "listipforwardingrulesresponse": {
- "count": 1,
- "ipforwardingrule": [{
- "id": 66,
- "protocol": "tcp",
- "virtualmachineid": 58,
- "virtualmachinename": "i-4-58-VM",
- "virtualmachinedisplayname": "i-4-58-VM",
- "ipaddressid": 15,
- "ipaddress": "10.27.27.64",
- "startport": 22,
- "endport": 22,
- "state": "Active"
- }]
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json
deleted file mode 100644
index c1dba0b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listisosresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listisosresponse" : { "count":2 ,"iso" : [ {"id":"018e0928-8205-4d8e-9329-f731a9ccd488","name":"xs-tools.iso","displaytext":"xen-pv-drv-iso","ispublic":true,"created":"2012-08-21T15:45:01+0530","isready":true,"passwordenabled":false,"bootable":false,"isfeatured":true,"crossZones":false,"account":"system","domain":"ROOT","domainid":"9d189ea2-097e-4b2b-9bae-d885f5430d69","isextractable":false,"tags":[]}, {"id":"1e29244b-9cf0-4ff2-9978-677eb83f6bfb","name":"vmware-tools.iso","displaytext":"VMware Tools Installer ISO","ispublic":true,"created":"2012-08-21T15:45:01+0530","isready":true,"passwordenabled":false,"bootable":false,"isfeatured":true,"crossZones":false,"account":"system","domain":"ROOT","domainid":"9d189ea2-097e-4b2b-9bae-d885f5430d69","isextractable":false,"tags":[]} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json
deleted file mode 100644
index 6093882..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listloadbalancerrulesresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listloadbalancerrulesresponse" : { "count":1 ,"loadbalancerrule" : [
- {"id":93,"name":"Ranny","publicipid":10,"publicip":"10.27.27.59","publicport":"80","privateport":"80","algorithm":"roundrobin","cidrlist":"","account":"admin","domainid":1,"domain":"ROOT","state":"Add","zoneid":1} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json
deleted file mode 100644
index 76947e8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworkofferingsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listnetworkofferingsresponse" : { "networkoffering" : [ {"id":6,"name":"DefaultVirtualizedNetworkOffering","displaytext":"Virtual Vlan","traffictype":"Guest","isdefault":true,"specifyvlan":false,"availability":"Required","networkrate":200}, {"id":7,"name":"DefaultDirectNetworkOffering","displaytext":"Direct","traffictype":"Public","isdefault":true,"specifyvlan":false,"availability":"Required","networkrate":200} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json
deleted file mode 100644
index 2f10824..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse-2.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listnetworksresponse" : { "network" : [ {"id":204,"name":"Virtual Network","displaytext":"A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.","broadcastdomaintype":"Vlan","traffictype":"Guest","zoneid":2,"networkofferingid":6,"networkofferingname":"DefaultVirtualizedNetworkOffering","networkofferingdisplaytext":"Virtual Vlan","networkofferingavailability":"Required","isshared":false,"issystem":false,"state":"Implemented","related":204,"broadcasturi":"vlan://240","dns1":"8.8.8.8","type":"Virtual","account":"adrian","domainid":1,"domain":"ROOT","isdefault":true,"service":[{"name":"Vpn","capability":[{"name":"SupportedVpnTypes","value":"pptp,l2tp,ipsec"}]},{"name":"Gateway"},{"name":"UserData"},{"name":"Dhcp"},{"name":"Firewall","capability":[{"name":"SupportedSourceNatTypes","value":"per account"},{"name":"StaticNat","value":"true"},{"name":"TrafficStatistics","value":"
per public ip"},{"name":"PortForwarding","value":"true"},{"name":"MultipleIps","value":"true"},{"name":"SupportedProtocols","value":"tcp,udp"}]},{"name":"Dns"},{"name":"Lb","capability":[{"name":"SupportedLbAlgorithms","value":"roundrobin,leastconn,source"},{"name":"SupportedProtocols","value":"tcp, udp"}]}],"networkdomain":"cs3cloud.internal"} ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json
deleted file mode 100644
index 1e5fa8d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listnetworksresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listnetworksresponse" : { "network" : [ {"id":204,"name":"Virtual Network","displaytext":"A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.","broadcastdomaintype":"Vlan","traffictype":"Guest","zoneid":1,"networkofferingid":6,"networkofferingname":"DefaultVirtualizedNetworkOffering","networkofferingdisplaytext":"Virtual Vlan","networkofferingavailability":"Required","isshared":false,"issystem":false,"state":"Implemented","related":204,"broadcasturi":"vlan://240","dns1":"8.8.8.8","type":"Virtual","account":"adrian","domainid":1,"domain":"ROOT","isdefault":true,"service":[{"name":"Vpn","capability":[{"name":"SupportedVpnTypes","value":"pptp,l2tp,ipsec"}]},{"name":"Gateway"},{"name":"UserData"},{"name":"Dhcp"},{"name":"Firewall","capability":[{"name":"SupportedSourceNatTypes","value":"per account"},{"name":"StaticNat","value":"true"},{"name":"TrafficStatistics","value":"
per public ip"},{"name":"PortForwarding","value":"true"},{"name":"MultipleIps","value":"true"},{"name":"SupportedProtocols","value":"tcp,udp"}]},{"name":"Dns"},{"name":"Lb","capability":[{"name":"SupportedLbAlgorithms","value":"roundrobin,leastconn,source"},{"name":"SupportedProtocols","value":"tcp, udp"}]}],"networkdomain":"cs3cloud.internal"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json
deleted file mode 100644
index ed5bc6b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listoscategoriesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listoscategoriesresponse" : { "oscategory" : [ {"id":1,"name":"CentOS"}, {"id":2,"name":"Debian"}, {"id":3,"name":"Oracle"}, {"id":4,"name":"RedHat"}, {"id":5,"name":"SUSE"}, {"id":6,"name":"Windows"}, {"id":7,"name":"Other"}, {"id":8,"name":"Novel"}, {"id":9,"name":"Unix"}, {"id":10,"name":"Ubuntu"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json
deleted file mode 100644
index c892e39..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listostypesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listostypesresponse" : { "ostype" : [ {"id":69,"oscategoryid":7,"description":"Asianux 3(32-bit)"}, {"id":70,"oscategoryid":7,"description":"Asianux 3(64-bit)"}, {"id":1,"oscategoryid":1,"description":"CentOS 4.5 (32-bit)"}, {"id":2,"oscategoryid":1,"description":"CentOS 4.6 (32-bit)"}, {"id":3,"oscategoryid":1,"description":"CentOS 4.7 (32-bit)"}, {"id":4,"oscategoryid":1,"description":"CentOS 4.8 (32-bit)"}, {"id":5,"oscategoryid":1,"description":"CentOS 5.0 (32-bit)"}, {"id":6,"oscategoryid":1,"description":"CentOS 5.0 (64-bit)"}, {"id":7,"oscategoryid":1,"description":"CentOS 5.1 (32-bit)"}, {"id":8,"oscategoryid":1,"description":"CentOS 5.1 (64-bit)"}, {"id":9,"oscategoryid":1,"description":"CentOS 5.2 (32-bit)"}, {"id":10,"oscategoryid":1,"description":"CentOS 5.2 (64-bit)"}, {"id":11,"oscategoryid":1,"description":"CentOS 5.3 (32-bit)"}, {"id":12,"oscategoryid":1,"description":"CentOS 5.3 (64-bit)"}, {"id":13,"oscategoryid":1,"description":"CentOS 5.4 (32-bit)"}, {"id":14
,"oscategoryid":1,"description":"CentOS 5.4 (64-bit)"}, {"id":111,"oscategoryid":1,"description":"CentOS 5.5 (32-bit)"}, {"id":112,"oscategoryid":1,"description":"CentOS 5.5 (64-bit)"}, {"id":73,"oscategoryid":2,"description":"Debian GNU/Linux 4(32-bit)"}, {"id":74,"oscategoryid":2,"description":"Debian GNU/Linux 4(64-bit)"}, {"id":72,"oscategoryid":2,"description":"Debian GNU/Linux 5(64-bit)"}, {"id":15,"oscategoryid":2,"description":"Debian GNU/Linux 5.0 (32-bit)"}, {"id":132,"oscategoryid":2,"description":"Debian GNU/Linux 6(32-bit)"}, {"id":133,"oscategoryid":2,"description":"Debian GNU/Linux 6(64-bit)"}, {"id":102,"oscategoryid":6,"description":"DOS"}, {"id":118,"oscategoryid":4,"description":"Fedora 10"}, {"id":117,"oscategoryid":4,"description":"Fedora 11"}, {"id":116,"oscategoryid":4,"description":"Fedora 12"}, {"id":115,"oscategoryid":4,"description":"Fedora 13"}, {"id":120,"oscategoryid":4,"description":"Fedora 8"}, {"id":119,"oscategoryid":4,"description":"Fedora 9"}, {"i
d":83,"oscategoryid":9,"description":"FreeBSD (32-bit)"}, {"id":84,"oscategoryid":9,"description":"FreeBSD (64-bit)"}, {"id":92,"oscategoryid":6,"description":"Microsoft Small Bussiness Server 2003"}, {"id":78,"oscategoryid":8,"description":"Novell Netware 5.1"}, {"id":77,"oscategoryid":8,"description":"Novell Netware 6.x"}, {"id":68,"oscategoryid":7,"description":"Open Enterprise Server"}, {"id":16,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.0 (32-bit)"}, {"id":17,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.0 (64-bit)"}, {"id":18,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.1 (32-bit)"}, {"id":19,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.1 (64-bit)"}, {"id":20,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.2 (32-bit)"}, {"id":21,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.2 (64-bit)"}, {"id":22,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.3 (32-bit)"}, {"id":23,"oscategoryid":3,"descripti
on":"Oracle Enterprise Linux 5.3 (64-bit)"}, {"id":24,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.4 (32-bit)"}, {"id":25,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.4 (64-bit)"}, {"id":134,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.5 (32-bit)"}, {"id":135,"oscategoryid":3,"description":"Oracle Enterprise Linux 5.5 (64-bit)"}, {"id":104,"oscategoryid":7,"description":"OS/2"}, {"id":60,"oscategoryid":7,"description":"Other (32-bit)"}, {"id":103,"oscategoryid":7,"description":"Other (64-bit)"}, {"id":75,"oscategoryid":7,"description":"Other 2.6x Linux (32-bit)"}, {"id":76,"oscategoryid":7,"description":"Other 2.6x Linux (64-bit)"}, {"id":98,"oscategoryid":7,"description":"Other Linux (32-bit)"}, {"id":99,"oscategoryid":7,"description":"Other Linux (64-bit)"}, {"id":59,"oscategoryid":10,"description":"Other Ubuntu (32-bit)"}, {"id":100,"oscategoryid":10,"description":"Other Ubuntu (64-bit)"}, {"id":131,"oscategoryid":10,"description":"Red Hat E
nterprise Linux 2"}, {"id":66,"oscategoryid":4,"description":"Red Hat Enterprise Linux 3(32-bit)"}, {"id":67,"oscategoryid":4,"description":"Red Hat Enterprise Linux 3(64-bit)"}, {"id":106,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4(64-bit)"}, {"id":26,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.5 (32-bit)"}, {"id":27,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.6 (32-bit)"}, {"id":28,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.7 (32-bit)"}, {"id":29,"oscategoryid":4,"description":"Red Hat Enterprise Linux 4.8 (32-bit)"}, {"id":30,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.0 (32-bit)"}, {"id":31,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.0 (64-bit)"}, {"id":32,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.1 (32-bit)"}, {"id":33,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.1 (64-bit)"}, {"id":34,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.2 (32-bit)"},
{"id":35,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.2 (64-bit)"}, {"id":36,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.3 (32-bit)"}, {"id":37,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.3 (64-bit)"}, {"id":38,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.4 (32-bit)"}, {"id":39,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.4 (64-bit)"}, {"id":113,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.5 (32-bit)"}, {"id":114,"oscategoryid":4,"description":"Red Hat Enterprise Linux 5.5 (64-bit)"}, {"id":136,"oscategoryid":4,"description":"Red Hat Enterprise Linux 6.0 (32-bit)"}, {"id":137,"oscategoryid":4,"description":"Red Hat Enterprise Linux 6.0 (64-bit)"}, {"id":85,"oscategoryid":9,"description":"SCO OpenServer 5"}, {"id":86,"oscategoryid":9,"description":"SCO UnixWare 7"}, {"id":79,"oscategoryid":9,"description":"Sun Solaris 10(32-bit)"}, {"id":80,"oscategoryid":9,"description":"Sun Solaris 10(64-bit)"}, {
"id":82,"oscategoryid":9,"description":"Sun Solaris 8(Experimental)"}, {"id":81,"oscategoryid":9,"description":"Sun Solaris 9(Experimental)"}, {"id":109,"oscategoryid":5,"description":"SUSE Linux Enterprise 10(32-bit)"}, {"id":110,"oscategoryid":5,"description":"SUSE Linux Enterprise 10(64-bit)"}, {"id":96,"oscategoryid":5,"description":"SUSE Linux Enterprise 8(32-bit)"}, {"id":97,"oscategoryid":5,"description":"SUSE Linux Enterprise 8(64-bit)"}, {"id":107,"oscategoryid":5,"description":"SUSE Linux Enterprise 9(32-bit)"}, {"id":108,"oscategoryid":5,"description":"SUSE Linux Enterprise 9(64-bit)"}, {"id":41,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP1 (32-bit)"}, {"id":42,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP1 (64-bit)"}, {"id":43,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP2 (32-bit)"}, {"id":44,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 10 SP2 (64-bit)"}, {"id":45,"oscategoryid":5,"descripti
on":"SUSE Linux Enterprise Server 10 SP3 (64-bit)"}, {"id":46,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 11 (32-bit)"}, {"id":47,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 11 (64-bit)"}, {"id":40,"oscategoryid":5,"description":"SUSE Linux Enterprise Server 9 SP4 (32-bit)"}, {"id":121,"oscategoryid":10,"description":"Ubuntu 10.04 (32-bit)"}, {"id":126,"oscategoryid":10,"description":"Ubuntu 10.04 (64-bit)"}, {"id":125,"oscategoryid":10,"description":"Ubuntu 8.04 (32-bit)"}, {"id":130,"oscategoryid":10,"description":"Ubuntu 8.04 (64-bit)"}, {"id":124,"oscategoryid":10,"description":"Ubuntu 8.10 (32-bit)"}, {"id":129,"oscategoryid":10,"description":"Ubuntu 8.10 (64-bit)"}, {"id":123,"oscategoryid":10,"description":"Ubuntu 9.04 (32-bit)"}, {"id":128,"oscategoryid":10,"description":"Ubuntu 9.04 (64-bit)"}, {"id":122,"oscategoryid":10,"description":"Ubuntu 9.10 (32-bit)"}, {"id":127,"oscategoryid":10,"description":"Ubuntu 9.10 (64-bit)"}, {"id":95,"osca
tegoryid":6,"description":"Windows 2000 Advanced Server"}, {"id":105,"oscategoryid":6,"description":"Windows 2000 Professional"}, {"id":61,"oscategoryid":6,"description":"Windows 2000 Server"}, {"id":55,"oscategoryid":6,"description":"Windows 2000 Server SP4 (32-bit)"}, {"id":65,"oscategoryid":6,"description":"Windows 3.1"}, {"id":48,"oscategoryid":6,"description":"Windows 7 (32-bit)"}, {"id":49,"oscategoryid":6,"description":"Windows 7 (64-bit)"}, {"id":63,"oscategoryid":6,"description":"Windows 95"}, {"id":62,"oscategoryid":6,"description":"Windows 98"}, {"id":64,"oscategoryid":6,"description":"Windows NT 4"}, {"id":87,"oscategoryid":6,"description":"Windows Server 2003 DataCenter Edition(32-bit)"}, {"id":88,"oscategoryid":6,"description":"Windows Server 2003 DataCenter Edition(64-bit)"}, {"id":50,"oscategoryid":6,"description":"Windows Server 2003 Enterprise Edition(32-bit)"}, {"id":51,"oscategoryid":6,"description":"Windows Server 2003 Enterprise Edition(64-bit)"}, {"id":89,"osc
ategoryid":6,"description":"Windows Server 2003 Standard Edition(32-bit)"}, {"id":90,"oscategoryid":6,"description":"Windows Server 2003 Standard Edition(64-bit)"}, {"id":91,"oscategoryid":6,"description":"Windows Server 2003 Web Edition"}, {"id":52,"oscategoryid":6,"description":"Windows Server 2008 (32-bit)"}, {"id":53,"oscategoryid":6,"description":"Windows Server 2008 (64-bit)"}, {"id":54,"oscategoryid":6,"description":"Windows Server 2008 R2 (64-bit)"}, {"id":56,"oscategoryid":6,"description":"Windows Vista (32-bit)"}, {"id":101,"oscategoryid":6,"description":"Windows Vista (64-bit)"}, {"id":93,"oscategoryid":6,"description":"Windows XP (32-bit)"}, {"id":94,"oscategoryid":6,"description":"Windows XP (64-bit)"}, {"id":57,"oscategoryid":6,"description":"Windows XP SP2 (32-bit)"}, {"id":58,"oscategoryid":6,"description":"Windows XP SP3 (32-bit)"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json
deleted file mode 100644
index 9b63799..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpodsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listpodsresponse" : { "count":2 ,"pod" : [ {"id":1,"name":"Dev Pod 1","zoneid":1,"zonename":"Dev Zone 1","gateway":"10.26.26.254","netmask":"255.255.255.0","startip":"10.26.26.50","endip":"10.26.26.100","allocationstate":"Enabled"}, {"id":2,"name":"Dev Pod 2","zoneid":2,"zonename":"Dev Zone 2","gateway":"10.22.22.254","netmask":"255.255.255.0","startip":"10.22.22.25","endip":"10.22.22.50","allocationstate":"Enabled"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json
deleted file mode 100644
index c385f7e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listportforwardingrulesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listportforwardingrulesresponse" : { "portforwardingrule" : [ {"id":18,"privateport":"22","protocol":"tcp","publicport":"22","virtualmachineid":89,"virtualmachinename":"i-3-89-VM","ipaddressid":34,"ipaddress":"72.52.126.63","state":"Active"}, {"id":15,"privateport":"22","protocol":"tcp","publicport":"2022","virtualmachineid":3,"virtualmachinename":"i-3-3-VM","ipaddressid":3,"ipaddress":"72.52.126.32","state":"Active","cidrlist":"0.0.0.0/1,128.0.0.0/1"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json
deleted file mode 100644
index 33273ef..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listprojectsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listprojectsresponse" : { "count":2 ,"project" : [ {"id":"489da162-0b77-489d-b044-ce39aa018b1f","name":"NN-HA-T1","displaytext":"","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","account":"thyde","state":"Active"}, {"id":"1c11f22c-15ac-4fa7-b833-4d748df317b7","name":"hive","displaytext":"Hive","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","account":"prasadm","state":"Active"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json
deleted file mode 100644
index 914c95a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listpublicipaddressesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listpublicipaddressesresponse" : { "publicipaddress" : [ {"id":30,"ipaddress":"72.52.126.59","allocated":"2011-02-19T21:15:01-0800","zoneid":1,"zonename":"San Jose 1","issourcenat":false,"account":"adrian","domainid":1,"domain":"ROOT","forvirtualnetwork":true,"isstaticnat":false,"associatednetworkid":204,"networkid":200,"state":"Allocated"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json
deleted file mode 100644
index 247782a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listresourcelimitsresponse.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "listresourcelimitsresponse" : { "count":8 ,"resourcelimit" : [
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"0","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"1","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"2","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"3","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"4","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"7","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"8","max":-1},
-{"account":"jclouds","domainid":457,"domain":"AA000062-jclouds-dev","resourcetype":"9","max":-1}] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json
deleted file mode 100644
index 25136a3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsecuritygroupsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listsecuritygroupsresponse" : { "securitygroup" : [ {"id":12,"name":"adriancole","account":"adrian","domainid":1,"domain":"ROOT"}, {"id":13,"name":"default","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":5,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"adriancole","account":"adrian"},{"ruleid":6,"protocol":"udp","startport":11,"endport":11,"cidr":"1.1.1.1/24"}]}, {"id":14,"name":"1","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":7,"protocol":"tcp","startport":10,"endport":10,"cidr":"1.1.1.1/24"},{"ruleid":8,"protocol":"tcp","startport":10,"endport":10,"cidr":"2.2.2.2/16"}]}, {"id":15,"name":"2","description":"description","account":"adrian","domainid":1,"domain":"ROOT"}, {"id":16,"name":"with1and2","description":"description","account":"adrian","domainid":1,"domain":"ROOT","ingressrule":[{"ruleid":9,"protocol":"icmp","icmptype":-1,"icmpcode":-1,"security
groupname":"1","account":"adrian"},{"ruleid":10,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"1","account":"adrian"},{"ruleid":11,"protocol":"tcp","startport":22,"endport":22,"securitygroupname":"2","account":"adrian"}]} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json
deleted file mode 100644
index be1dab6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listserviceofferingsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listserviceofferingsresponse" : { "serviceoffering" : [ {"id":1,"name":"Small Instance","displaytext":"Small Instance - 500 MhZ CPU, 512 MB RAM - $0.05 per hour","cpunumber":1,"cpuspeed":500,"memory":512,"created":"2011-02-11T15:22:32-0800","storagetype":"shared","offerha":false}, {"id":2,"name":"Medium Instance","displaytext":"Medium Instance, 1 GhZ CPU, 1 GB RAM - $0.10 per hour","cpunumber":1,"cpuspeed":1000,"memory":1024,"created":"2011-02-11T15:22:32-0800","storagetype":"shared","offerha":false} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json
deleted file mode 100644
index 37d0def..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listsshkeypairsresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listsshkeypairsresponse" : { "count":1 ,"sshkeypair" : [
- {"name":"jclouds-keypair","fingerprint":"1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json
deleted file mode 100644
index dc3ae46..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/liststoragepoolsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "liststoragepoolsresponse" : { "count":1 ,"storagepool" : [ {"id":201,"zoneid":1,"zonename":"Dev Zone 1","podid":1,"podname":"Dev Pod 1","name":"NFS Pri 1","ipaddress":"10.26.26.165","path":"/mnt/nfs/cs_pri","created":"2011-11-26T23:33:06+0200","type":"NetworkFilesystem","clusterid":1,"clustername":"Xen Clust 1","disksizetotal":898356445184,"disksizeallocated":18276679680,"tags":"tag1","state":"Up"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json
deleted file mode 100644
index 1643700..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse-imageextension.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listtemplatesresponse" : { "count":1 ,"template" : [ {"id":"3dc6ce25-a6cf-4d60-a664-3499993b511b","name":"temp-template-ignore","displaytext":"sometext","ispublic":false,"created":"2013-06-21T12:37:01-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":false,"crossZones":false,"ostypeid":"be820210-c741-4c36-9ba1-f38363bd37d5","ostypename":"CentOS 5.6 (32-bit)","account":"andrew","zoneid":"1","zonename":"San Jose 1","status":"Download Complete","size":26843545600,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","isextractable":false,"checksum":"6dd5d7f073ff951b033a8cadb877bde2","sourcetemplateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160"} ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json
deleted file mode 100644
index 140e8ca..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listtemplatesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listtemplatesresponse" : { "template" : [ {"id":2,"name":"CentOS 5.3(64-bit) no GUI (XenServer)","displaytext":"CentOS 5.3(64-bit) no GUI (XenServer)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":false,"passwordenabled":false,"format":"VHD","isfeatured":true,"crossZones":true,"ostypeid":11,"ostypename":"CentOS 5.3 (32-bit)","account":"system","zoneid":2,"zonename":"Chicago","templatetype":"BUILTIN","hypervisor":"XenServer","domain":"ROOT","domainid":1,"isextractable":true}, {"id":4,"name":"CentOS 5.5(64-bit) no GUI (KVM)","displaytext":"CentOS 5.5(64-bit) no GUI (KVM)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":true,"crossZones":true,"ostypeid":112,"ostypename":"CentOS 5.5 (64-bit)","account":"system","zoneid":2,"zonename":"Chicago","size":8589934592,"templatetype":"BUILTIN","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":true}, {"id":203,"name":"Windows 7 KVM","displ
aytext":"Windows 7 KVM","ispublic":true,"created":"2011-03-20T22:02:18-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":true,"crossZones":false,"ostypeid":48,"ostypename":"Windows 7 (32-bit)","account":"admin","zoneid":2,"zonename":"Chicago","size":17179869184,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":false}, {"id":7,"name":"CentOS 5.3(64-bit) no GUI (vSphere)","displaytext":"CentOS 5.3(64-bit) no GUI (vSphere)","ispublic":true,"created":"2011-03-20T19:17:48-0700","isready":false,"passwordenabled":false,"format":"OVA","isfeatured":true,"crossZones":true,"ostypeid":12,"ostypename":"CentOS 5.3 (64-bit)","account":"system","zoneid":2,"zonename":"Chicago","templatetype":"BUILTIN","hypervisor":"VMware","domain":"ROOT","domainid":1,"isextractable":true}, {"id":241,"name":"kvmdev4","displaytext":"v5.6.28_Dev4","ispublic":true,"created":"2011-04-21T09:43:25-0700","isready":true,"passwordenabled":false,"format":"QCOW2","is
featured":false,"crossZones":false,"ostypeid":14,"ostypename":"CentOS 5.4 (64-bit)","account":"rs3","zoneid":2,"zonename":"Chicago","size":10737418240,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":1,"isextractable":false} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json
deleted file mode 100644
index 5175f70..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listusagerecordsresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listusagerecordsresponse" : { "count":1 ,"usagerecord" : [ {"account":"admin","accountid":2,"domainid":1,"zoneid":1,"description":"Template Id:203 Size:3117171712","usage":"24 Hrs","usagetype":7,"rawusage":"24","templateid":0,"usageid":203,"size":3117171712,"startdate":"2011-12-15'T'00:00:00+00:00","enddate":"2011-12-15'T'23:59:59+00:00"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json
deleted file mode 100644
index aae4d48..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listvirtualmachinesresponse" : { "count":1 ,"virtualmachine" : [
-{"id":"3239ade9-fd25-405c-8eda-59f0313a3fb0","name":"apb-cent32-bld","displayname":"apb-cent32-bld","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","created":"2013-04-16T16:25:57-0700","state":"Stopped","haenable":false,"zoneid":"1","zonename":"San Jose 1","hostid":"0","templateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160","templatename":"centos-6.2-x32-template","templatedisplaytext":"CentOS 6.2 x32 Template","passwordenabled":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","cpunumber":1,"cpuspeed":1600,"memory":1024,"cpuused":"0.01%","networkkbsread":319420,"networkkbswrite":3,"guestosid":"45de18f1-87c6-4646-8099-95c61f2a300a","rootdeviceid":0,"rootdevicetype":"Filesystem","securitygroup":[{"id":"50288900-28eb-4d7f-9c33-e4c26e3b66d2","name":"default","description":"Default Security Group"}],"nic":[{"id":"fd65b6fd-2c3e-4c8a-a0bc-6a5db4e8007a","networkid":"0c82cd9f-ca64-4df4-9300-b33d81562403","netmask":
"255.255.254.0","gateway":"10.20.92.3","ipaddress":"10.20.92.96","traffictype":"Guest","type":"Shared","isdefault":true,"macaddress":"06:ec:68:00:0f:04"}],"hypervisor":"KVM","instancename":"i-4-69942-VM"} ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json
deleted file mode 100644
index 0d27100..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvirtualmachinesresponse" : { "virtualmachine" : [ {"id":54,"name":"i-3-54-VM","displayname":"i-3-54-VM","account":"adrian","domainid":1,"domain":"ROOT","created":"2011-02-16T14:28:37-0800","state":"Starting","haenable":false,"zoneid":1,"zonename":"San Jose 1","templateid":2,"templatename":"CentOS 5.3(64-bit) no GUI (XenServer)","templatedisplaytext":"CentOS 5.3(64-bit) no GUI (XenServer)","passwordenabled":false,"serviceofferingid":1,"serviceofferingname":"Small Instance","cpunumber":1,"cpuspeed":500,"memory":512,"guestosid":11,"rootdeviceid":0,"rootdevicetype":"NetworkFilesystem","securitygroup":[],"jobid":63,"jobstatus":0,"nic":[{"id":72,"networkid":204,"netmask":"255.255.255.0","gateway":"10.1.1.1","ipaddress":"10.1.1.18","traffictype":"Guest","type":"Virtual","isdefault":true}],"hypervisor":"XenServer"} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json
deleted file mode 100644
index 5a41ac6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvirtualmachinesresponse3x.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvirtualmachinesresponse" : { "count":1 ,"virtualmachine" : [ {"id":"fee2ccb3-c1f2-4e7b-8465-42b390e10dff","name":"cloudstack-r-611","displayname":"cloudstack-r-611","account":"jcloud2","domainid":"ea66e3a5-d007-42e8-a0de-ec5ce778a1d7","domain":"jCloud","created":"2012-05-22T09:18:28-0700","state":"Running","haenable":false,"zoneid":"1","zonename":"Santa Clara Zone","templateid":"5c65f152-a4bc-4405-a756-fd10841a9aa7","templatename":"jclouds-6d4bdc29","templatedisplaytext":"jclouds live testCreateTemplate","passwordenabled":false,"serviceofferingid":"5305750d-df71-4da9-8cd0-e23c2236a6e2","serviceofferingname":"Micro Instance","cpunumber":1,"cpuspeed":500,"memory":256,"guestosid":"6dcd58ce-1ec6-432c-af0b-9ab4ca9207d9","rootdeviceid":0,"rootdevicetype":"IscsiLUN","securitygroup":[],"nic":[{"id":"48640c5e-90f3-45bd-abd2-a108ca8957ac","networkid":"c0d5db5b-f7d5-44e1-b854-21ecd1a09dbf","netmask":"255.255.255.0","gateway":"10.1.1.1","ipaddress":"10.1.1.227","traffictype":"Guest","ty
pe":"Isolated","isdefault":true}],"publicipid":"e202aafb-ab41-4dc0-80e9-9fcd64fbf45c","publicip":"72.52.126.110"} ] } }"
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json
deleted file mode 100644
index 2eaae46..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvlaniprangesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvlaniprangesresponse" : { "count":2 ,"vlaniprange" : [ {"id":1,"forvirtualnetwork":true,"zoneid":1,"vlan":"127","account":"system","domainid":1,"domain":"ROOT","gateway":"10.27.27.254","netmask":"255.255.255.0","startip":"10.27.27.50","endip":"10.27.27.100","networkid":200}, {"id":2,"forvirtualnetwork":false,"zoneid":2,"vlan":"untagged","account":"system","domainid":1,"domain":"ROOT","podid":2,"podname":"Dev Pod 2","gateway":"10.22.22.254","netmask":"255.255.255.0","startip":"10.22.22.51","endip":"10.22.22.100","networkid":209} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json
deleted file mode 100644
index 420f365..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesreponse-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "listvolumesresponse" : { "count":1 ,"volume" : [
-{"id":"fe1ada16-57a0-40ae-b577-01a153690fb4","name":"ROOT-69942","zoneid":"1","zonename":"San Jose 1","type":"ROOT","deviceid":0,"virtualmachineid":"3239ade9-fd25-405c-8eda-59f0313a3fb0","vmname":"apb-cent32-bld","vmdisplayname":"apb-cent32-bld","vmstate":"Stopped","size":139264,"created":"2013-04-16T16:25:57-0700","state":"Ready","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","storagetype":"local","hypervisor":"KVM","storage":"c2422.halxg.cloudera.com","destroyed":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","serviceofferingdisplaytext":"Tiny (1 core, 1GB RAM)","isextractable":false} ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json
deleted file mode 100644
index 5fa8fd1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listvolumesresponse-imageextension.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listvolumesresponse" : { "count":1 ,"volume" : [ {"id":"fe1ada16-57a0-40ae-b577-01a153690fb4","name":"ROOT-69942","zoneid":"7dbc4787-ec2f-498d-95f0-848c8c81e5da","zonename":"MTV-Zone1","type":"ROOT","deviceid":0,"virtualmachineid":"3239ade9-fd25-405c-8eda-59f0313a3fb0","vmname":"apb-cent32-bld","vmdisplayname":"apb-cent32-bld","vmstate":"Stopped","size":139264,"created":"2013-04-16T16:25:57-0700","state":"Ready","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","storagetype":"local","hypervisor":"KVM","storage":"c2422.halxg.cloudera.com","destroyed":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","serviceofferingdisplaytext":"Tiny (1 core, 1GB RAM)","isextractable":false} ] } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json
deleted file mode 100644
index 4714b86..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listzonesresponse" : { "zone" : [ {"id":1,"name":"San Jose 1","networktype":"Advanced","securitygroupsenabled":false}, {"id":2,"name":"Chicago","networktype":"Advanced","securitygroupsenabled":true} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json
deleted file mode 100644
index 1fe1dbe..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/listzonesresponse_single.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "listzonesresponse" : { "zone" : [ {"id":2,"name":"Chicago","networktype":"Advanced","securitygroupsenabled":true} ] } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json
deleted file mode 100644
index 7e1c955..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/loginresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "loginresponse" : { "timeout" : "1800", "lastname" : "Kiran", "registered" : "false", "username" : "jclouds", "firstname" : "Vijay", "domainid" : "11", "type" : "2", "userid" : "19", "sessionkey" : "uYT4/MNiglgAKiZRQkvV8QP8gn0=", "account" : "jclouds" } }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json
deleted file mode 100644
index f88dddd..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/logoutresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "logoutresponse" : { "description" : "success" } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json
deleted file mode 100644
index 294f646..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/preparehostformaintenanceresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "preparehostformaintenanceresponse" : {"warning":"this test data is fabricated","jobid":2036,"id":2017} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
deleted file mode 100644
index 7ee489d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-authorizeingress.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "queryasyncjobresultresponse": {
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresulttype": "object",
- "jobresult": {
- "securitygroup": {
- "id": "30",
- "name": "jclouds-test",
- "account": "adrian",
- "domainid": "1",
- "domain": "ROOT",
- "ingressrule": [
- {
- "ruleid": "35bb2ad4-e0cb-48a0-9534-fc4a067b5665",
- "protocol": "tcp",
- "startport": 22,
- "endport": 22,
- "cidr": "0.0.0.0/0"
- }
- ],
- "egressrule": [
-
- ]
- }
- },
- "jobid": "13330fc9-8b3e-4582-aa3e-90883c041010",
- "created": "2013-06-04T14:37:26-0700"
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json
deleted file mode 100644
index 891f9fe..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "queryasyncjobresultresponse" :
-{"accountid":"ee092437-d681-499e-b78b-f4e449128247","userid":"0c9608c8-188c-47df-a934-d66dc96b96e3","cmd":"com.cloud.api.commands.CreateTemplateCmd","jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"template":{"id":"3dc6ce25-a6cf-4d60-a664-3499993b511b","name":"temp-template-ignore","displaytext":"temp-template-ignore","ispublic":false,"created":"2013-06-21T12:37:01-0700","isready":true,"passwordenabled":false,"format":"QCOW2","isfeatured":false,"crossZones":false,"ostypeid":"be820210-c741-4c36-9ba1-f38363bd37d5","ostypename":"CentOS 5.6 (32-bit)","account":"andrew","zoneid":"1","zonename":"San Jose 1","status":"Download Complete","size":26843545600,"templatetype":"USER","hypervisor":"KVM","domain":"ROOT","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","isextractable":false,"checksum":"6dd5d7f073ff951b033a8cadb877bde2","sourcetemplateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160"}},"created":"2013-06-21T12:31:33-0700","jobid":"4e345230-8fcc-48a3-
8a37-c5fe960df671"} }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json
deleted file mode 100644
index ed2b886..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createtemplate.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : {"jobid":2716,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"template":{"id":249,"name":"jclouds-c5c7dce0","displaytext":"jclouds live testCreateTemplate","ispublic":false,"created":"2011-11-16T06:43:00-0800","isready":true,"passwordenabled":false,"format":"VHD","isfeatured":false,"crossZones":false,"ostypeid":12,"ostypename":"CentOS 5.3 (64-bit)","account":"jcloud2","zoneid":1,"zonename":"Demo5","status":"Download Complete","size":8589934592,"templatetype":"USER","hypervisor":"XenServer","domain":"jCloud","domainid":11,"isextractable":true,"checksum":"bdc1c2c49b747694f97be5042323a1fa","sourcetemplateid":202}}} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json
deleted file mode 100644
index a6c5592..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-createvolume.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "queryasyncjobresultresponse" :
- {"accountid":"43e3d66f-c8a3-43b2-a3d0-3bbc2416da14",
- "userid":"99458e63-725b-48ec-aedc-f8ccc11f5231",
- "cmd":"com.cloud.api.commands.CreateVolumeCmd",
- "jobstatus":1,
- "jobprocstatus":0,
- "jobresultcode":0,
- "jobresulttype":"object",
- "jobresult":{
- "volume":{
- "id":"f947c7b3-e079-4e7d-aacc-1509d1ae387a",
- "name":"VolumeApiExpectTest-jclouds-volume",
- "zoneid":"6f9a2921-b22a-4149-8b71-6ffc275a2177",
- "zonename":"Basic1",
- "type":"DATADISK",
- "size":1073741824,
- "created":"2013-02-05T13:41:14+0200",
- "state":"Allocated",
- "account":"admin",
- "domainid":"99f4159b-c698-4bd9-b8c5-5ac462f101eb",
- "domain":"ROOT",
- "storagetype":"shared",
- "hypervisor":"None",
- "diskofferingid":"0473f5dd-bca5-4af4-a9b6-db9e8a88a2f6",
- "diskofferingname":"Custom",
- "diskofferingdisplaytext":"Custom Disk",
- "storage":"none","destroyed":false,
- "isextractable":true,
- "tags":[]
- }
- },
- "created":"2013-02-05T13:41:14+0200",
- "jobid":"4ec82395-365a-4dad-8bd7-238c4f388702"
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json
deleted file mode 100644
index 387f56f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-extracttemplate.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : {"jobid":2720,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"template":{"id":249,"name":"jclouds-c5c7dce0","extractId":6,"accountid":19,"state":"DOWNLOAD_URL_CREATED","zoneid":1,"zonename":"Demo5","extractMode":"HTTP_DOWNLOAD","url":"https:%2F%2F72-52-126-96.realhostip.com%2Fuserdata%2Ff52f8e7d-7c89-4cf7-8e5a-b5ea17366d73.vhd"}}} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json
deleted file mode 100644
index db705b0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipaddress.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : {"jobid":860,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"ipaddress":{"id":6,"ipaddress":"72.52.126.35","allocated":"2011-02-23T20:15:01-0800","zoneid":1,"zonename":"San Jose 1","issourcenat":false,"account":"adrian","domainid":1,"domain":"ROOT","forvirtualnetwork":true,"isstaticnat":false,"associatednetworkid":204,"networkid":200,"state":"Allocating"}}} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json
deleted file mode 100644
index eb90915..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "queryasyncjobresultresponse" : {"jobid":1133,"jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"ipforwardingrule":{"id":109,"protocol":"tcp","virtualmachineid":226,"virtualmachinename":"i-3-226-VM","ipaddressid":36,"ipaddress":"72.52.126.65","startport":22,"endport":22,"state":"Active"}}} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json
deleted file mode 100644
index f11c9eb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-stopvirtualmachine-imageextension.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "queryasyncjobresultresponse" :
-{"accountid":"ee092437-d681-499e-b78b-f4e449128247","userid":"0c9608c8-188c-47df-a934-d66dc96b96e3","cmd":"com.cloud.api.commands.StopVMCmd","jobstatus":1,"jobprocstatus":0,"jobresultcode":0,"jobresulttype":"object","jobresult":{"virtualmachine":{"id":"3239ade9-fd25-405c-8eda-59f0313a3fb0","name":"apb-cent32-bld","displayname":"apb-cent32-bld","account":"andrew","domainid":"41a4917b-7952-499d-ba7f-4c57464d3dc8","domain":"ROOT","created":"2013-04-16T16:25:57-0700","state":"Stopped","haenable":false,"zoneid":"1","zonename":"San Jose 1","hostid":"0","templateid":"9d597afb-4d3d-4a69-bf45-f95b0d1ee160","templatename":"centos-6.2-x32-template","templatedisplaytext":"CentOS 6.2 x32 Template","passwordenabled":false,"serviceofferingid":"7cc4f8c3-7c56-4155-9916-9f42072ea712","serviceofferingname":"Tiny","cpunumber":1,"cpuspeed":1600,"memory":1024,"cpuused":"-65.18%","networkkbsread":319420,"networkkbswrite":3,"guestosid":"45de18f1-87c6-4646-8099-95c61f2a300a","rootdeviceid":0,"rootdevicetype
":"Filesystem","securitygroup":[{"id":"50288900-28eb-4d7f-9c33-e4c26e3b66d2","name":"default","description":"Default Security Group"}],"nic":[{"id":"fd65b6fd-2c3e-4c8a-a0bc-6a5db4e8007a","networkid":"0c82cd9f-ca64-4df4-9300-b33d81562403","netmask":"255.255.254.0","gateway":"10.20.92.3","ipaddress":"10.20.92.96","traffictype":"Guest","type":"Shared","isdefault":true,"macaddress":"06:ec:68:00:0f:04"}],"hypervisor":"KVM","instancename":"i-4-69942-VM"}},"created":"2013-06-21T12:49:59-0700","jobid":"a7d5127b-24a2-4a44-a4a7-25a6d057b453"} }
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
deleted file mode 100644
index cc75e11..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine-securitygroup.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
- "queryasyncjobresultresponse": {
- "jobid": 50006,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 1234,
- "name": "i-3-218-VM",
- "displayname": "i-3-218-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:39:10-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [
- {
- "id": "30",
- "name": "jclouds-test",
- "account": "adrian",
- "domainid": "1",
- "domain": "ROOT",
- "ingressrule": [
- {
- "ruleid": "35bb2ad4-e0cb-48a0-9534-fc4a067b5665",
- "protocol": "tcp",
- "startport": 22,
- "endport": 22,
- "cidr": "0.0.0.0/0"
- }
- ],
- "egressrule": [
-
- ]
- }
- ],
- "password": "dD7jwajkh",
- "nic": [{
- "id": 250,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.195",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:39:10-0800"
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json
deleted file mode 100644
index 6e4654a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/queryasyncjobresultresponse-virtualmachine.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- "queryasyncjobresultresponse": {
- "jobid": 50006,
- "accountid": 3,
- "userid": 3,
- "cmd": "com.cloud.api.commands.DeployVMCmd",
- "jobstatus": 1,
- "jobprocstatus": 0,
- "jobresultcode": 0,
- "jobresult": {
- "virtualmachine": {
- "id": 1234,
- "name": "i-3-218-VM",
- "displayname": "i-3-218-VM",
- "account": "adrian",
- "domainid": 1,
- "domain": "ROOT",
- "created": "2011-02-27T08:39:10-0800",
- "state": "Running",
- "haenable": false,
- "zoneid": 1,
- "zonename": "San Jose 1",
- "templateid": 203,
- "templatename": "Centos 5.3 Password Managed",
- "templatedisplaytext": "Centos 5.3 Password Managed",
- "passwordenabled": true,
- "serviceofferingid": 1,
- "serviceofferingname": "Small Instance",
- "cpunumber": 1,
- "cpuspeed": 500,
- "memory": 512,
- "guestosid": 12,
- "rootdeviceid": 0,
- "rootdevicetype": "NetworkFilesystem",
- "securitygroup": [],
- "password": "dD7jwajkh",
- "nic": [{
- "id": 250,
- "networkid": 204,
- "netmask": "255.255.255.0",
- "gateway": "10.1.1.1",
- "ipaddress": "10.1.1.195",
- "traffictype": "Guest",
- "type": "Virtual",
- "isdefault": true
- }],
- "hypervisor": "XenServer"
- }
- },
- "created": "2011-02-27T08:39:10-0800"
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json
deleted file mode 100644
index 2b86f49..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/reconnecthostresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "reconnecthostresponse" : {"warning":"this test data is fabricated","jobid":2036,"id":2017} }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json
deleted file mode 100644
index c0be454..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registerisoresponse.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "registerisoresponse" : { "count":1 ,"iso" : [
-{"id":"b52c509d-c6e2-452c-b6ec-aa00720ed6cd","name":"ubuntu10.10","displaytext":"ubuntu 10.10 (32 bit)","ispublic":true,"created":"2012-08-21T15:45:01+0530","isready":false,"bootable":true,"isfeatured":false,"crossZones":false,"ostypeid":"0e0335d9-b6cc-4808-bddf-0828e66a0d03","ostypename":"Ubuntu 10.10 (32-bit)","account":"admin","zoneid":"6f9a2921-b22a-4149-8b71-6ffc275a2177","zonename":"Basic1","status":"","domain":"ROOT","domainid":"99f4159b-c698-4bd9-b8c5-5ac462f101eb","isextractable":false} ]
-}}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json
deleted file mode 100644
index 1c3f35e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registersshkeypairresponse.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "registersshkeypairresponse" : { "keypair" :
- {"name":"jclouds-keypair","fingerprint":"8f:f1:91:2d:b1:a8:51:f1:79:cf:c4:31:c4:14:9d:81"} } }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json
deleted file mode 100644
index 9e6a958..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/resources/registeruserkeysresponse.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "registeruserkeysresponse" : { "userkeys" : {"apikey":"5nn6IAQ-0BYuAKTu45rf49VsyX0rg9t48TpY8NKsduE5t-_1_g_AU8ZjP3OJvVdlzWKL3Lgfa6_nkC9hU6NyQQ","secretkey":"GSCDYzj65CiSkxzCJxlFvcF52qglM7HbuG6QL7zYVeWVhVO8GnW85wGTBBuZ3xpzEN_UfKnsORvrNszYQ1ofAw"} } }
\ No newline at end of file
[06/51] [abbrv] stratos git commit: remove cricket files
Posted by im...@apache.org.
remove cricket files
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0c047de2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0c047de2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0c047de2
Branch: refs/heads/master
Commit: 0c047de2917240dde0fb865b6812f55f78dd07a6
Parents: 3b7cd88
Author: asankasa <as...@wso2.com>
Authored: Mon Oct 13 10:39:02 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:28 2014 +0530
----------------------------------------------------------------------
.../out/production/untitled/Cricket.class | Bin 1897 -> 0 bytes
.../out/production/untitled/Cricket1.class | Bin 733 -> 0 bytes
.../out/production/untitled/NumberGrid.class | Bin 2379 -> 0 bytes
.../untitled/out/production/untitled/test.class | Bin 2164 -> 0 bytes
components/untitled/src/Cricket.java | 94 ----------------
components/untitled/src/Cricket1.java | 16 ---
components/untitled/src/NumberGrid.java | 106 -------------------
components/untitled/src/test.java | 86 ---------------
8 files changed, 302 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/out/production/untitled/Cricket.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/Cricket.class b/components/untitled/out/production/untitled/Cricket.class
deleted file mode 100644
index 6188da5..0000000
Binary files a/components/untitled/out/production/untitled/Cricket.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/out/production/untitled/Cricket1.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/Cricket1.class b/components/untitled/out/production/untitled/Cricket1.class
deleted file mode 100644
index 59fea0d..0000000
Binary files a/components/untitled/out/production/untitled/Cricket1.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/out/production/untitled/NumberGrid.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/NumberGrid.class b/components/untitled/out/production/untitled/NumberGrid.class
deleted file mode 100644
index 86e7088..0000000
Binary files a/components/untitled/out/production/untitled/NumberGrid.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/out/production/untitled/test.class
----------------------------------------------------------------------
diff --git a/components/untitled/out/production/untitled/test.class b/components/untitled/out/production/untitled/test.class
deleted file mode 100644
index e42be12..0000000
Binary files a/components/untitled/out/production/untitled/test.class and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/src/Cricket.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/Cricket.java b/components/untitled/src/Cricket.java
deleted file mode 100644
index 021e9eb..0000000
--- a/components/untitled/src/Cricket.java
+++ /dev/null
@@ -1,94 +0,0 @@
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class Cricket {
-
- static String[] days = { "mon", "tues", "wed", "thu", "fri", "sat", "sun" };
- static int[] day30 = { 4, 6, 9, 11 };
- static int[] day31 = { 1, 3,5,7,8,10,12};
-
- public static int getMonth() {
-
-
- int dayOne = 1;
- String curMon = "Jan";
- String curDay = "wed";
- int curYr = 2014;
-
- int count = 1;
- int newDay = 29;
- boolean monExits = false;
-
-
- if (!monExits) {
- if (curYr % 4 == 0) {
-
- } else {
- count--;
- }
- }
- return count;
- }
-
-
-
- public static void main(String[] args) throws IOException {
-
-
- boolean monExits = false;
- BufferedReader inp = new BufferedReader( new
- InputStreamReader(System.in));
- int T = Integer.parseInt(inp.readLine());
-
- for (int i = 2014; i < 2014 + T; i++) {
-
- for(int month=1; month<=12; month++){
-
- //if mont has 30 days
-
- for (int a : day30) {
- if (a == month) {
- // count++;
- monExits = true;
-
- }
- }
- for (int a : day31) {
- if (a == month) {
- // count=count+2;
- monExits = true;
-
-
-
- }
- }
-
- if(monExits==false){
-
- //day 29,30
-
- }
-
-
-
- }
-
-
-
-
- }
-
-
- /*
- * countDays();
- *
- * HashMap<Integer, String[]> months = new HashMap<>(); months.put(30,
- * new String[] { "Apr", "June", "Sep", "Nov" }); months.put(31, new
- * String[] { "Jan", "Mar", "May", "July", "Aug", "Oct", "Dec" });
- *
- * System.out.println(months.get(30));
- */
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/src/Cricket1.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/Cricket1.java b/components/untitled/src/Cricket1.java
deleted file mode 100644
index e19bea6..0000000
--- a/components/untitled/src/Cricket1.java
+++ /dev/null
@@ -1,16 +0,0 @@
-import java.util.Scanner;
-
-/**
- * Created by sanjaya on 10/11/14.
- */
-public class Cricket1 {
-
- public static void main(String args[]){
-
- Scanner scanner = new Scanner(System.in);
- int x = scanner.nextInt();
-
-
- System.out.println(35 +" " +33 +" "+ 68);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/src/NumberGrid.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/NumberGrid.java b/components/untitled/src/NumberGrid.java
deleted file mode 100644
index 38fab79..0000000
--- a/components/untitled/src/NumberGrid.java
+++ /dev/null
@@ -1,106 +0,0 @@
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-
-
-public class NumberGrid {
-
-
- public static void main(String args[]) throws IOException {
-
-
- BufferedReader stdin = new BufferedReader(new InputStreamReader(
- System.in));
- String line;
-
- String firstLineArray[] = new String[4];
-
-
- boolean readFirstLine = true;
-
-
- ArrayList<int[]> arrayList = new ArrayList<int[]>();
-
- while ((line = stdin.readLine()) != null && line.length() != 0) {
-
- if (readFirstLine) {
- firstLineArray = line.split(" ");
- readFirstLine = false;
- } else {
-
- String[] strings = line.split(" ");
- int[] ints = new int[strings.length];
- for (int i = 0; i < strings.length; i++) {
- ints[i] = Integer.parseInt(strings[i]);
- }
- arrayList.add(ints);
- }
-
- }
-
- int rows = Integer.parseInt(firstLineArray[0]);
- int coloms = Integer.parseInt(firstLineArray[1]);
- int height = Integer.parseInt(firstLineArray[2]);
- int width = Integer.parseInt(firstLineArray[3]);
-
-
- int total = 0;
- int newTotal = 0;
-
-
- //for each row
- for (int YPosition = 0; YPosition + height <= rows; YPosition++) {
-
- for (int XPosition =0; XPosition+width <= coloms ; XPosition++) {
- newTotal = 0;
-
- for (int j = YPosition; j < YPosition + height; j++) {
- for (int k = XPosition; k < XPosition + width; k++) {
-
- newTotal += arrayList.get(j)[k];
-
-
- }
-
- }
- if(total<newTotal){
- total = newTotal;
- }
-
- }
- }
-
- //change height into width and width into height and check again
-
- int temp;
- temp = height;
- height = width;
- width = temp;
-
- //for each row
- for (int YPosition = 0; YPosition + height <= rows; YPosition++) {
-
- for (int XPosition =0; XPosition+width <= coloms ; XPosition++) {
- newTotal = 0;
-
- for (int j = YPosition; j < YPosition + height; j++) {
- for (int k = XPosition; k < XPosition + width; k++) {
-
- newTotal += arrayList.get(j)[k];
-
- }
-
- }
- if(total<newTotal){
- total = newTotal;
- }
-
- }
- }
-
- System.out.println(total);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c047de2/components/untitled/src/test.java
----------------------------------------------------------------------
diff --git a/components/untitled/src/test.java b/components/untitled/src/test.java
deleted file mode 100644
index 3caaeba..0000000
--- a/components/untitled/src/test.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Created by sanjaya on 10/11/14.
- */
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class test{
-
-
- static String array1[] = new String[2];
- static double array2[] = new double[7];
- static double array3[] = new double[7];
- static int i =0;
-
- public static void main(String args[]) throws IOException {
-
-
- BufferedReader stdin = new BufferedReader(new InputStreamReader(
- System.in));
- String line;
-
-
- while ((line = stdin.readLine()) != null && line.length() != 0) {
-
- array1 = line.split(" ");
- array2[i]= Double.parseDouble(array1[0]);
- array3[i]= Double.parseDouble(array1[1]);
-
- i++;
-
-
- }
-
-
- System.out.println(getPearsonCorrelation(array2, array3));
-
- }
-
- public static double getPearsonCorrelation(double[] scores1,double[] scores2){
-
- double result = 0;
-
- double sum_sq_x = 0;
-
- double sum_sq_y = 0;
-
- double sum_coproduct = 0;
-
- double mean_x = scores1[0];
-
- double mean_y = scores2[0];
-
- for(int i=2;i<scores1.length+1;i+=1){
-
- double sweep =Double.valueOf(i-1)/i;
-
- double delta_x = scores1[i-1]-mean_x;
-
- double delta_y = scores2[i-1]-mean_y;
-
- sum_sq_x += delta_x * delta_x * sweep;
-
- sum_sq_y += delta_y * delta_y * sweep;
-
- sum_coproduct += delta_x * delta_y * sweep;
-
- mean_x += delta_x / i;
-
- mean_y += delta_y / i;
-
- }
-
- double pop_sd_x = (double) Math.sqrt(sum_sq_x/scores1.length);
-
- double pop_sd_y = (double) Math.sqrt(sum_sq_y/scores1.length);
-
- double cov_x_y = sum_coproduct / scores1.length;
-
- result = cov_x_y / (pop_sd_x*pop_sd_y);
-
- return result;
-
- }
-
-}
\ No newline at end of file
[51/51] [abbrv] stratos git commit: fixing minor issues
Posted by im...@apache.org.
fixing minor issues
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d01d737
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d01d737
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d01d737
Branch: refs/heads/master
Commit: 6d01d737798542bc215779be0a5c1932deced36f
Parents: 2883319
Author: asankasa <as...@wso2.com>
Authored: Fri Oct 31 11:59:01 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:31 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/iaases/CloudstackIaas.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d01d737/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index 4919b48..e8024b5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -58,7 +58,7 @@ public class CloudstackIaas extends Iaas {
if (iaasInfo.getComputeService() == null) {
String msg = "Compute service is null for IaaS provider: "
+ iaasInfo.getName();
- log.fatal(msg);
+ log.error(msg);
throw new CloudControllerException(msg);
}
@@ -85,7 +85,7 @@ public class CloudstackIaas extends Iaas {
if (location.getId().equals(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE))) {
//if the zone is valid set the zone to templateBuilder Object
templateBuilder.locationId(location.getId());
- log.info("ZONE has been set as " + iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE)
+ log.info("Zone has been set as " + iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE)
+ " with id: " + location.getId());
break;
}
[39/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Volume.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Volume.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Volume.java
deleted file mode 100644
index 563c0cc..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Volume.java
+++ /dev/null
@@ -1,739 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-public class Volume {
-
- /**
- */
- public static enum State {
-
- /**
- * indicates that the volume record is created in the DB, but not on the backend
- */
- ALLOCATED,
- /**
- * the volume is being created on the backend
- */
- CREATING,
- /**
- * the volume is ready to be used
- */
- READY,
- /**
- * the volume is destroyed (either as a result of deleteVolume command for DataDisk or as a part of destroyVm)
- */
- DESTROYED,
- /**
- * the volume has failed somehow, e.g. during creation (in cloudstack development)
- */
- FAILED,
-
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static State fromValue(String state) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- /**
- */
- public static enum Type {
- ROOT(0),
- DATADISK(1),
- UNRECOGNIZED(Integer.MAX_VALUE);
-
- private int code;
-
- private static final Map<Integer, Type> INDEX = Maps.uniqueIndex(ImmutableSet.copyOf(Type.values()),
- new Function<Type, Integer>() {
-
- @Override
- public Integer apply(Type input) {
- return input.code;
- }
-
- });
-
- Type(int code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return name().toLowerCase();
- }
-
- public static Type fromValue(String resourceType) {
- Integer code = Integer.valueOf(checkNotNull(resourceType, "resourcetype"));
- return INDEX.containsKey(code) ? INDEX.get(code) : UNRECOGNIZED;
- }
-
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromVolume(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected Date attached;
- protected Date created;
- protected boolean destroyed;
- protected String deviceId;
- protected String diskOfferingDisplayText;
- protected String diskOfferingId;
- protected String diskOfferingName;
- protected String domain;
- protected String domainId;
- protected String hypervisor;
- protected boolean isExtractable;
- protected String jobId;
- protected String jobStatus;
- protected String name;
- protected String serviceOfferingDisplayText;
- protected String serviceOfferingId;
- protected String serviceOfferingName;
- protected long size;
- protected String snapshotId;
- protected Volume.State state;
- protected String storage;
- protected String storageType;
- protected Volume.Type type;
- protected String virtualMachineId;
- protected String vmDisplayName;
- protected String vmName;
- protected VirtualMachine.State vmState;
- protected String zoneId;
- protected String zoneName;
-
- /**
- * @see Volume#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Volume#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see Volume#getAttached()
- */
- public T attached(Date attached) {
- this.attached = attached;
- return self();
- }
-
- /**
- * @see Volume#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see Volume#isDestroyed()
- */
- public T destroyed(boolean destroyed) {
- this.destroyed = destroyed;
- return self();
- }
-
- /**
- * @see Volume#getDeviceId()
- */
- public T deviceId(String deviceId) {
- this.deviceId = deviceId;
- return self();
- }
-
- /**
- * @see Volume#getDiskOfferingDisplayText()
- */
- public T diskOfferingDisplayText(String diskOfferingDisplayText) {
- this.diskOfferingDisplayText = diskOfferingDisplayText;
- return self();
- }
-
- /**
- * @see Volume#getDiskOfferingId()
- */
- public T diskOfferingId(String diskOfferingId) {
- this.diskOfferingId = diskOfferingId;
- return self();
- }
-
- /**
- * @see Volume#getDiskOfferingName()
- */
- public T diskOfferingName(String diskOfferingName) {
- this.diskOfferingName = diskOfferingName;
- return self();
- }
-
- /**
- * @see Volume#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see Volume#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see Volume#getHypervisor()
- */
- public T hypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- return self();
- }
-
- /**
- * @see Volume#isExtractable()
- */
- public T isExtractable(boolean isExtractable) {
- this.isExtractable = isExtractable;
- return self();
- }
-
- /**
- * @see Volume#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see Volume#getJobStatus()
- */
- public T jobStatus(String jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- /**
- * @see Volume#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Volume#getServiceOfferingDisplayText()
- */
- public T serviceOfferingDisplayText(String serviceOfferingDisplayText) {
- this.serviceOfferingDisplayText = serviceOfferingDisplayText;
- return self();
- }
-
- /**
- * @see Volume#getServiceOfferingId()
- */
- public T serviceOfferingId(String serviceOfferingId) {
- this.serviceOfferingId = serviceOfferingId;
- return self();
- }
-
- /**
- * @see Volume#getServiceOfferingName()
- */
- public T serviceOfferingName(String serviceOfferingName) {
- this.serviceOfferingName = serviceOfferingName;
- return self();
- }
-
- /**
- * @see Volume#getSize()
- */
- public T size(long size) {
- this.size = size;
- return self();
- }
-
- /**
- * @see Volume#getSnapshotId()
- */
- public T snapshotId(String snapshotId) {
- this.snapshotId = snapshotId;
- return self();
- }
-
- /**
- * @see Volume#getState()
- */
- public T state(Volume.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see Volume#getStorage()
- */
- public T storage(String storage) {
- this.storage = storage;
- return self();
- }
-
- /**
- * @see Volume#getStorageType()
- */
- public T storageType(String storageType) {
- this.storageType = storageType;
- return self();
- }
-
- /**
- * @see Volume#getType()
- */
- public T type(Volume.Type type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Volume#getVirtualMachineId()
- */
- public T virtualMachineId(String virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- return self();
- }
-
- /**
- * @see Volume#getVmDisplayName()
- */
- public T vmDisplayName(String vmDisplayName) {
- this.vmDisplayName = vmDisplayName;
- return self();
- }
-
- /**
- * @see Volume#getVmName()
- */
- public T vmName(String vmName) {
- this.vmName = vmName;
- return self();
- }
-
- /**
- * @see Volume#getVmState()
- */
- public T vmState(VirtualMachine.State vmState) {
- this.vmState = vmState;
- return self();
- }
-
- /**
- * @see Volume#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see Volume#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- public Volume build() {
- return new Volume(id, account, attached, created, destroyed, deviceId, diskOfferingDisplayText, diskOfferingId, diskOfferingName, domain, domainId, hypervisor, isExtractable, jobId, jobStatus, name, serviceOfferingDisplayText, serviceOfferingId, serviceOfferingName, size, snapshotId, state, storage, storageType, type, virtualMachineId, vmDisplayName, vmName, vmState, zoneId, zoneName);
- }
-
- public T fromVolume(Volume in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .attached(in.getAttached())
- .created(in.getCreated())
- .destroyed(in.isDestroyed())
- .deviceId(in.getDeviceId())
- .diskOfferingDisplayText(in.getDiskOfferingDisplayText())
- .diskOfferingId(in.getDiskOfferingId())
- .diskOfferingName(in.getDiskOfferingName())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .hypervisor(in.getHypervisor())
- .isExtractable(in.isExtractable())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus())
- .name(in.getName())
- .serviceOfferingDisplayText(in.getServiceOfferingDisplayText())
- .serviceOfferingId(in.getServiceOfferingId())
- .serviceOfferingName(in.getServiceOfferingName())
- .size(in.getSize())
- .snapshotId(in.getSnapshotId())
- .state(in.getState())
- .storage(in.getStorage())
- .storageType(in.getStorageType())
- .type(in.getType())
- .virtualMachineId(in.getVirtualMachineId())
- .vmDisplayName(in.getVmDisplayName())
- .vmName(in.getVmName())
- .vmState(in.getVmState())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final Date attached;
- private final Date created;
- private final boolean destroyed;
- private final String deviceId;
- private final String diskOfferingDisplayText;
- private final String diskOfferingId;
- private final String diskOfferingName;
- private final String domain;
- private final String domainId;
- private final String hypervisor;
- private final boolean isExtractable;
- private final String jobId;
- private final String jobStatus;
- private final String name;
- private final String serviceOfferingDisplayText;
- private final String serviceOfferingId;
- private final String serviceOfferingName;
- private final long size;
- private final String snapshotId;
- private final Volume.State state;
- private final String storage;
- private final String storageType;
- private final Volume.Type type;
- private final String virtualMachineId;
- private final String vmDisplayName;
- private final String vmName;
- private final VirtualMachine.State vmState;
- private final String zoneId;
- private final String zoneName;
-
- @ConstructorProperties({
- "id", "account", "attached", "created", "destroyed", "deviceid", "diskofferingdisplaytext", "diskofferingid", "diskofferingname", "domain", "domainid", "hypervisor", "isextractable", "jobid", "jobstatus", "name", "serviceofferingdisplaytext", "serviceofferingid", "serviceofferingname", "size", "snapshotid", "state", "storage", "storagetype", "type", "virtualmachineid", "vmdisplayname", "vmname", "vmstate", "zoneid", "zonename"
- })
- protected Volume(String id, @Nullable String account, @Nullable Date attached, @Nullable Date created, boolean destroyed,
- @Nullable String deviceId, @Nullable String diskOfferingDisplayText, @Nullable String diskOfferingId,
- @Nullable String diskOfferingName, @Nullable String domain, @Nullable String domainId, @Nullable String hypervisor,
- boolean isExtractable, @Nullable String jobId, @Nullable String jobStatus, @Nullable String name,
- @Nullable String serviceOfferingDisplayText, @Nullable String serviceOfferingId, @Nullable String serviceOfferingName,
- long size, @Nullable String snapshotId, @Nullable Volume.State state, @Nullable String storage,
- @Nullable String storageType, @Nullable Volume.Type type, @Nullable String virtualMachineId,
- @Nullable String vmDisplayName, @Nullable String vmName, @Nullable VirtualMachine.State vmState,
- @Nullable String zoneId, @Nullable String zoneName) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.attached = attached;
- this.created = created;
- this.destroyed = destroyed;
- this.deviceId = deviceId;
- this.diskOfferingDisplayText = diskOfferingDisplayText;
- this.diskOfferingId = diskOfferingId;
- this.diskOfferingName = diskOfferingName;
- this.domain = domain;
- this.domainId = domainId;
- this.hypervisor = hypervisor;
- this.isExtractable = isExtractable;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- this.name = name;
- this.serviceOfferingDisplayText = serviceOfferingDisplayText;
- this.serviceOfferingId = serviceOfferingId;
- this.serviceOfferingName = serviceOfferingName;
- this.size = size;
- this.snapshotId = snapshotId;
- this.state = state;
- this.storage = storage;
- this.storageType = storageType;
- this.type = type;
- this.virtualMachineId = virtualMachineId;
- this.vmDisplayName = vmDisplayName;
- this.vmName = vmName;
- this.vmState = vmState;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- @Nullable
- public Date getAttached() {
- return this.attached;
- }
-
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- public boolean isDestroyed() {
- return this.destroyed;
- }
-
- @Nullable
- public String getDeviceId() {
- return this.deviceId;
- }
-
- @Nullable
- public String getDiskOfferingDisplayText() {
- return this.diskOfferingDisplayText;
- }
-
- @Nullable
- public String getDiskOfferingId() {
- return this.diskOfferingId;
- }
-
- @Nullable
- public String getDiskOfferingName() {
- return this.diskOfferingName;
- }
-
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- @Nullable
- public String getHypervisor() {
- return this.hypervisor;
- }
-
- public boolean isExtractable() {
- return this.isExtractable;
- }
-
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- @Nullable
- public String getJobStatus() {
- return this.jobStatus;
- }
-
- @Nullable
- public String getName() {
- return this.name;
- }
-
- @Nullable
- public String getServiceOfferingDisplayText() {
- return this.serviceOfferingDisplayText;
- }
-
- @Nullable
- public String getServiceOfferingId() {
- return this.serviceOfferingId;
- }
-
- @Nullable
- public String getServiceOfferingName() {
- return this.serviceOfferingName;
- }
-
- public long getSize() {
- return this.size;
- }
-
- @Nullable
- public String getSnapshotId() {
- return this.snapshotId;
- }
-
- @Nullable
- public Volume.State getState() {
- return this.state;
- }
-
- @Nullable
- public String getStorage() {
- return this.storage;
- }
-
- @Nullable
- public String getStorageType() {
- return this.storageType;
- }
-
- @Nullable
- public Volume.Type getType() {
- return this.type;
- }
-
- @Nullable
- public String getVirtualMachineId() {
- return this.virtualMachineId;
- }
-
- @Nullable
- public String getVmDisplayName() {
- return this.vmDisplayName;
- }
-
- @Nullable
- public String getVmName() {
- return this.vmName;
- }
-
- @Nullable
- public VirtualMachine.State getVmState() {
- return this.vmState;
- }
-
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, attached, created, destroyed, deviceId, diskOfferingDisplayText, diskOfferingId, diskOfferingName, domain, domainId, hypervisor, isExtractable, jobId, jobStatus, name, serviceOfferingDisplayText, serviceOfferingId, serviceOfferingName, size, snapshotId, state, storage, storageType, type, virtualMachineId, vmDisplayName, vmName, vmState, zoneId, zoneName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Volume that = Volume.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.attached, that.attached)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.destroyed, that.destroyed)
- && Objects.equal(this.deviceId, that.deviceId)
- && Objects.equal(this.diskOfferingDisplayText, that.diskOfferingDisplayText)
- && Objects.equal(this.diskOfferingId, that.diskOfferingId)
- && Objects.equal(this.diskOfferingName, that.diskOfferingName)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.hypervisor, that.hypervisor)
- && Objects.equal(this.isExtractable, that.isExtractable)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.serviceOfferingDisplayText, that.serviceOfferingDisplayText)
- && Objects.equal(this.serviceOfferingId, that.serviceOfferingId)
- && Objects.equal(this.serviceOfferingName, that.serviceOfferingName)
- && Objects.equal(this.size, that.size)
- && Objects.equal(this.snapshotId, that.snapshotId)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.storage, that.storage)
- && Objects.equal(this.storageType, that.storageType)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.virtualMachineId, that.virtualMachineId)
- && Objects.equal(this.vmDisplayName, that.vmDisplayName)
- && Objects.equal(this.vmName, that.vmName)
- && Objects.equal(this.vmState, that.vmState)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("attached", attached).add("created", created).add("destroyed", destroyed)
- .add("deviceId", deviceId).add("diskOfferingDisplayText", diskOfferingDisplayText).add("diskOfferingId", diskOfferingId)
- .add("diskOfferingName", diskOfferingName).add("domain", domain).add("domainId", domainId).add("hypervisor", hypervisor)
- .add("isExtractable", isExtractable).add("jobId", jobId).add("jobStatus", jobStatus).add("name", name)
- .add("serviceOfferingDisplayText", serviceOfferingDisplayText).add("serviceOfferingId", serviceOfferingId)
- .add("serviceOfferingName", serviceOfferingName).add("size", size).add("snapshotId", snapshotId).add("state", state)
- .add("storage", storage).add("storageType", storageType).add("type", type).add("virtualMachineId", virtualMachineId)
- .add("vmDisplayName", vmDisplayName).add("vmName", vmName).add("vmState", vmState).add("zoneId", zoneId).add("zoneName", zoneName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Zone.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Zone.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Zone.java
deleted file mode 100644
index 81cec1e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Zone.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.List;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-
-public class Zone implements Comparable<Zone> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromZone(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String description;
- protected String displayText;
- protected String DNS1;
- protected String DNS2;
- protected String domain;
- protected String domainId;
- protected String guestCIDRAddress;
- protected String internalDNS1;
- protected String internalDNS2;
- protected String name;
- protected NetworkType networkType;
- protected String VLAN;
- protected boolean securityGroupsEnabled;
- protected AllocationState allocationState;
- protected String dhcpProvider;
- protected String zoneToken;
-
- /**
- * @see Zone#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Zone#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see Zone#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see Zone#getDNS()
- */
- public T DNS(List<String> DNS) {
- if (!DNS.isEmpty()) this.DNS1 = DNS.get(0);
- if (DNS.size() > 1) this.DNS2 = DNS.get(1);
- return self();
- }
-
- /**
- * @see Zone#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see Zone#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see Zone#getGuestCIDRAddress()
- */
- public T guestCIDRAddress(String guestCIDRAddress) {
- this.guestCIDRAddress = guestCIDRAddress;
- return self();
- }
-
- /**
- * @see Zone#getInternalDNS()
- */
- public T internalDNS(List<String> DNS) {
- if (!DNS.isEmpty()) this.internalDNS1 = DNS.get(0);
- if (DNS.size() > 1) this.internalDNS2 = DNS.get(1);
- return self();
- }
-
- /**
- * @see Zone#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Zone#getNetworkType()
- */
- public T networkType(NetworkType networkType) {
- this.networkType = networkType;
- return self();
- }
-
- /**
- * @see Zone#getVLAN()
- */
- public T VLAN(String VLAN) {
- this.VLAN = VLAN;
- return self();
- }
-
- /**
- * @see Zone#isSecurityGroupsEnabled()
- */
- public T securityGroupsEnabled(boolean securityGroupsEnabled) {
- this.securityGroupsEnabled = securityGroupsEnabled;
- return self();
- }
-
- /**
- * @see Zone#getAllocationState()
- */
- public T allocationState(AllocationState allocationState) {
- this.allocationState = allocationState;
- return self();
- }
-
- /**
- * @see Zone#getDhcpProvider()
- */
- public T dhcpProvider(String dhcpProvider) {
- this.dhcpProvider = dhcpProvider;
- return self();
- }
-
- /**
- * @see Zone#getZoneToken()
- */
- public T zoneToken(String zoneToken) {
- this.zoneToken = zoneToken;
- return self();
- }
-
- public Zone build() {
- return new Zone(id, description, displayText, DNS1, DNS2, domain, domainId, guestCIDRAddress, internalDNS1, internalDNS2,
- name, networkType, VLAN, securityGroupsEnabled, allocationState, dhcpProvider, zoneToken);
- }
-
- public T fromZone(Zone in) {
- return this
- .id(in.getId())
- .description(in.getDescription())
- .displayText(in.getDisplayText())
- .DNS(in.getDNS())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .guestCIDRAddress(in.getGuestCIDRAddress())
- .internalDNS(in.getInternalDNS())
- .name(in.getName())
- .networkType(in.getNetworkType())
- .VLAN(in.getVLAN())
- .securityGroupsEnabled(in.isSecurityGroupsEnabled())
- .allocationState(in.getAllocationState())
- .dhcpProvider(in.getDhcpProvider())
- .zoneToken(in.getZoneToken());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String description;
- private final String displayText;
- private final String DNS1;
- private final String DNS2;
- private final String domain;
- private final String domainId;
- private final String guestCIDRAddress;
- private final String internalDNS1;
- private final String internalDNS2;
- private final String name;
- private final NetworkType networkType;
- private final String VLAN;
- private final boolean securityGroupsEnabled;
- private final AllocationState allocationState;
- private final String dhcpProvider;
- private final String zoneToken;
-
- @ConstructorProperties({
- "id", "description", "displaytext", "dns1", "dns2", "domain", "domainid", "guestcidraddress", "internaldns1", "internaldns2", "name", "networktype", "vlan", "securitygroupsenabled", "allocationstate", "dhcpprovider", "zonetoken"
- })
- protected Zone(String id, @Nullable String description, @Nullable String displayText, @Nullable String DNS1, @Nullable String DNS2,
- @Nullable String domain, @Nullable String domainId, @Nullable String guestCIDRAddress, @Nullable String internalDNS1,
- @Nullable String internalDNS2, @Nullable String name, @Nullable NetworkType networkType, @Nullable String VLAN,
- boolean securityGroupsEnabled, @Nullable AllocationState allocationState, @Nullable String dhcpProvider,
- @Nullable String zoneToken) {
- this.id = checkNotNull(id, "id");
- this.description = description;
- this.displayText = displayText;
- this.DNS1 = DNS1;
- this.DNS2 = DNS2;
- this.domain = domain;
- this.domainId = domainId;
- this.guestCIDRAddress = guestCIDRAddress;
- this.internalDNS1 = internalDNS1;
- this.internalDNS2 = internalDNS2;
- this.name = name;
- this.networkType = networkType;
- this.VLAN = VLAN;
- this.securityGroupsEnabled = securityGroupsEnabled;
- this.allocationState = allocationState;
- this.dhcpProvider = dhcpProvider;
- this.zoneToken = zoneToken;
- }
-
- /**
- * @return Zone id
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return Zone description
- */
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- /**
- * @return the display text of the zone
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- /**
- * @return the external DNS for the Zone
- */
- public List<String> getDNS() {
- ImmutableList.Builder<String> builder = ImmutableList.builder();
- if (DNS1 != null && !"".equals(DNS1))
- builder.add(DNS1);
- if (DNS2 != null && !"".equals(DNS2))
- builder.add(DNS2);
- return builder.build();
- }
-
- /**
- * @return Domain name for the Vms in the zone
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the ID of the containing domain, null for public zones
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the guest CIDR address for the Zone
- */
- @Nullable
- public String getGuestCIDRAddress() {
- return this.guestCIDRAddress;
- }
-
- /**
- * @return the internal DNS for the Zone
- */
- public List<String> getInternalDNS() {
- ImmutableList.Builder<String> builder = ImmutableList.builder();
- if (internalDNS1 != null && !"".equals(internalDNS1))
- builder.add(internalDNS1);
- if (internalDNS2 != null && !"".equals(internalDNS2))
- builder.add(internalDNS2);
- return builder.build();
- }
-
- /**
- * @return Zone name
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the network type of the zone; can be Basic or Advanced
- */
- @Nullable
- public NetworkType getNetworkType() {
- return this.networkType;
- }
-
- /**
- * @return the vlan range of the zone
- */
- @Nullable
- public String getVLAN() {
- return this.VLAN;
- }
-
- /**
- * @return true if this zone has security groups enabled
- */
- public boolean isSecurityGroupsEnabled() {
- return this.securityGroupsEnabled;
- }
-
- /**
- * @return the allocation state of the cluster
- */
- @Nullable
- public AllocationState getAllocationState() {
- return this.allocationState;
- }
-
- /**
- * @return the dhcp Provider for the Zone
- */
- @Nullable
- public String getDhcpProvider() {
- return this.dhcpProvider;
- }
-
- /**
- * @return Zone Token
- */
- @Nullable
- public String getZoneToken() {
- return this.zoneToken;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, description, displayText, DNS1, DNS2, domain, domainId, guestCIDRAddress, internalDNS1,
- internalDNS2, name, networkType, VLAN, securityGroupsEnabled, allocationState, dhcpProvider, zoneToken);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Zone that = Zone.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.DNS1, that.DNS1)
- && Objects.equal(this.DNS2, that.DNS2)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.guestCIDRAddress, that.guestCIDRAddress)
- && Objects.equal(this.internalDNS1, that.internalDNS1)
- && Objects.equal(this.internalDNS2, that.internalDNS2)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.networkType, that.networkType)
- && Objects.equal(this.VLAN, that.VLAN)
- && Objects.equal(this.securityGroupsEnabled, that.securityGroupsEnabled)
- && Objects.equal(this.allocationState, that.allocationState)
- && Objects.equal(this.dhcpProvider, that.dhcpProvider)
- && Objects.equal(this.zoneToken, that.zoneToken);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("description", description).add("displayText", displayText).add("DNS1", DNS1).add("DNS2", DNS2)
- .add("domain", domain).add("domainId", domainId).add("guestCIDRAddress", guestCIDRAddress).add("internalDNS1", internalDNS1)
- .add("internalDNS2", internalDNS2).add("name", name).add("networkType", networkType).add("VLAN", VLAN)
- .add("securityGroupsEnabled", securityGroupsEnabled).add("allocationState", allocationState).add("dhcpProvider", dhcpProvider)
- .add("zoneToken", zoneToken);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Zone o) {
- return id.compareTo(o.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
deleted file mode 100644
index b6e7d2f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Helpful when looking for resources by zone and name
- */
-public class ZoneAndName {
-
- public static final Function<ZoneAndName, String> NAME_FUNCTION = new Function<ZoneAndName, String>() {
-
- @Override
- public String apply(ZoneAndName input) {
- return input.getName();
- }
-
- };
-
- public static final Function<ZoneAndName, String> ZONE_FUNCTION = new Function<ZoneAndName, String>() {
-
- @Override
- public String apply(ZoneAndName input) {
- return input.getZone();
- }
-
- };
-
- public static ZoneAndName fromZoneAndName(String zoneId, String name) {
- return new ZoneAndName(zoneId, name);
- }
-
- protected final String zoneId;
- protected final String name;
-
- protected ZoneAndName(String zoneId, String name) {
- this.zoneId = checkNotNull(zoneId, "zoneId");
- this.name = checkNotNull(name, "name");
- }
-
- public String getZone() {
- return zoneId;
- }
-
- public String getName() {
- return name;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- ZoneAndName that = ZoneAndName.class.cast(o);
- return equal(this.zoneId, that.zoneId) && equal(this.name, that.name);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(zoneId, name);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
deleted file mode 100644
index 8d75264..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromZoneSecurityGroupNamePortsCidrs(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String zoneId;
- protected String name;
- protected Set<Integer> ports = ImmutableSet.of();
- protected Set<String> cidrs = ImmutableSet.of();
-
- /**
- * @see ZoneSecurityGroupNamePortsCidrs#getZone()
- */
- public T zone(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see ZoneSecurityGroupNamePortsCidrs#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see ZoneSecurityGroupNamePortsCidrs#getPorts()
- */
- public T ports(Set<Integer> ports) {
- this.ports = ImmutableSet.copyOf(checkNotNull(ports, "ports"));
- return self();
- }
-
- public T ports(Integer... in) {
- return ports(ImmutableSet.copyOf(in));
- }
-
- /**
- * @see ZoneSecurityGroupNamePortsCidrs#getCidrs()
- */
- public T cidrs(Set<String> cidrs) {
- this.cidrs = ImmutableSet.copyOf(checkNotNull(cidrs, "cidrs"));
- return self();
- }
-
- public T cidrs(String... in) {
- return cidrs(ImmutableSet.copyOf(in));
- }
-
- public ZoneSecurityGroupNamePortsCidrs build() {
- return new ZoneSecurityGroupNamePortsCidrs(zoneId, name, ports, cidrs);
- }
-
- public T fromZoneSecurityGroupNamePortsCidrs(ZoneSecurityGroupNamePortsCidrs in) {
- return this.zone(in.getZone())
- .name(in.getName())
- .ports(in.getPorts())
- .cidrs(in.getCidrs());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
-
- private final Set<Integer> ports;
- private final Set<String> cidrs;
-
- protected ZoneSecurityGroupNamePortsCidrs(String zoneId, String name, Set<Integer> ports,
- Set<String> cidrs) {
- super(zoneId, name);
- this.ports = ports == null ? ImmutableSet.<Integer>of() : ImmutableSet.copyOf(ports);
- this.cidrs = cidrs == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(cidrs);
- }
-
- /**
- *
- * @return the set of ports to open in the security group
- */
- public Set<Integer> getPorts() {
- return ports;
- }
-
- /**
- *
- * @return the set of cidrs to give access to the open ports in the security group
- */
- public Set<String> getCidrs() {
- return cidrs;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(zoneId, name, ports, cidrs);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ZoneSecurityGroupNamePortsCidrs that = ZoneSecurityGroupNamePortsCidrs.class.cast(obj);
- return Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.ports, that.ports)
- && Objects.equal(this.cidrs, that.cidrs);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("zoneId", zoneId).add("name", name).add("ports", ports).add("cidrs", cidrs);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AccountApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AccountApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AccountApi.java
deleted file mode 100644
index b5eaaf5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AccountApi.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListAccountsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface AccountApi {
- /**
- * Lists Accounts
- *
- * @param options
- * if present, how to constrain the list.
- * @return Accounts matching query, or empty set, if no Accounts are found
- */
- @Named("listAccounts")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listAccounts", "true" })
- @SelectJson("account")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Account> listAccounts(ListAccountsOptions... options);
-
- /**
- * get a specific Account by id
- *
- * @param id
- * Account to get
- * @return Account or null if not found
- */
- @Named("listAccounts")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listAccounts", "true" })
- @SelectJson("account")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Account getAccount(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AddressApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AddressApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AddressApi.java
deleted file mode 100644
index 36a6c79..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AddressApi.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.functions.CloudStackFallbacks.VoidOnNotFoundOr404OrUnableToFindAccountOwner;
-import org.jclouds.cloudstack.options.AssociateIPAddressOptions;
-import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface AddressApi {
-
- /**
- * Lists IPAddresses
- *
- * @param options
- * if present, how to constrain the list.
- * @return IPAddresses matching query, or empty set, if no IPAddresses are
- * found
- */
- @Named("listPublicIpAddresses")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listPublicIpAddresses", "true" })
- @SelectJson("publicipaddress")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<PublicIPAddress> listPublicIPAddresses(ListPublicIPAddressesOptions... options);
-
- /**
- * get a specific IPAddress by id
- *
- * @param id
- * IPAddress to get
- * @return IPAddress or null if not found
- */
- @Named("listPublicIpAddresses")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listPublicIpAddresses", "true" })
- @SelectJson("publicipaddress")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- PublicIPAddress getPublicIPAddress(@QueryParam("id") String id);
-
- /**
- * Acquires and associates a public IP to an account.
- *
- * @param zoneId
- * the ID of the availability zone you want to acquire an public IP
- * address from
- * @return IPAddress
- */
- @Named("associateIpAddress")
- @GET
- @QueryParams(keys = "command", values = "associateIpAddress")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse associateIPAddressInZone(@QueryParam("zoneid") String zoneId,
- AssociateIPAddressOptions... options);
-
- /**
- * Disassociates an ip address from the account.
- *
- * @param id
- * the id of the public ip address to disassociate
- */
- @Named("disassociateIpAddress")
- @GET
- @QueryParams(keys = "command", values = "disassociateIpAddress")
- @Fallback(VoidOnNotFoundOr404OrUnableToFindAccountOwner.class)
- void disassociateIPAddress(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java
deleted file mode 100644
index 26867cd..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/AsyncJobApi.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.functions.ParseAsyncJobFromHttpResponse;
-import org.jclouds.cloudstack.functions.ParseAsyncJobsFromHttpResponse;
-import org.jclouds.cloudstack.options.ListAsyncJobsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface AsyncJobApi {
-
- /**
- * Lists asyncJobs
- *
- * @param options
- * if present, how to constrain the list.
- * @return asyncJobs matching query, or empty set, if no asyncJobs are found
- */
- @Named("listAsyncJobs")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listAsyncJobs", "true" })
- @ResponseParser(ParseAsyncJobsFromHttpResponse.class)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<AsyncJob<?>> listAsyncJobs(ListAsyncJobsOptions... options);
-
- /**
- * get a specific asyncJob by id
- *
- * @param id
- * asyncJob to get
- * @return asyncJob or null if not found
- */
- @Named("queryAsyncJobResult")
- @GET
- @QueryParams(keys = "command", values = "queryAsyncJobResult")
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseAsyncJobFromHttpResponse.class)
- @Fallback(NullOnNotFoundOr404.class)
- <T> AsyncJob<T> getAsyncJob(@QueryParam("jobid") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java
deleted file mode 100644
index 2ca59e3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ConfigurationApi.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.cloudstack.domain.Capabilities;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = { "response", "listAll" }, values = { "json", "true" })
-public interface ConfigurationApi {
-
- /**
- * Lists capabilities
- *
- * @return current capabilities of this cloud
- *
- */
- @Named("listCapabilities")
- @GET
- @QueryParams(keys = "command", values = "listCapabilities")
- @SelectJson("capability")
- @Consumes(MediaType.APPLICATION_JSON)
- Capabilities listCapabilities();
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java
deleted file mode 100644
index 161789a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainAccountApi.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to CloudStack Account features available to Domain
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface DomainAccountApi extends AccountApi {
-
- /**
- * Enable an account
- *
- * @param accountName
- * the account name you are enabling
- * @param domainId
- * the domain ID
- */
- @Named("enableAccount")
- @GET
- @QueryParams(keys = "command", values = "enableAccount")
- @SelectJson("account")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Account enableAccount(@QueryParam("account") String accountName, @QueryParam("domainid") String domainId);
-
-
- /**
- * Disable or lock an account
- *
- * @param accountName
- * the account name you are disabling
- * @param domainId
- * the domain ID
- * @param onlyLock
- * only lock if true disable otherwise
- */
- @Named("disableAccount")
- @GET
- @QueryParams(keys = "command", values = "disableAccount")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- AsyncCreateResponse disableAccount(@QueryParam("account") String accountName,
- @QueryParam("domainid") String domainId, @QueryParam("lock") boolean onlyLock);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java
deleted file mode 100644
index 30c697a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainDomainApi.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Domain;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListDomainChildrenOptions;
-import org.jclouds.cloudstack.options.ListDomainsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Domain features available to Domain
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface DomainDomainApi {
-
- /**
- * List domains with detailed information
- *
- * @param options
- * list filtering optional arguments
- * @return
- * set of domain instances or empty
- */
- @Named("listDomains")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listDomains", "true" })
- @SelectJson("domain")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Domain> listDomains(ListDomainsOptions... options);
-
- /**
- * Get a domain by ID
- *
- * @param domainId
- * domain ID
- * @return
- * domain instance or null
- */
- @Named("listDomains")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listDomains", "true" })
- @SelectJson("domain")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Domain getDomainById(@QueryParam("id") String domainId);
-
- /**
- * Lists all children domains belonging to a specified domain
- *
- * @param options
- * list filtering optional arguments
- * @return
- * set of domain instances or empty
- */
- @Named("listDomainChildren")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listDomainChildren", "true" })
- @SelectJson("domain")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Domain> listDomainChildren(ListDomainChildrenOptions... options);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java
deleted file mode 100644
index 3957955..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainLimitApi.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.cloudstack.binders.ResourceLimitToQueryParams;
-import org.jclouds.cloudstack.domain.ResourceLimit;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Limit features available to Domain
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface DomainLimitApi extends LimitApi {
- /**
- * Updates resource limits for an account in a domain.
- *
- * @param limit
- * what you are updating
- */
- @Named("updateResourceLimit")
- @GET
- @QueryParams(keys = "command", values = "updateResourceLimit")
- @SelectJson("resourcelimit")
- @Consumes(MediaType.APPLICATION_JSON)
- ResourceLimit updateResourceLimit(@BinderParam(ResourceLimitToQueryParams.class) ResourceLimit limit);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java
deleted file mode 100644
index 41e39b8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/DomainUserApi.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListUsersOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to CloudStack User features available to Domain
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface DomainUserApi {
-
- /**
- * Lists Users
- *
- * @param options
- * if present, how to constrain the list.
- * @return Users matching query, or empty set, if no Accounts are found
- */
- @Named("listUsers")
- @GET
- @QueryParams(keys = "command", values = "listUsers")
- @SelectJson("user")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<User> listUsers(ListUsersOptions... options);
-
- /**
- * Enable a user with a specific ID
- *
- * @param userId
- * the user ID to enable
- */
- @Named("enableUser")
- @GET
- @QueryParams(keys = "command", values = "enableUser")
- @SelectJson("user")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- User enableUser(@QueryParam("id") String userId);
-
- /**
- * Disable a user with a specific ID
- */
- @Named("disableUser")
- @GET
- @QueryParams(keys = "command", values = "disableUser")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- AsyncCreateResponse disableUser(@QueryParam("id") String userId);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/EventApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/EventApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/EventApi.java
deleted file mode 100644
index 2ab4d73..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/EventApi.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Event;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.functions.ParseEventTypesFromHttpResponse;
-import org.jclouds.cloudstack.options.ListEventsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = { "response", "listAll" }, values = { "json", "true" })
-public interface EventApi {
- /**
- * List Event Types
- *
- * @return event types or null if not found
- */
- @Named("listEventTypes")
- @GET
- @QueryParams(keys = "command", values = "listEventTypes")
- @Consumes(MediaType.APPLICATION_JSON)
- @ResponseParser(ParseEventTypesFromHttpResponse.class)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<String> listEventTypes();
-
- /**
- * List Events
- *
- * @return event list or null if not found
- */
- @Named("listEventTypes")
- @GET
- @QueryParams(keys = "command", values = "listEvents")
- @SelectJson("event")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Event> listEvents(ListEventsOptions...options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java
deleted file mode 100644
index 4c6ad73..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/FirewallApi.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.domain.PortForwardingRule;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateFirewallRuleOptions;
-import org.jclouds.cloudstack.options.ListEgressFirewallRulesOptions;
-import org.jclouds.cloudstack.options.ListFirewallRulesOptions;
-import org.jclouds.cloudstack.options.ListPortForwardingRulesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface FirewallApi {
-
- /**
- * @see FirewallApi#listFirewallRules
- */
- @Named("listFirewallRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listFirewallRules", "true" })
- @SelectJson("firewallrule")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<FirewallRule> listFirewallRules(ListFirewallRulesOptions... options);
-
- /**
- * @see FirewallApi#getFirewallRule
- */
- @Named("listFirewallRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listFirewallRules", "true" })
- @SelectJson("firewallrule")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- FirewallRule getFirewallRule(@QueryParam("id") String id);
-
- /**
- * @see FirewallApi#createFirewallRuleForIpAndProtocol
- */
- @Named("createFirewallRule")
- @GET
- @QueryParams(keys = "command", values = "createFirewallRule")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createFirewallRuleForIpAndProtocol(@QueryParam("ipaddressid") String ipAddressId,
- @QueryParam("protocol") FirewallRule.Protocol protocol, CreateFirewallRuleOptions... options);
-
- /**
- * @see FirewallApi#createFirewallRuleForIpProtocolAndPort
- */
- @Named("createFirewallRule")
- @GET
- @QueryParams(keys = "command", values = "createFirewallRule")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createFirewallRuleForIpProtocolAndPort(@QueryParam("ipaddressid") String ipAddressId,
- @QueryParam("protocol") FirewallRule.Protocol protocol,
- @QueryParam("startPort") int startPort,
- @QueryParam("endPort") int endPort);
-
-
- /**
- * @see FirewallApi#deleteFirewallRule
- */
- @Named("deleteFirewallRule")
- @GET
- @QueryParams(keys = "command", values = "deleteFirewallRule")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteFirewallRule(@QueryParam("id") String id);
-
- /**
- * @see FirewallApi#listEgressFirewallRules
- */
- @Named("listEgressFirewallRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listEgressFirewallRules", "true" })
- @SelectJson("firewallrule")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<FirewallRule> listEgressFirewallRules(ListEgressFirewallRulesOptions... options);
-
- /**
- * @see FirewallApi#getEgressFirewallRule
- */
- @Named("listEgressFirewallRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listEgressFirewallRules", "true" })
- @SelectJson("firewallrule")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- FirewallRule getEgressFirewallRule(@QueryParam("id") String id);
-
- /**
- * @see FirewallApi#createEgressFirewallRuleForNetworkAndProtocol
- */
- @Named("createEgressFirewallRule")
- @GET
- @QueryParams(keys = "command", values = "createEgressFirewallRule")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createEgressFirewallRuleForNetworkAndProtocol(@QueryParam("networkid") String networkId,
- @QueryParam("protocol") FirewallRule.Protocol protocol,
- CreateFirewallRuleOptions... options);
-
- /**
- * @see FirewallApi#createEgressFirewallRuleForNetworkProtocolAndPort
- */
- @Named("createEgressFirewallRule")
- @GET
- @QueryParams(keys = "command", values = "createEgressFirewallRule")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createEgressFirewallRuleForNetworkProtocolAndPort(@QueryParam("networkId") String networkId,
- @QueryParam("protocol") FirewallRule.Protocol protocol,
- @QueryParam("startPort") int startPort,
- @QueryParam("endPort") int endPort);
-
-
- /**
- * @see FirewallApi#deleteEgressFirewallRule
- */
- @Named("deleteEgressFirewallRule")
- @GET
- @QueryParams(keys = "command", values = "deleteEgressFirewallRule")
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteEgressFirewallRule(@QueryParam("id") String id);
-
- /**
- * @see FirewallApi#listPortForwardingRules
- */
- @Named("listPortForwardingRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listPortForwardingRules", "true" })
- @SelectJson("portforwardingrule")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<PortForwardingRule> listPortForwardingRules(ListPortForwardingRulesOptions... options);
-
- /**
- * @see FirewallApi#getPortForwardingRule
- */
- @Named("listPortForwardingRules")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listPortForwardingRules", "true" })
- @SelectJson("portforwardingrule")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- PortForwardingRule getPortForwardingRule(@QueryParam("id") String id);
-
- /**
- * @see FirewallApi#createPortForwardingRuleForVirtualMachine
- */
- @Named("createPortForwardingRule")
- @GET
- @QueryParams(keys = "command", values = "createPortForwardingRule")
- @Unwrap
- @Consumes(MediaType.APPLICATION_JSON)
- AsyncCreateResponse createPortForwardingRuleForVirtualMachine(
- @QueryParam("ipaddressid") String ipAddressId, @QueryParam("protocol") PortForwardingRule.Protocol protocol,
- @QueryParam("publicport") int publicPort, @QueryParam("virtualmachineid") String virtualMachineId,
- @QueryParam("privateport") int privatePort);
-
- /**
- * @see FirewallApi#deletePortForwardingRule
- */
- @Named("deletePortForwardingRule")
- @GET
- @QueryParams(keys = "command", values = "deletePortForwardingRule")
- @Fallback(VoidOnNotFoundOr404.class)
- void deletePortForwardingRule(@QueryParam("id") String id);
-
-}
[18/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java
deleted file mode 100644
index 00f56a9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreateUserOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.CreateUserOptions.Builder.timezone;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code CreateUserOptions}
- */
-@Test(groups = "unit")
-public class CreateUserOptionsTest {
-
- public void testDomainId() {
- CreateUserOptions options = new CreateUserOptions().domainId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- CreateUserOptions options = domainId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testTimezone() {
- CreateUserOptions options = new CreateUserOptions().timezone("something");
- assertEquals(ImmutableSet.of("something"), options.buildQueryParameters().get("timezone"));
- }
-
- public void testTimezoneStatic() {
- CreateUserOptions options = timezone("something");
- assertEquals(ImmutableSet.of("something"), options.buildQueryParameters().get("timezone"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java
deleted file mode 100644
index 570adad..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.forVirtualNetwork;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.gateway;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.netmask;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.networkId;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.vlan;
-import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code CreateVlanIPRangeOptions}
- */
-@Test(groups = "unit")
-public class CreateVlanIPRangeOptionsTest {
-
- public void testAccountInDomain() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().accountInDomain("fred", "6");
- assertEquals(ImmutableSet.of("fred"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainStatic() {
- CreateVlanIPRangeOptions options = accountInDomain("fred", "6");
- assertEquals(ImmutableSet.of("fred"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainId() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().domainId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- CreateVlanIPRangeOptions options = domainId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testForVirtualNetwork() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().forVirtualNetwork(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testForVirtualNetworkStatic() {
- CreateVlanIPRangeOptions options = forVirtualNetwork(true);
- assertEquals(ImmutableSet.of("true"), options.buildQueryParameters().get("forvirtualnetwork"));
- }
-
- public void testGateway() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().gateway("192.168.42.24");
- assertEquals(ImmutableSet.of("192.168.42.24"), options.buildQueryParameters().get("gateway"));
- }
-
- public void testGatewayStatic() {
- CreateVlanIPRangeOptions options = gateway("192.168.42.24");
- assertEquals(ImmutableSet.of("192.168.42.24"), options.buildQueryParameters().get("gateway"));
- }
-
- public void testNetmask() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().netmask("255.255.255.240");
- assertEquals(ImmutableSet.of("255.255.255.240"), options.buildQueryParameters().get("netmask"));
- }
-
- public void testNetmaskStatic() {
- CreateVlanIPRangeOptions options = netmask("255.255.255.240");
- assertEquals(ImmutableSet.of("255.255.255.240"), options.buildQueryParameters().get("netmask"));
- }
-
- public void testNetworkId() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().networkId("9");
- assertEquals(ImmutableSet.of("9"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testNetworkIdStatic() {
- CreateVlanIPRangeOptions options = networkId("9");
- assertEquals(ImmutableSet.of("9"), options.buildQueryParameters().get("networkid"));
- }
-
- public void testPodId() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().podId("8");
- assertEquals(ImmutableSet.of("8"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- CreateVlanIPRangeOptions options = podId("8");
- assertEquals(ImmutableSet.of("8"), options.buildQueryParameters().get("podid"));
- }
-
- public void testVlan() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().vlan(1001);
- assertEquals(ImmutableSet.of("1001"), options.buildQueryParameters().get("vlan"));
- }
-
- public void testVlanStatic() {
- CreateVlanIPRangeOptions options = vlan(1001);
- assertEquals(ImmutableSet.of("1001"), options.buildQueryParameters().get("vlan"));
- }
-
- public void testZoneId() {
- CreateVlanIPRangeOptions options = new CreateVlanIPRangeOptions().zoneId("7");
- assertEquals(ImmutableSet.of("7"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- CreateVlanIPRangeOptions options = zoneId("7");
- assertEquals(ImmutableSet.of("7"), options.buildQueryParameters().get("zoneid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java
deleted file mode 100644
index b601650..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.DeleteHostOptions.Builder.forceDestroyLocalStorage;
-import static org.jclouds.cloudstack.options.DeleteHostOptions.Builder.forced;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code DeleteHostOptions}
- */
-@Test(groups = "unit")
-public class DeleteHostOptionsTest {
-
- public void testForced() {
- DeleteHostOptions options = new DeleteHostOptions().forced(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forced"));
- }
-
- public void testForcedStatic() {
- DeleteHostOptions options = forced(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forced"));
- }
-
- public void testForceDestroyLocalStorage() {
- DeleteHostOptions options = new DeleteHostOptions().forceDestroyLocalStorage(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forcedestroylocalstorage"));
- }
-
- public void testForceDestroyLocalStorageStatic() {
- DeleteHostOptions options = forceDestroyLocalStorage(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("forcedestroylocalstorage"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java
deleted file mode 100644
index 62654f1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.GenerateUsageRecordsOptions.Builder.domainId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code GenerateUsageRecordsOptions}
- */
-@Test(groups = "unit")
-public class GenerateUsageRecordsOptionsTest {
-
- public void testDomainId() {
- GenerateUsageRecordsOptions options = new GenerateUsageRecordsOptions().domainId("42");
- assertEquals(ImmutableSet.of("42"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- GenerateUsageRecordsOptions options = domainId("42");
- assertEquals(ImmutableSet.of("42"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java
deleted file mode 100644
index a630bc6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListAccountsOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListAccountsOptions.Builder.cleanupRequired;
-import static org.jclouds.cloudstack.options.ListAccountsOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListAccountsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListAccountsOptions.Builder.recursive;
-import static org.jclouds.cloudstack.options.ListAccountsOptions.Builder.state;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListAccountsOptions}
- */
-@Test(groups = "unit")
-public class ListAccountsOptionsTest {
-
- public void testAccountInDomainId() {
- ListAccountsOptions options = new ListAccountsOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- ListAccountsOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testName() {
- ListAccountsOptions options = new ListAccountsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testNameStatic() {
- ListAccountsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testRecursive() {
- ListAccountsOptions options = new ListAccountsOptions().recursive(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isrecursive"));
- }
-
- public void testRecursiveStatic() {
- ListAccountsOptions options = recursive(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isrecursive"));
- }
-
- public void testState() {
- ListAccountsOptions options = new ListAccountsOptions().state("state");
- assertEquals(ImmutableList.of("state"), options.buildQueryParameters().get("state"));
- }
-
- public void testStateStatic() {
- ListAccountsOptions options = state("state");
- assertEquals(ImmutableList.of("state"), options.buildQueryParameters().get("state"));
- }
-
- public void testCleanupRequired() {
- ListAccountsOptions options = new ListAccountsOptions().cleanupRequired(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("iscleanuprequired"));
- }
-
- public void testCleanupRequiredStatic() {
- ListAccountsOptions options = cleanupRequired(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("iscleanuprequired"));
- }
-
- public void testId() {
- ListAccountsOptions options = new ListAccountsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainId() {
- ListAccountsOptions options = new ListAccountsOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testIdStatic() {
- ListAccountsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainIdStatic() {
- ListAccountsOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java
deleted file mode 100644
index be1d9c4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListAlertsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListAlertsOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListAlertsOptions.Builder.type;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListAlertsOptions}
- */
-@Test(groups = "unit")
-public class ListAlertsOptionsTest {
-
- public void testId() {
- ListAlertsOptions options = new ListAlertsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListAlertsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testKeyword() {
- ListAlertsOptions options = new ListAlertsOptions().keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListAlertsOptions options = keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testType() {
- ListAlertsOptions options = new ListAlertsOptions().type("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("type"));
- }
-
- public void testTypeStatic() {
- ListAlertsOptions options = type("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("type"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java
deleted file mode 100644
index 42f192d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListAsyncJobsOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListAsyncJobsOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListAsyncJobsOptions.Builder.startDate;
-import static org.testng.Assert.assertEquals;
-
-import java.util.Date;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListAsyncJobsOptions}
- */
-@Test(groups = "unit")
-public class ListAsyncJobsOptionsTest {
- public void testAccountInDomainId() {
- ListAsyncJobsOptions options = new ListAsyncJobsOptions().accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountInDomainIdStatic() {
- ListAsyncJobsOptions options = accountInDomain("adrian", "6");
- assertEquals(ImmutableList.of("adrian"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testStartDate() {
- ListAsyncJobsOptions options = new ListAsyncJobsOptions().startDate(new Date(100000));
- assertEquals(ImmutableList.of("1970-01-01T00:01:40Z"), options.buildQueryParameters().get("startdate"));
- }
-
- public void testDomainId() {
- ListAsyncJobsOptions options = new ListAsyncJobsOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testStartDateStatic() {
- ListAsyncJobsOptions options = startDate(new Date(100000));
- assertEquals(ImmutableList.of("1970-01-01T00:01:40Z"), options.buildQueryParameters().get("startdate"));
- }
-
- public void testDomainIdStatic() {
- ListAsyncJobsOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java
deleted file mode 100644
index 4a48ceb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.hostId;
-import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.type;
-import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.Capacity;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListCapacityOptions}
- */
-@Test(groups = "unit")
-public class ListCapacityOptionsTest {
-
- public void testHostId() {
- ListCapacityOptions options = new ListCapacityOptions().hostId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("hostid"));
- }
-
- public void testHostIdStatic() {
- ListCapacityOptions options = hostId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("hostid"));
- }
-
- public void testKeyword() {
- ListCapacityOptions options = new ListCapacityOptions().keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListCapacityOptions options = keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testPodId() {
- ListCapacityOptions options = new ListCapacityOptions().podId("5");
- assertEquals(ImmutableList.of("5"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- ListCapacityOptions options = podId("5");
- assertEquals(ImmutableList.of("5"), options.buildQueryParameters().get("podid"));
- }
-
- public void testType() {
- ListCapacityOptions options = new ListCapacityOptions().type(Capacity.Type.PUBLIC_IP_ADDRESSES);
- assertEquals(ImmutableList.of("4"), options.buildQueryParameters().get("type"));
- }
-
- public void testTypeStatic() {
- ListCapacityOptions options = type(Capacity.Type.PUBLIC_IP_ADDRESSES);
- assertEquals(ImmutableList.of("4"), options.buildQueryParameters().get("type"));
- }
-
- public void testZoneId() {
- ListCapacityOptions options = new ListCapacityOptions().zoneId("4");
- assertEquals(ImmutableList.of("4"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListCapacityOptions options = zoneId("4");
- assertEquals(ImmutableList.of("4"), options.buildQueryParameters().get("zoneid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java
deleted file mode 100644
index 88f2331..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.allocationState;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.clusterType;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.hypervisor;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.managedState;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.name;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListClustersOptions}
- */
-@Test(groups = "unit")
-public class ListClustersOptionsTest {
-
- public void testAllocationState() {
- ListClustersOptions options = new ListClustersOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- ListClustersOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testClusterType() {
- ListClustersOptions options = new ListClustersOptions().clusterType(Host.ClusterType.CLOUD_MANAGED);
- assertEquals(ImmutableList.of("CloudManaged"), options.buildQueryParameters().get("clustertype"));
- }
-
- public void testClusterTypeStatic() {
- ListClustersOptions options = clusterType(Host.ClusterType.CLOUD_MANAGED);
- assertEquals(ImmutableList.of("CloudManaged"), options.buildQueryParameters().get("clustertype"));
- }
-
- public void testHypervisor() {
- ListClustersOptions options = new ListClustersOptions().hypervisor("XenServer");
- assertEquals(ImmutableList.of("XenServer"), options.buildQueryParameters().get("hypervisor"));
- }
-
- public void testHypervisorStatic() {
- ListClustersOptions options = hypervisor("XenServer");
- assertEquals(ImmutableList.of("XenServer"), options.buildQueryParameters().get("hypervisor"));
- }
-
- public void testId() {
- ListClustersOptions options = new ListClustersOptions().id("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListClustersOptions options = id("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("id"));
- }
-
- public void testKeyword() {
- ListClustersOptions options = new ListClustersOptions().keyword("Enabled");
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListClustersOptions options = keyword("Enabled");
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testManagedState() {
- ListClustersOptions options = new ListClustersOptions().managedState(Cluster.ManagedState.PREPARE_UNMANAGED);
- assertEquals(ImmutableList.of("PrepareUnmanaged"), options.buildQueryParameters().get("managedstate"));
- }
-
- public void testManagedStateStatic() {
- ListClustersOptions options = managedState(Cluster.ManagedState.PREPARE_UNMANAGED);
- assertEquals(ImmutableList.of("PrepareUnmanaged"), options.buildQueryParameters().get("managedstate"));
- }
-
- public void testName() {
- ListClustersOptions options = new ListClustersOptions().name("Host Name");
- assertEquals(ImmutableList.of("Host Name"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- ListClustersOptions options = name("Host Name");
- assertEquals(ImmutableList.of("Host Name"), options.buildQueryParameters().get("name"));
- }
-
- public void testPodId() {
- ListClustersOptions options = new ListClustersOptions().podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- ListClustersOptions options = podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
- public void testZoneId() {
- ListClustersOptions options = new ListClustersOptions().zoneId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListClustersOptions options = zoneId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("zoneid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java
deleted file mode 100644
index 8160d93..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListDiskOfferingsOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListDiskOfferingsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListDiskOfferingsOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListDiskOfferingsOptions}
- */
-@Test(groups = "unit")
-public class ListDiskOfferingsOptionsTest {
-
- public void testId() {
- ListDiskOfferingsOptions options = new ListDiskOfferingsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListDiskOfferingsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testName() {
- ListDiskOfferingsOptions options = new ListDiskOfferingsOptions().name("foo");
- assertEquals(ImmutableList.of("foo"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- ListDiskOfferingsOptions options = name("foo");
- assertEquals(ImmutableList.of("foo"), options.buildQueryParameters().get("name"));
- }
-
- public void testDomainId() {
- ListDiskOfferingsOptions options = new ListDiskOfferingsOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListDiskOfferingsOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java
deleted file mode 100644
index 6f3aaf8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.allocationState;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.clusterId;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.name;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.page;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.pageSize;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.podId;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.state;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.type;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.virtualMachineId;
-import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Host;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListHostsOptions}
- */
-@Test(groups = "unit")
-public class ListHostsOptionsTest {
-
- public void testId() {
- ListHostsOptions options = new ListHostsOptions().id("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListHostsOptions options = id("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("id"));
- }
-
- public void testAllocationState() {
- ListHostsOptions options = new ListHostsOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- ListHostsOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testClusterId() {
- ListHostsOptions options = new ListHostsOptions().clusterId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("clusterid"));
- }
-
- public void testClusterIdStatic() {
- ListHostsOptions options = clusterId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("clusterid"));
- }
-
- public void testKeyword() {
- ListHostsOptions options = new ListHostsOptions().keyword("Enabled");
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListHostsOptions options = keyword("Enabled");
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testName() {
- ListHostsOptions options = new ListHostsOptions().name("Host Name");
- assertEquals(ImmutableList.of("Host Name"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- ListHostsOptions options = name("Host Name");
- assertEquals(ImmutableList.of("Host Name"), options.buildQueryParameters().get("name"));
- }
-
- public void testPage() {
- ListHostsOptions options = new ListHostsOptions().page(42L);
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("page"));
- }
-
- public void testPageStatic() {
- ListHostsOptions options = page(42L);
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("page"));
- }
-
- public void testPageSize() {
- ListHostsOptions options = new ListHostsOptions().pageSize(42L);
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("pagesize"));
- }
-
- public void testPageSizeStatic() {
- ListHostsOptions options = pageSize(42L);
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("pagesize"));
- }
-
- public void testPodId() {
- ListHostsOptions options = new ListHostsOptions().podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
- public void testPodIdStatic() {
- ListHostsOptions options = podId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("podid"));
- }
-
- public void testState() {
- ListHostsOptions options = new ListHostsOptions().state("Up");
- assertEquals(ImmutableList.of("Up"), options.buildQueryParameters().get("state"));
- }
-
- public void testStateStatic() {
- ListHostsOptions options = state("Up");
- assertEquals(ImmutableList.of("Up"), options.buildQueryParameters().get("state"));
- }
-
- public void testType() {
- ListHostsOptions options = new ListHostsOptions().type(Host.Type.ROUTING);
- assertEquals(ImmutableList.of("Routing"), options.buildQueryParameters().get("type"));
- }
-
- public void testTypeStatic() {
- ListHostsOptions options = type(Host.Type.ROUTING);
- assertEquals(ImmutableList.of("Routing"), options.buildQueryParameters().get("type"));
- }
-
- public void testVirtualMachineId() {
- ListHostsOptions options = new ListHostsOptions().virtualMachineId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("virtualmachineid"));
- }
-
- public void testVirtualMachineIdStatic() {
- ListHostsOptions options = virtualMachineId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("virtualmachineid"));
- }
-
- public void testZoneId() {
- ListHostsOptions options = new ListHostsOptions().zoneId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListHostsOptions options = zoneId("42");
- assertEquals(ImmutableList.of("42"), options.buildQueryParameters().get("zoneid"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java
deleted file mode 100644
index 34bc42f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListIPForwardingRulesOptions.Builder.IPAddressId;
-import static org.jclouds.cloudstack.options.ListIPForwardingRulesOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListIPForwardingRulesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListIPForwardingRulesOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListIPForwardingRulesOptions.Builder.virtualMachineId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListIPForwardingRulesOptions}
- */
-@Test(groups = "unit")
-public class ListIPForwardingRulesOptionsTest {
-
- public void testId() {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListIPForwardingRulesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testAccount() {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions().accountInDomain("account", "6");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountStatic() {
- ListIPForwardingRulesOptions options = accountInDomain("account", "6");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testName() {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions().IPAddressId("9");
- assertEquals(ImmutableList.of("9"), options.buildQueryParameters().get("ipaddressid"));
- }
-
- public void testNameStatic() {
- ListIPForwardingRulesOptions options = IPAddressId("9");
- assertEquals(ImmutableList.of("9"), options.buildQueryParameters().get("ipaddressid"));
- }
-
- public void testDomainId() {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListIPForwardingRulesOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testVirtualMachineId() {
- ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions().virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-
- public void testVirtualMachineIdStatic() {
- ListIPForwardingRulesOptions options = virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListISOsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListISOsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListISOsOptionsTest.java
deleted file mode 100644
index 2494a66..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListISOsOptionsTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.bootable;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.hypervisor;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.isNotReady;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.isPrivate;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.isPublic;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.isReady;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.isoFilter;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.name;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.notBootable;
-import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.ISO;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@link ListISOsOptions}
- */
-@Test(groups = "unit")
-public class ListISOsOptionsTest {
- private static final Set<String> TRUE = ImmutableSet.of(Boolean.toString(true));
- private static final Set<String> FALSE = ImmutableSet.of(Boolean.toString(false));
-
- public void testBootable() {
- ListISOsOptions options = new ListISOsOptions().bootable();
- assertEquals(options.buildQueryParameters().get("bootable"), TRUE);
- }
-
- public void testBootableStatic() {
- ListISOsOptions options = bootable();
- assertEquals(options.buildQueryParameters().get("bootable"), TRUE);
- }
-
- public void testNotBootable() {
- ListISOsOptions options = new ListISOsOptions().notBootable();
- assertEquals(options.buildQueryParameters().get("bootable"), FALSE);
- }
-
- public void testNotBootableStatic() {
- ListISOsOptions options = notBootable();
- assertEquals(options.buildQueryParameters().get("bootable"), FALSE);
- }
-
- public void testHypervisor() {
- ListISOsOptions options = new ListISOsOptions().hypervisor("KVM");
- assertEquals(options.buildQueryParameters().get("hypervisor"), ImmutableSet.of("KVM"));
- }
-
- public void testHypervisorStatic() {
- ListISOsOptions options = hypervisor("KVM");
- assertEquals(options.buildQueryParameters().get("hypervisor"), ImmutableSet.of("KVM"));
- }
-
- public void testId() {
- ListISOsOptions options = new ListISOsOptions().id("6");
- assertEquals(options.buildQueryParameters().get("id"), ImmutableSet.of("6"));
- }
-
- public void testIdStatic() {
- ListISOsOptions options = id("6");
- assertEquals(options.buildQueryParameters().get("id"), ImmutableSet.of("6"));
- }
-
- public void testISOFilter() {
- ListISOsOptions options = new ListISOsOptions().isoFilter(ISO.ISOFilter.community);
- assertEquals(options.buildQueryParameters().get("isofilter"), ImmutableSet.of(ISO.ISOFilter.community.name()));
- }
-
- public void testISOFilterStatic() {
- ListISOsOptions options = isoFilter(ISO.ISOFilter.community);
- assertEquals(options.buildQueryParameters().get("isofilter"), ImmutableSet.of(ISO.ISOFilter.community.name()));
- }
-
- public void testIsPublic() {
- ListISOsOptions options = new ListISOsOptions().isPublic();
- assertEquals(options.buildQueryParameters().get("ispublic"), TRUE);
- }
-
- public void testIsPublicStatic() {
- ListISOsOptions options = isPublic();
- assertEquals(options.buildQueryParameters().get("ispublic"), TRUE);
- }
-
- public void testIsPrivate() {
- ListISOsOptions options = new ListISOsOptions().isPrivate();
- assertEquals(options.buildQueryParameters().get("ispublic"), FALSE);
- }
-
- public void testIsPrivateStatic() {
- ListISOsOptions options = isPrivate();
- assertEquals(options.buildQueryParameters().get("ispublic"), FALSE);
- }
-
- public void testIsReady() {
- ListISOsOptions options = new ListISOsOptions().isReady();
- assertEquals(options.buildQueryParameters().get("isready"), TRUE);
- }
-
- public void testIsReadyStatic() {
- ListISOsOptions options = isReady();
- assertEquals(options.buildQueryParameters().get("isready"), TRUE);
- }
-
- public void testIsNotReady() {
- ListISOsOptions options = new ListISOsOptions().isNotReady();
- assertEquals(options.buildQueryParameters().get("isready"), FALSE);
- }
-
- public void testIsNotReadyStatic() {
- ListISOsOptions options = isNotReady();
- assertEquals(options.buildQueryParameters().get("isready"), FALSE);
- }
-
- public void testKeyword() {
- ListISOsOptions options = new ListISOsOptions().keyword("text");
- assertEquals(options.buildQueryParameters().get("keyword"), ImmutableSet.of("text"));
- }
-
- public void testKeywordStatic() {
- ListISOsOptions options = keyword("text");
- assertEquals(options.buildQueryParameters().get("keyword"), ImmutableSet.of("text"));
- }
-
- public void testName() {
- ListISOsOptions options = new ListISOsOptions().name("text");
- assertEquals(options.buildQueryParameters().get("name"), ImmutableSet.of("text"));
- }
-
- public void testNameStatic() {
- ListISOsOptions options = name("text");
- assertEquals(options.buildQueryParameters().get("name"), ImmutableSet.of("text"));
- }
-
- public void testZoneId() {
- ListISOsOptions options = new ListISOsOptions().zoneId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListISOsOptions options = zoneId("6");
- assertEquals(ImmutableSet.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java
deleted file mode 100644
index 228e323..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.name;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.page;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.pageSize;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.publicIPId;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.virtualMachineId;
-import static org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListLoadBalancerRulesOptions}
- */
-@Test(groups = "unit")
-public class ListLoadBalancerRulesOptionsTest {
-
- public void testId() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListLoadBalancerRulesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testAccount() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().accountInDomain("account", "6");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountStatic() {
- ListLoadBalancerRulesOptions options = accountInDomain("account", "6");
- assertEquals(ImmutableList.of("account"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testName() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().name("name");
- assertEquals(ImmutableList.of("name"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- ListLoadBalancerRulesOptions options = name("name");
- assertEquals(ImmutableList.of("name"), options.buildQueryParameters().get("name"));
- }
-
- public void testPublicIPId() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().publicIPId("9");
- assertEquals(ImmutableList.of("9"), options.buildQueryParameters().get("publicipid"));
- }
-
- public void testPublicIPIdStatic() {
- ListLoadBalancerRulesOptions options = publicIPId("9");
- assertEquals(ImmutableList.of("9"), options.buildQueryParameters().get("publicipid"));
- }
-
- public void testDomainId() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListLoadBalancerRulesOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testVirtualMachineId() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-
- public void testVirtualMachineIdStatic() {
- ListLoadBalancerRulesOptions options = virtualMachineId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("virtualmachineid"));
- }
-
- public void testZoneId() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListLoadBalancerRulesOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testPage() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().page(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("page"));
- }
-
- public void testPageStatic() {
- ListLoadBalancerRulesOptions options = page(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("page"));
- }
-
- public void testPageSize() {
- ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions().pageSize(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("pagesize"));
- }
-
- public void testPageSizeStatic() {
- ListLoadBalancerRulesOptions options = pageSize(6);
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("pagesize"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java
deleted file mode 100644
index bac1c44..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.availability;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.displayText;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.isDefault;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.isShared;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.specifyVLAN;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.trafficType;
-import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListNetworkOfferingsOptions}
- */
-@Test(groups = "unit")
-public class ListNetworkOfferingsOptionsTest {
-
- public void testIsDefault() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().isDefault(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
- }
-
- public void testIsDefaultStatic() {
- ListNetworkOfferingsOptions options = isDefault(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
- }
-
- public void testIsShared() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().isShared(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
- }
-
- public void testIsSharedStatic() {
- ListNetworkOfferingsOptions options = isShared(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
- }
-
- public void testId() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListNetworkOfferingsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testZoneId() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListNetworkOfferingsOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testSpecifyVLAN() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().specifyVLAN(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("specifyvlan"));
- }
-
- public void testSpecifyVLANStatic() {
- ListNetworkOfferingsOptions options = specifyVLAN(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("specifyvlan"));
- }
-
- public void testAvailability() {
- ListNetworkOfferingsOptions options =
- new ListNetworkOfferingsOptions().availability(NetworkOfferingAvailabilityType.REQUIRED);
- assertEquals(ImmutableList.of("Required"), options.buildQueryParameters().get("availability"));
- }
-
- public void testAvailabilityStatic() {
- ListNetworkOfferingsOptions options = availability(NetworkOfferingAvailabilityType.REQUIRED);
- assertEquals(ImmutableList.of("Required"), options.buildQueryParameters().get("availability"));
- }
-
- public void testTrafficType() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().trafficType(TrafficType.GUEST);
- assertEquals(ImmutableList.of("Guest"), options.buildQueryParameters().get("traffictype"));
- }
-
- public void testTrafficTypeStatic() {
- ListNetworkOfferingsOptions options = trafficType(TrafficType.GUEST);
- assertEquals(ImmutableList.of("Guest"), options.buildQueryParameters().get("traffictype"));
- }
-
- public void testName() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testNameStatic() {
- ListNetworkOfferingsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDisplayText() {
- ListNetworkOfferingsOptions options = new ListNetworkOfferingsOptions().displayText("text");
- assertEquals(ImmutableList.of("text"), options.buildQueryParameters().get("displaytext"));
- }
-
- public void testDisplayTextStatic() {
- ListNetworkOfferingsOptions options = displayText("text");
- assertEquals(ImmutableList.of("text"), options.buildQueryParameters().get("displaytext"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java
deleted file mode 100644
index 0db9e5a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.accountInDomain;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.domainId;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.isDefault;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.isShared;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.isSystem;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.trafficType;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.type;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.TrafficType;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListNetworksOptions}
- */
-@Test(groups = "unit")
-public class ListNetworksOptionsTest {
-
- public void testIsDefault() {
- ListNetworksOptions options = new ListNetworksOptions().isDefault(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
- }
-
- public void testIsDefaultStatic() {
- ListNetworksOptions options = isDefault(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isdefault"));
- }
-
- public void testIsSystem() {
- ListNetworksOptions options = new ListNetworksOptions().isSystem(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("issystem"));
- }
-
- public void testIsSystemStatic() {
- ListNetworksOptions options = isSystem(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("issystem"));
- }
-
- public void testIsShared() {
- ListNetworksOptions options = new ListNetworksOptions().isShared(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
- }
-
- public void testIsSharedStatic() {
- ListNetworksOptions options = isShared(true);
- assertEquals(ImmutableList.of("true"), options.buildQueryParameters().get("isshared"));
- }
-
- public void testId() {
- ListNetworksOptions options = new ListNetworksOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListNetworksOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testDomainId() {
- ListNetworksOptions options = new ListNetworksOptions().domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testDomainIdStatic() {
- ListNetworksOptions options = domainId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountId() {
- ListNetworksOptions options = new ListNetworksOptions().accountInDomain("moo", "1");
- assertEquals(ImmutableList.of("1"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testAccountIdStatic() {
- ListNetworksOptions options = accountInDomain("moo", "1");
- assertEquals(ImmutableList.of("moo"), options.buildQueryParameters().get("account"));
- assertEquals(ImmutableList.of("1"), options.buildQueryParameters().get("domainid"));
- }
-
- public void testTrafficType() {
- ListNetworksOptions options = new ListNetworksOptions().trafficType(TrafficType.GUEST);
- assertEquals(ImmutableList.of("Guest"), options.buildQueryParameters().get("traffictype"));
- }
-
- public void testTrafficTypeStatic() {
- ListNetworksOptions options = trafficType(TrafficType.GUEST);
- assertEquals(ImmutableList.of("Guest"), options.buildQueryParameters().get("traffictype"));
- }
-
- public void testName() {
- ListNetworksOptions options = new ListNetworksOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testNameStatic() {
- ListNetworksOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testZoneId() {
- ListNetworksOptions options = new ListNetworksOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListNetworksOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testType() {
- ListNetworksOptions options = new ListNetworksOptions().type(NetworkType.ADVANCED);
- assertEquals(ImmutableList.of("Advanced"), options.buildQueryParameters().get("type"));
- }
-
- public void testTypeStatic() {
- ListNetworksOptions options = type(NetworkType.ADVANCED);
- assertEquals(ImmutableList.of("Advanced"), options.buildQueryParameters().get("type"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java
deleted file mode 100644
index 86ddf65..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListOSTypesOptions.Builder.OSCategoryId;
-import static org.jclouds.cloudstack.options.ListOSTypesOptions.Builder.id;
-import static org.testng.Assert.assertEquals;
-
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListOSTypesOptions}
- */
-@Test(groups = "unit")
-public class ListOSTypesOptionsTest {
-
- public void testId() {
- ListOSTypesOptions options = new ListOSTypesOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListOSTypesOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testOSCategoryId() {
- ListOSTypesOptions options = new ListOSTypesOptions().OSCategoryId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("oscategoryid"));
- }
-
- public void testOSCategoryIdStatic() {
- ListOSTypesOptions options = OSCategoryId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("oscategoryid"));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java
deleted file mode 100644
index 3b2c682..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.options;
-
-import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.allocationState;
-import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.id;
-import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.keyword;
-import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.name;
-import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.zoneId;
-import static org.testng.Assert.assertEquals;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests behavior of {@code ListPodsOptions}
- */
-@Test(groups = "unit")
-public class ListPodsOptionsTest {
-
- public void testId() {
- ListPodsOptions options = new ListPodsOptions().id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testIdStatic() {
- ListPodsOptions options = id("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("id"));
- }
-
- public void testAllocationState() {
- ListPodsOptions options = new ListPodsOptions().allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testAllocationStateStatic() {
- ListPodsOptions options = allocationState(AllocationState.ENABLED);
- assertEquals(ImmutableList.of("Enabled"), options.buildQueryParameters().get("allocationstate"));
- }
-
- public void testKeyword() {
- ListPodsOptions options = new ListPodsOptions().keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testKeywordStatic() {
- ListPodsOptions options = keyword("fred");
- assertEquals(ImmutableList.of("fred"), options.buildQueryParameters().get("keyword"));
- }
-
- public void testName() {
- ListPodsOptions options = new ListPodsOptions().name("bob");
- assertEquals(ImmutableList.of("bob"), options.buildQueryParameters().get("name"));
- }
-
- public void testNameStatic() {
- ListPodsOptions options = name("bob");
- assertEquals(ImmutableList.of("bob"), options.buildQueryParameters().get("name"));
- }
-
- public void testZoneId() {
- ListPodsOptions options = new ListPodsOptions().zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
- public void testZoneIdStatic() {
- ListPodsOptions options = zoneId("6");
- assertEquals(ImmutableList.of("6"), options.buildQueryParameters().get("zoneid"));
- }
-
-}
[07/51] [abbrv] stratos git commit: works untill 27th oct--added
public ip method and network ids
Posted by im...@apache.org.
works untill 27th oct--added public ip method and network ids
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/28d0bbd2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/28d0bbd2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/28d0bbd2
Branch: refs/heads/master
Commit: 28d0bbd2a3434a5c247155812252527967c3c7fc
Parents: fff134d
Author: asankasa <as...@wso2.com>
Authored: Mon Oct 27 18:23:11 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:29 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/CloudstackIaas.java | 156 +++++++++++--------
.../util/CloudControllerConstants.java | 1 +
2 files changed, 95 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/28d0bbd2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index 926894f..a86e1c8 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -15,8 +15,10 @@ import org.apache.stratos.cloud.controller.validate.CloudstackPartitionValidator
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
import org.jclouds.cloudstack.CloudStackApi;
import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
+import org.jclouds.cloudstack.domain.PublicIPAddress;
import org.jclouds.cloudstack.domain.Volume;
import org.jclouds.cloudstack.domain.Zone;
+import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions;
import org.jclouds.cloudstack.options.ListZonesOptions;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.NodeMetadata;
@@ -31,11 +33,13 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeoutException;
-public class CloudstackIaas extends Iaas{
+public class CloudstackIaas extends Iaas {
private static final Log log = LogFactory.getLog(CloudstackIaas.class);
- public CloudstackIaas(IaasProvider iaasProvider) {super(iaasProvider);}
+ public CloudstackIaas(IaasProvider iaasProvider) {
+ super(iaasProvider);
+ }
@Override
public void buildComputeServiceAndTemplate() {
@@ -68,7 +72,7 @@ public class CloudstackIaas extends Iaas{
* PROPERTY - 1
* set image id specified
*/
- templateBuilder.imageId(iaasInfo.getImage());
+ templateBuilder.imageId(iaasInfo.getImage());
/**
* PROPERTY-2
@@ -76,13 +80,12 @@ public class CloudstackIaas extends Iaas{
* (user should provide the zone id for this)
*/
- if(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
+ if (iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
Set<? extends Location> locations = iaasInfo.getComputeService().listAssignableLocations();
- for(Location location : locations) {
- if(location.getScope().toString().equalsIgnoreCase(CloudControllerConstants.ZONE_ELEMENT) &&
- location.getId().equals(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE))) {
+ for (Location location : locations) {
+ if (location.getId().equals(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE))) {
//if the zone is valid set the zone to templateBuilder Object
- templateBuilder.locationId(location.getId());
+ templateBuilder.locationId(location.getId());
log.info("ZONE has been set as " + iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE)
+ " with id: " + location.getId());
break;
@@ -95,7 +98,7 @@ public class CloudstackIaas extends Iaas{
* if user has specified an instance type in cloud-controller.xml, set the instance type into templateBuilder
* object.
*Important:Specify the Service Offering type ID. Not the name. Because the name is not unique.
- */
+ */
if (iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE) != null) {
templateBuilder.hardwareId(iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE));
}
@@ -116,18 +119,26 @@ public class CloudstackIaas extends Iaas{
// this is required in order to avoid creation of additional security
// groups by Jclouds.
template.getOptions().as(TemplateOptions.class)
- .inboundPorts(new int[] {});
+ .inboundPorts(new int[]{});
//*******************SET CLOUDSTACK SPECIFIC PROPERTIES TO TEMPLATE OBJECT*********************************//
- //set security group
+ //set security group. If you are using basic zone
if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS) != null) {
template.getOptions()
.as(CloudStackTemplateOptions.class)
.securityGroupIds(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS)
.split(CloudControllerConstants.ENTRY_SEPARATOR)));
- }
+ }
+
+ //set network IDs. If you are using Advanced zone
+ if (iaasInfo.getProperty(CloudControllerConstants.NETWORK_IDS) != null) {
+ template.getOptions()
+ .as(CloudStackTemplateOptions.class)
+ .networks(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.NETWORK_IDS)
+ .split(CloudControllerConstants.ENTRY_SEPARATOR)));
+ }
//set user name
if (iaasInfo.getProperty(CloudControllerConstants.USER_NAME) != null) {
@@ -145,13 +156,12 @@ public class CloudstackIaas extends Iaas{
* in cloudstack we cannot access a key pair without specifying user name and domain ID
*/
if (iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR) != null &&
- iaasInfo.getProperty(CloudControllerConstants.USER_NAME)!= null &&
- iaasInfo.getProperty(CloudControllerConstants.DOMAIN_ID) != null ) {
+ iaasInfo.getProperty(CloudControllerConstants.USER_NAME) != null &&
+ iaasInfo.getProperty(CloudControllerConstants.DOMAIN_ID) != null) {
template.getOptions().as(CloudStackTemplateOptions.class)
.keyPair(iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR));
}
- //todo this is not working
// ability to define tags
if (iaasInfo.getProperty(CloudControllerConstants.TAGS) != null) {
template.getOptions()
@@ -159,7 +169,7 @@ public class CloudstackIaas extends Iaas{
.tags(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.TAGS)
.split(CloudControllerConstants.ENTRY_SEPARATOR)));
}
- //todo check whether this is working or not
+ //set disk offering to the instance
if (iaasInfo.getProperty(CloudControllerConstants.DISK_OFFERING) != null) {
template.getOptions()
.as(CloudStackTemplateOptions.class)
@@ -172,54 +182,80 @@ public class CloudstackIaas extends Iaas{
@Override
public void setDynamicPayload() {
- System.out.println("=====================inside set setDynamicPayload method=================================");
-
IaasProvider iaasInfo = getIaasProvider();
if (iaasInfo.getTemplate() != null && iaasInfo.getPayload() != null) {
- //todo check whether this is working or not
- iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class)
- .userMetadata(convertByteArrayToHashMap(iaasInfo.getPayload()));
+ iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class)
+ .userMetadata(convertByteArrayToHashMap(iaasInfo.getPayload()));
}
}
+ /**
+ * IMPORTANT
+ * In cloudstack we can assign public IPs, if we are using an advances zone only. If we are using a basic zone
+ * we cannot assign public ips.
+ * <p/>
+ * When we use an advanced zone, a public IP address will get automatically assigned to the vm. So we don't need
+ * to find an unallocated IP address and assign that address to the vm (not like in ec2 and openstack).
+ * <p/>
+ * So this method will find the IP that has been assigned to the vm and return it.
+ */
@Override
public String associateAddress(NodeMetadata node) {
- //todo implement this method
-
IaasProvider iaasInfo = getIaasProvider();
ComputeServiceContext context = iaasInfo.getComputeService().getContext();
CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
String ip = null;
+
+ // get all allocated IPs
+ ListPublicIPAddressesOptions listPublicIPAddressesOptions = new ListPublicIPAddressesOptions();
+ listPublicIPAddressesOptions.zoneId(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE));
+
+ Set<PublicIPAddress> publicIPAddresses = cloudStackApi.getAddressApi().listPublicIPAddresses(listPublicIPAddressesOptions);
+
+ String id = node.getProviderId(); //vm ID
+
+ for (PublicIPAddress publicIPAddress : publicIPAddresses) {
+ if (publicIPAddress.getVirtualMachineId().equals(id)) { //check whether this instance has
+ // already got an public ip or not
+ ip = publicIPAddress.getIPAddress(); //A public ip has been successfully assigned to the vm
+ log.debug("Successfully associated an IP address " + ip
+ + " for node with id: " + node.getId());
+ break;
+ }
+
+ }
+
+ if (ip == null || ip.isEmpty()) { //IP has not been successfully assigned to VM(That means there are
+ // no more IPs available for the VM)
+ String msg = "No address associated for node with id: " + node.getId();
+ log.debug(msg);
+ throw new CloudControllerException(msg);
+ }
+
return ip;
}
@Override
public String associatePredefinedAddress(NodeMetadata node, String ip) {
-
- System.out.println("======================This is the associatePredefinedAddress method=====================");
- //todo implement this method
- return null;
+ return "";
}
@Override
public void releaseAddress(String ip) {
- //todo test this method
- System.out.println("======================this is the releaseAddress method============");
IaasProvider iaasInfo = getIaasProvider();
-
ComputeServiceContext context = iaasInfo.getComputeService().getContext();
CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
cloudStackApi.getAddressApi().disassociateIPAddress(ip);
+
}
@Override
public boolean createKeyPairFromPublicKey(String region, String keyPairName, String publicKey) {
//todo implement this method
- System.out.println("===============inside the create key pair method===================");
return false;
}
@@ -227,9 +263,8 @@ public class CloudstackIaas extends Iaas{
public boolean isValidRegion(String region) throws InvalidRegionException {
IaasProvider iaasInfo = getIaasProvider();
-
//no such method in Jclouds cloudstack api
- String msg = "Invalid region: " + region +" in the iaas: " +iaasInfo.getType();
+ String msg = "Invalid region: " + region + " in the iaas: " + iaasInfo.getType();
log.error(msg);
throw new InvalidRegionException(msg);
}
@@ -238,19 +273,18 @@ public class CloudstackIaas extends Iaas{
public boolean isValidZone(String region, String zone) throws InvalidZoneException {
IaasProvider iaasInfo = getIaasProvider();
-
ComputeServiceContext context = iaasInfo.getComputeService().getContext();
CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
ListZonesOptions listZonesOptions = new ListZonesOptions();
listZonesOptions.available(true);
Set<Zone> zoneSet = cloudStackApi.getZoneApi().listZones(listZonesOptions);
- for(org.jclouds.cloudstack.domain.Zone configuredZone :zoneSet){
- if(configuredZone.getName().equalsIgnoreCase(zone)){
+ for (org.jclouds.cloudstack.domain.Zone configuredZone : zoneSet) {
+ if (configuredZone.getName().equalsIgnoreCase(zone)) {
return true;
}
}
- String msg = "Invalid zone: " + zone +" in the iaas: "+iaasInfo.getType();
+ String msg = "Invalid zone: " + zone + " in the iaas: " + iaasInfo.getType();
log.error(msg);
throw new InvalidZoneException(msg);
}
@@ -260,7 +294,7 @@ public class CloudstackIaas extends Iaas{
IaasProvider iaasInfo = getIaasProvider();
// there's no such method in jclouds cloustack api
- String msg = "Invalid host: " + host +" in the zone: "+zone+ " and of the iaas: "+iaasInfo.getType();
+ String msg = "Invalid host: " + host + " in the zone: " + zone + " and of the iaas: " + iaasInfo.getType();
log.error(msg);
throw new InvalidHostException(msg);
@@ -273,13 +307,12 @@ public class CloudstackIaas extends Iaas{
@Override
public String createVolume(int sizeGB, String snapshotId) {
-
//todo implement this method
return null;
}
@Override
- public String attachVolume(String instanceId, String volumeId , String deviceName) {
+ public String attachVolume(String instanceId, String volumeId, String deviceName) {
IaasProvider iaasInfo = getIaasProvider();
@@ -301,23 +334,23 @@ public class CloudstackIaas extends Iaas{
//volume state ALLOCATED means that volume has not been attached to any instance.
//TODO there is an error with logic.
- if(!(volumeState == Volume.State.ALLOCATED || volumeState == Volume.State.CREATING || volumeState == Volume.State.READY)){
- log.error(String.format("Volume %s can not be attached. Volume status is %s", volumeId, volumeState));
+ if (!(volumeState == Volume.State.ALLOCATED || volumeState == Volume.State.CREATING || volumeState == Volume.State.READY)) {
+ log.error(String.format("Volume %s can not be attached. Volume status is %s", volumeId, volumeState));
}
//check whether the account of volume and instance is same
- if(!volume.getAccount().equals(cloudStackApi.getVirtualMachineApi().getVirtualMachine(instanceId).getAccount())){
- log.error(String.format("Volume %s can not be attached. Instance account and Volume account are not the same ", volumeId));
+ if (!volume.getAccount().equals(cloudStackApi.getVirtualMachineApi().getVirtualMachine(instanceId).getAccount())) {
+ log.error(String.format("Volume %s can not be attached. Instance account and Volume account are not the same ", volumeId));
}
boolean volumeBecameAvailable = false, volumeBecameAttached = false;
try {
- if(volumeState == Volume.State.CREATING) {
+ if (volumeState == Volume.State.CREATING) {
volumeBecameAvailable = waitForStatus(volumeId, Volume.State.ALLOCATED, 5);
- }else if(volumeState == Volume.State.READY){
+ } else if (volumeState == Volume.State.READY) {
volumeBecameAvailable = true;
}
@@ -346,7 +379,7 @@ public class CloudstackIaas extends Iaas{
}
//If volume state is not 'READY'
- if(!volumeBecameAttached){
+ if (!volumeBecameAttached) {
log.error(String.format("[Volume ID] %s attachment is called, but not yet became attached", volumeId));
}
@@ -366,7 +399,7 @@ public class CloudstackIaas extends Iaas{
ComputeServiceContext context = iaasInfo.getComputeService()
.getContext();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Starting to detach volume %s from the instance %s", volumeId, instanceId));
}
@@ -375,8 +408,8 @@ public class CloudstackIaas extends Iaas{
cloudStackApi.getVolumeApi().detachVolume(volumeId);
try {
- //TODO this is wrong
- if(waitForStatus(volumeId, Volume.State.ALLOCATED, 5)){
+ //TODO this is true only for newly created volumes
+ if (waitForStatus(volumeId, Volume.State.ALLOCATED, 5)) {
log.info(String.format("Detachment of Volume [id]: %s from instance [id]: %s was successful. [region] : %s of Iaas : %s", volumeId, instanceId, iaasInfo));
}
} catch (TimeoutException e) {
@@ -392,13 +425,12 @@ public class CloudstackIaas extends Iaas{
.getContext();
CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
cloudStackApi.getVolumeApi().deleteVolume(volumeId);
- log.info("Deletion of Volume [id]: "+volumeId+" was successful. "
+ log.info("Deletion of Volume [id]: " + volumeId + " was successful. "
+ " of Iaas : " + iaasInfo);
}
@Override
- public String getIaasDevice(String device)
- {//todo implement this method
+ public String getIaasDevice(String device) {//todo implement this method
return null;
}
@@ -415,42 +447,42 @@ public class CloudstackIaas extends Iaas{
Volume.State volumeState = volume.getState();
- while(volumeState != expectedStatus){
+ while (volumeState != expectedStatus) {
try {
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug(String.format("Volume %s is still NOT in %s. Current State=%s", volumeId, expectedStatus, volumeState));
}
- if(volumeState == Volume.State.FAILED || volumeState == Volume.State.DESTROYED || volumeState == Volume.State.UNRECOGNIZED){
+ if (volumeState == Volume.State.FAILED || volumeState == Volume.State.DESTROYED || volumeState == Volume.State.UNRECOGNIZED) {
log.error("Volume " + volumeId + " is in state" + volumeState);
return false;
}
Thread.sleep(1000);
volumeState = volume.getState();
- if (System.currentTimeMillis()> timout) {
+ if (System.currentTimeMillis() > timout) {
throw new TimeoutException();
}
} catch (InterruptedException e) {
// Ignoring the exception
}
}
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug(String.format("Volume %s status became %s", volumeId, expectedStatus));
}
return true;
}
- private Map<String,String> convertByteArrayToHashMap(byte[] byteArray){
+ private Map<String, String> convertByteArrayToHashMap(byte[] byteArray) {
Map<String, String> map = new HashMap<String, String>();
- String stringFromByteArray = new String(byteArray);
+ String stringFromByteArray = new String(byteArray);
String[] keyValuePairs = stringFromByteArray.split(",");
- for(String keyValuePair : keyValuePairs){
+ for (String keyValuePair : keyValuePairs) {
String[] keyValue = keyValuePair.split("=");
- if(keyValue.length>1) {
+ if (keyValue.length > 1) {
map.put(keyValue[0], keyValue[1]);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28d0bbd2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index c72d0ba..88e3e86 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -102,6 +102,7 @@ public final class CloudControllerConstants {
public static final String USER_NAME = "userName";
public static final String DOMAIN_ID = "domainId";
public static final String DISK_OFFERING = "diskOffering";
+ public static final String NETWORK_IDS= "networkIds";
/**
* column names
[22/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java
deleted file mode 100644
index 46f20f9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.ssh.SshKeys;
-import org.jclouds.util.Strings2;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack SSHKeyPairApi
- */
-@Test(groups = "unit", testName = "SSHKeyPairApiExpectTest")
-public class SSHKeyPairApiExpectTest extends BaseCloudStackExpectTest<SSHKeyPairApi> {
-
- @Test
- public void testListAndGetSSHKeyPairsWhenResponseIs2xx() {
- HttpResponse response = HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listsshkeypairsresponse.json"))
- .build();
-
- SSHKeyPairApi client = requestSendsResponse(HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listSSHKeyPairs&listAll=true&apiKey=identity&signature=5d2J9u%2BdKpkQsadDbl9i9OcUSLQ%3D"))
- .addHeader("Accept", "application/json")
- .build(), response);
-
- assertEquals(client.listSSHKeyPairs(), ImmutableSet.of(
- SshKeyPair.builder().name("jclouds-keypair")
- .fingerprint("1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b").build()));
-
- client = requestSendsResponse(HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=listSSHKeyPairs&listAll=true&" +
- "name=jclouds-keypair&apiKey=identity&signature=hJIVCFOHhdOww3aq19tFHpeD2HI%3D"))
- .addHeader("Accept", "application/json")
- .build(), response);
-
- assertEquals(client.getSSHKeyPair("jclouds-keypair"),
- SshKeyPair.builder().name("jclouds-keypair")
- .fingerprint("1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b").build());
- }
-
- @Test
- public void testCreateSSHKeyPairsWhenResponseIs2xx() {
- SSHKeyPairApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=createSSHKeyPair&" +
- "name=jclouds-keypair&apiKey=identity&signature=8wk32PZF44jrBLH2HLel22%2BqMC4%3D"))
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createsshkeypairresponse.json"))
- .build());
-
- SshKeyPair actual = client.createSSHKeyPair("jclouds-keypair");
- SshKeyPair expected = SshKeyPair.builder().name("jclouds-keypair")
- .fingerprint("1c:06:74:52:3b:99:1c:95:5c:04:c2:f4:ba:77:6e:7b")
- .privateKey("-----BEGIN RSA PRIVATE KEY-----\n" +
- "MIICXgIBAAKBgQDZo/EF4Ew1uEW0raz7vCs28lBwy0UKV2Xr606gaEgxO7h9mSXZ\n" +
- "4x2K/KQ1NMnrbjppxGycLh9EKPWAO3ezFULAyuOZW4Fy+xRS8+3MAijxBJY/KBgl\n" +
- "x5rJm2ILumRkTNkMlLGCSBb9SOqYRN1VpOy7kn3StzU9LdJ/snKVE2JLHQIDAQAB\n" +
- "AoGBAMnL5okKRd9xcsBqYIAxIuiZmNhcwTErhEdRMOAukPGFbDSYsa3rldLvGdpz\n" +
- "jd2LoQG8rO/LHBZ429kASqZzyiV+NvcgH+tFNJSVAigjSICfhEKF9PY2TiAkrg7S\n" +
- "GyJgAjpPWQc2sQh0dE8EPEtBiq4ibXfMTDmbs1d/vnfdwtQJAkEA+AX5Y+xgWj74\n" +
- "dYETmNLyLhNZpftLizEfIYj7lCVhsbFwVb8jbM1m8n8bxwGjls1w/ico1CWcQna+\n" +
- "UnAfA8kJvwJBAOCj0YgDKpYd0OLQhvI3212J9QcQpJEkDOTYiMwXNHCNMKRpoF47\n" +
- "MPPX+GG8YzUiQAi9/OG4pDKCjzQWE/ebiiMCQQCssnQ5WICqtggIwYykr9VDseON\n" +
- "SFIMpHJ5xkjumazRrqx6eDGxc8BH/6uWwRRoT7pqrVeniFyqhsX03u8pkpU/AkBj\n" +
- "WfCcwBHArNUqy2EzlWKuvwogosq16oTNXbs60HR/5uIBhTnJE1K2NemDiGc0I77A\n" +
- "Xw6N4jS0piuhtLYGB8OTAkEA50abdbduXWcr62Z6E8G/6LNFaNg0uBuVgwSHtJMd\n" +
- "dNeUtVDHQCHSf3tvxXTAtaB9PCnGOfgm/dyYWEMf3rMoHQ==\n" +
- "-----END RSA PRIVATE KEY-----\n")
- .build();
-
- assertEquals(actual, expected);
- assertEquals(SshKeys.fingerprintPrivateKey(actual.getPrivateKey()), expected.getFingerprint());
- }
-
- @Test
- public void testRegisterSSHKeyPairWhenResponseIs2xx() throws UnsupportedEncodingException {
- String publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCc903twxU2zcQnIJdXv61RwZNZW94uId9qz08fgsBJsCOnHNIC4+L9kDOA2IHV9cUfEDBm1Be5TbpadWwSbS/05E+FARH2/MCO932UgcKUq5PGymS0249fLCBPci5zoLiG5vIym+1ij1hL/nHvkK99NIwe7io+Lmp9OcF3PTsm3Rgh5T09cRHGX9horp0VoAVa9vKJx6C1/IEHVnG8p0YPPa1lmemvx5kNBEiyoNQNYa34EiFkcJfP6rqNgvY8h/j4nE9SXoUCC/g6frhMFMOL0tzYqvz0Lczqm1Oh4RnSn3O9X4R934p28qqAobe337hmlLUdb6H5zuf+NwCh0HdZ";
-
- String privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" +
- "MIIEpQIBAAKCAQEAnPdN7cMVNs3EJyCXV7+tUcGTWVveLiHfas9PH4LASbAjpxzS\n" +
- "AuPi/ZAzgNiB1fXFHxAwZtQXuU26WnVsEm0v9ORPhQER9vzAjvd9lIHClKuTxspk\n" +
- "tNuPXywgT3Iuc6C4hubyMpvtYo9YS/5x75CvfTSMHu4qPi5qfTnBdz07Jt0YIeU9\n" +
- "PXERxl/YaK6dFaAFWvbyicegtfyBB1ZxvKdGDz2tZZnpr8eZDQRIsqDUDWGt+BIh\n" +
- "ZHCXz+q6jYL2PIf4+JxPUl6FAgv4On64TBTDi9Lc2Kr89C3M6ptToeEZ0p9zvV+E\n" +
- "fd+KdvKqgKG3t9+4ZpS1HW+h+c7n/jcAodB3WQIDAQABAoIBAQCX+iKr2LzLiUMo\n" +
- "lzexsFbB1+kxFe/zPryxD/QOEGzZa/+5KAB25+q5k0sqr3ZWkVXAk84pYaVut0F9\n" +
- "oD95P9q1A/GyV6zrNSHDywD+Lv0VMWMtkH0dV5Bjl7fY9DbhoXXIuAc81Rhs21mk\n" +
- "isIKME6Zra0VrYedGRfmE2usZc7F+rrnJeWs2edk1Q/lBLIe/v+NfRrO0fpHPu8S\n" +
- "9/kbVM3fUwHXxVTbvzZjjerQcLyEr4nT53DcSQJcm3e2DGsdRr5FBxkOXlcWElew\n" +
- "pbGM+RiF7RJvPW8lrmGj4y7Eo7TmfW8Yc5MM5A/PcvvxuRTRurmqOA5Wl1Bsp8/o\n" +
- "PEU/p9G5AoGBANcBOz0vSj+NOFip9gbc2WPVFpaoCT51DBQsT9R4kxe34Ltbwqaj\n" +
- "QXMiBjgereSM/KXTriA/Lhkj09YI5OAgk64PXcmDc2urMiFlewqxld79GDLAFwqn\n" +
- "nsEm1YTjY8wujw2J5Fbp7BZFHCrfld5L8xhgSb135YEa1/4LGOg+o6FDAoGBALrl\n" +
- "GL/v8ZDc2l/GpGsOA7360s9lRUhCTlQ86am8Lw/AdMSdpi9Is3yCdZx1NWDpUEKz\n" +
- "MBQTfiEEzpYlujvdUQNyQ4JGuhU/J7JEqEP2rfXaXjn0PIThkWFuNRkyK6Pz0rsT\n" +
- "4YJQouI7PCDE3BZxY4WYZ4uBZpCf3YC5SZiwtl0zAoGBAJGNnNwD+sDhSscDcLIe\n" +
- "qvDh3iPp6DAnLyEtCnItmm7RJcvRCAqltPZLj2hIpLJ4G8XrcxMTkpKkZZGdfcyZ\n" +
- "YUDR2E1Gt0mpoQto1w5bQLmwH8SjtDWbWmcqchw/kF03G9MviaypOhGtga8opB3U\n" +
- "zuKutN0WoQFw+c5bFuaLGV1fAoGABdFLy+20H0ZApeqRA6QUCb3dAges+GrX9VdQ\n" +
- "DrCE5oCfId+mZKJms+F7t7sORk386ZaaUIWqz2xO4e2atnJVKz5LS6rX8AFfQvVQ\n" +
- "J41uLND3TeaEW76Jv/amQHqHUTstvBUKV/waleAyJvL5xtkQt//eeUE16BqR0ofx\n" +
- "+obFpnECgYEAuDT1vH9JcGhD/iX4qLhS1xS1fXJh4IYvt8bg8oLRyRBqF6x9uhx3\n" +
- "6v+WQaKHyGvebWRN+SKAsKQHsh8a7Iy7xZdZmQ8v9j4DcYwJMb7ksV//R2kXAPGL\n" +
- "BTfRj1MSI+6AsuVY/YF1O2AfGneP+Zn5bQwYzQkxOYjzF9bhZz3IniE=\n" +
- "-----END RSA PRIVATE KEY-----\n";
-
- // Compute the fingerprint by using the following command: ssh-keygen -lf key.pub
- String expectedFingerprint = "8f:f1:91:2d:b1:a8:51:f1:79:cf:c4:31:c4:14:9d:81";
-
- assertTrue(SshKeys.privateKeyMatchesPublicKey(privateKey, publicKey));
- assertEquals(SshKeys.fingerprintPublicKey(publicKey), expectedFingerprint);
- assertEquals(SshKeys.fingerprintPrivateKey(privateKey), expectedFingerprint);
-
- SSHKeyPairApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=registerSSHKeyPair&" +
- "name=jclouds-keypair&publickey=" + Strings2.urlEncode(publicKey, '/') +
- "&apiKey=identity&signature=g/6BXLnnvOMlKQBp1yM7GKlvfus%3D"))
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", "application/json")
- .build())
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/registersshkeypairresponse.json"))
- .build());
-
- SshKeyPair actual = client.registerSSHKeyPair("jclouds-keypair", publicKey);
- SshKeyPair expected = SshKeyPair.builder().name("jclouds-keypair")
- .fingerprint(expectedFingerprint).build();
-
- assertEquals(actual, expected);
- assertEquals(expectedFingerprint, expected.getFingerprint());
- }
-
- @Override
- protected SSHKeyPairApi clientFrom(CloudStackContext context) {
- return context.getApi().getSSHKeyPairApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiLiveTest.java
deleted file mode 100644
index df35d51..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiLiveTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.ssh.SshKeys;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code SSHKeyPairApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "SSHKeyPairApiLiveTest")
-public class SSHKeyPairApiLiveTest extends BaseCloudStackApiLiveTest {
-
- protected String prefix = System.getProperty("user.name");
- private String keyPairName = prefix + "-jclouds-keypair";
- private SshKeyPair sshKeyPair;
-
- @BeforeMethod
- @AfterMethod
- public void removeExistingKey() {
- client.getSSHKeyPairApi().deleteSSHKeyPair(keyPairName);
- }
-
- @Test
- public void testListSSHKeyPairs() {
- final Set<SshKeyPair> sshKeyPairs = client.getSSHKeyPairApi().listSSHKeyPairs();
- for (SshKeyPair sshKeyPair : sshKeyPairs) {
- checkSSHKeyPair(sshKeyPair);
- }
- }
-
- @Test
- public void testCreateDeleteSSHKeyPair() {
- sshKeyPair = client.getSSHKeyPairApi().createSSHKeyPair(keyPairName);
- assertNotNull(sshKeyPair.getPrivateKey());
- checkSSHKeyPair(sshKeyPair);
- client.getSSHKeyPairApi().deleteSSHKeyPair(sshKeyPair.getName());
-
- assertEquals(client.getSSHKeyPairApi().getSSHKeyPair(sshKeyPair.getName()), null);
- assertEquals(SshKeys.fingerprintPrivateKey(sshKeyPair.getPrivateKey()), sshKeyPair.getFingerprint());
-
- sshKeyPair = null;
- }
-
- @Test
- public void testRegisterDeleteSSHKeyPair() {
- final Map<String, String> sshKey = SshKeys.generate();
- final String publicKey = sshKey.get("public");
-
- sshKeyPair = client.getSSHKeyPairApi().registerSSHKeyPair(keyPairName, publicKey);
- assertNull(sshKeyPair.getPrivateKey());
- checkSSHKeyPair(sshKeyPair);
- client.getSSHKeyPairApi().deleteSSHKeyPair(keyPairName);
-
- assertEquals(client.getSSHKeyPairApi().getSSHKeyPair(sshKeyPair.getName()), null);
- assertEquals(SshKeys.fingerprintPublicKey(publicKey), sshKeyPair.getFingerprint());
-
- sshKeyPair = null;
- }
-
- protected void checkSSHKeyPair(SshKeyPair pair) {
- assert pair.getName() != null : pair;
- assertEquals(pair.getFingerprint(),
- client.getSSHKeyPairApi().getSSHKeyPair(pair.getName()).getFingerprint());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiTest.java
deleted file mode 100644
index b8492e1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.filters.QuerySigner;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListSSHKeyPairsOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.jclouds.ssh.SshKeys;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code SSHKeyPairApi}
- */
-@Test(groups = "unit", testName = "SSHKeyPairApiTest")
-public class SSHKeyPairApiTest extends BaseCloudStackApiTest<SSHKeyPairApi> {
-
- public void testListSSHKeyPairs() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SSHKeyPairApi.class, "listSSHKeyPairs", ListSSHKeyPairsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSSHKeyPairs&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListSSHKeyPairsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SSHKeyPairApi.class, "listSSHKeyPairs", ListSSHKeyPairsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListSSHKeyPairsOptions.Builder.name("jclouds")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSSHKeyPairs&listAll=true&name=jclouds HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetSSHKeyPair() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SSHKeyPairApi.class, "getSSHKeyPair", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("jclouds-keypair"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSSHKeyPairs&listAll=true&name=jclouds-keypair HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testRegisterSSHKeyPair() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SSHKeyPairApi.class, "registerSSHKeyPair", String.class, String.class);
- String publicKey = URLEncoder.encode(SshKeys.generate().get("public"), "UTF-8");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("jclouds-keypair", publicKey));
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=registerSSHKeyPair&name=jclouds-keypair&publickey="
- + publicKey
- + " HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- assertEquals(httpRequest.getFilters().size(), 1);
- assertEquals(httpRequest.getFilters().get(0).getClass(), QuerySigner.class);
- }
-
-
- public void testDeleteSSHKeyPair() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SSHKeyPairApi.class, "deleteSSHKeyPair", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("jclouds-keypair"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteSSHKeyPair&name=jclouds-keypair HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiLiveTest.java
deleted file mode 100644
index a4bb788..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiLiveTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.NoSuchElementException;
-
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-import org.jclouds.cloudstack.options.ListSecurityGroupsOptions;
-import org.jclouds.util.Strings2;
-import org.testng.SkipException;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.net.HostAndPort;
-
-/**
- * Tests behavior of {@code SecurityGroupApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "SecurityGroupApiLiveTest")
-public class SecurityGroupApiLiveTest extends BaseCloudStackApiLiveTest {
- public SecurityGroupApiLiveTest() {
- prefix += "2";
- }
-
- private SecurityGroup group;
- private boolean securityGroupsSupported;
- private VirtualMachine vm;
- private Zone zone;
-
- @Test
- public void testCreateDestroySecurityGroup() {
- try {
- zone = Iterables.find(client.getZoneApi().listZones(), new Predicate<Zone>() {
-
- @Override
- public boolean apply(Zone arg0) {
- return arg0.isSecurityGroupsEnabled();
- }
-
- });
- securityGroupsSupported = true;
- for (SecurityGroup securityGroup : client.getSecurityGroupApi().listSecurityGroups(
- ListSecurityGroupsOptions.Builder.named(prefix))) {
- for (IngressRule rule : securityGroup.getIngressRules())
- assertTrue(jobComplete.apply(client.getSecurityGroupApi().revokeIngressRule(rule.getId())), rule.toString());
- client.getSecurityGroupApi().deleteSecurityGroup(securityGroup.getId());
- }
- group = client.getSecurityGroupApi().createSecurityGroup(prefix);
- assertEquals(group.getName(), prefix);
- checkGroup(group);
- try {
- client.getSecurityGroupApi().createSecurityGroup(prefix);
- fail("Expected IllegalStateException");
- } catch (IllegalStateException e) {
-
- }
- } catch (NoSuchElementException e) {
- e.printStackTrace();
- }
- }
-
- public static String getCurrentCIDR() throws IOException {
- URL url = new URL("http://checkip.amazonaws.com/");
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.connect();
- return Strings2.toStringAndClose(connection.getInputStream()).trim() + "/32";
- }
-
- protected void skipIfSecurityGroupsNotSupported() {
- if (!securityGroupsSupported) {
- throw new SkipException("Test cannot run without security groups supported in a zone");
- }
- }
-
- @Test(dependsOnMethods = "testCreateDestroySecurityGroup")
- public void testCreateIngress() throws Exception {
- skipIfSecurityGroupsNotSupported();
- String cidr = getCurrentCIDR();
- ImmutableSet<String> cidrs = ImmutableSet.of(cidr);
- assertTrue(jobComplete.apply(client.getSecurityGroupApi().authorizeIngressICMPToCIDRs(group.getId(), 0, 8, cidrs)), group.toString());
- assertTrue(jobComplete.apply(client.getSecurityGroupApi().authorizeIngressPortsToCIDRs(group.getId(), "TCP", 22,
- 22, cidrs)), group.toString());
-
- AccountInDomainOptions.Builder.accountInDomain(group.getAccount(), group.getDomainId());
-
- // replace with get once bug is fixed where getGroup returns only one
- // ingress rule
- group = Iterables.find(client.getSecurityGroupApi().listSecurityGroups(), new Predicate<SecurityGroup>() {
-
- @Override
- public boolean apply(SecurityGroup input) {
- return input.getId() == group.getId();
- }
-
- });
-
- IngressRule ICMPPingRule = Iterables.find(group.getIngressRules(), new Predicate<IngressRule>() {
-
- @Override
- public boolean apply(IngressRule input) {
- return "icmp".equals(input.getProtocol());
- }
-
- });
-
- assert ICMPPingRule.getId() != null : ICMPPingRule;
- assert "icmp".equals(ICMPPingRule.getProtocol()) : ICMPPingRule;
- assert ICMPPingRule.getStartPort() == -1 : ICMPPingRule;
- assert ICMPPingRule.getEndPort() == -1 : ICMPPingRule;
- assert ICMPPingRule.getICMPCode() == 0 : ICMPPingRule;
- assert ICMPPingRule.getICMPType() == 8 : ICMPPingRule;
- assert ICMPPingRule.getAccount() == null : ICMPPingRule;
- assert ICMPPingRule.getSecurityGroupName() == null : ICMPPingRule;
- assert cidr.equals(ICMPPingRule.getCIDR()) : ICMPPingRule;
-
- IngressRule SSHRule = Iterables.find(group.getIngressRules(), new Predicate<IngressRule>() {
-
- @Override
- public boolean apply(IngressRule input) {
- return "tcp".equals(input.getProtocol());
- }
-
- });
-
- assert SSHRule.getId() != null : SSHRule;
- assert "tcp".equals(SSHRule.getProtocol()) : SSHRule;
- assert SSHRule.getStartPort() == 22 : SSHRule;
- assert SSHRule.getEndPort() == 22 : SSHRule;
- assert SSHRule.getICMPCode() == -1 : SSHRule;
- assert SSHRule.getICMPType() == -1 : SSHRule;
- assert SSHRule.getAccount() == null : SSHRule;
- assert SSHRule.getSecurityGroupName() == null : SSHRule;
- assert cidr.equals(SSHRule.getCIDR()) : SSHRule;
-
- }
-
- public void testListSecurityGroup() throws Exception {
- skipIfSecurityGroupsNotSupported();
- for (SecurityGroup securityGroup : client.getSecurityGroupApi().listSecurityGroups())
- checkGroup(securityGroup);
- }
-
- @Test(dependsOnMethods = "testCreateIngress")
- public void testCreateVMInSecurityGroup() throws Exception {
- skipIfSecurityGroupsNotSupported();
- String defaultTemplate = template != null ? template.getImageId() : null;
- vm = VirtualMachineApiLiveTest.createVirtualMachineWithSecurityGroupInZone(zone.getId(),
- defaultTemplateOrPreferredInZone(defaultTemplate, client, zone.getId()), group.getId(), client,
- jobComplete, virtualMachineRunning);
- if (vm.getPassword() != null && !loginCredentials.getOptionalPassword().isPresent())
- loginCredentials = loginCredentials.toBuilder().password(vm.getPassword()).build();
- // ingress port 22
- checkSSH(HostAndPort.fromParts(vm.getIPAddress(), 22));
- // ingress icmp disabled as this is platform dependent and may actually
- // just try tcp port 7
- // assert InetAddress.getByName(vm.getIPAddress()).isReachable(1000) : vm;
- }
-
- protected void checkGroup(SecurityGroup group) {
- // http://bugs.cloud.com/show_bug.cgi?id=8968
- if (group.getIngressRules().size() <= 1) {
- assertEquals(group, client.getSecurityGroupApi().getSecurityGroup(group.getId()));
- assertEquals(group, client.getSecurityGroupApi().getSecurityGroupByName(group.getName()));
- }
- assert group.getId() != null : group;
- assert group.getName() != null : group;
- assert group.getAccount() != null : group;
- assert group.getDomain() != null : group;
- assert group.getDomainId() != null : group;
- assert group.getIngressRules() != null : group;
- }
-
- @Test
- public void testCreateVMWithoutSecurityGroupAssignsDefault() throws Exception {
- skipIfSecurityGroupsNotSupported();
- String defaultTemplate = template != null ? template.getImageId() : null;
- VirtualMachine newVm = VirtualMachineApiLiveTest.createVirtualMachineWithOptionsInZone(DeployVirtualMachineOptions.NONE,
- zone.getId(), defaultTemplateOrPreferredInZone(defaultTemplate, client, zone.getId()), client,
- jobComplete, virtualMachineRunning);
- try {
- VirtualMachine runningVm = client.getVirtualMachineApi().getVirtualMachine(newVm.getId());
- assertEquals(1, runningVm.getSecurityGroups().size());
- assertEquals(Iterables.getOnlyElement(runningVm.getSecurityGroups()).getName(), "default");
- } finally {
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(newVm.getId())));
- }
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (vm != null) {
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vm.getId())));
- }
- if (group != null) {
- for (IngressRule rule : group.getIngressRules())
- assertTrue(jobComplete.apply(client.getSecurityGroupApi().revokeIngressRule(rule.getId())), rule.toString());
- client.getSecurityGroupApi().deleteSecurityGroup(group.getId());
- assertEquals(client.getSecurityGroupApi().getSecurityGroup(group.getId()), null);
- }
- super.tearDownContext();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java
deleted file mode 100644
index 1907877..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SecurityGroupApiTest.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.ListSecurityGroupsOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code SecurityGroupApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "SecurityGroupApiTest")
-public class SecurityGroupApiTest extends BaseCloudStackApiTest<SecurityGroupApi> {
-
- public void testListSecurityGroups() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "listSecurityGroups", ListSecurityGroupsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSecurityGroups&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListSecurityGroupsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "listSecurityGroups", ListSecurityGroupsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListSecurityGroupsOptions.Builder.virtualMachineId("4")
- .domainId("5").id("6")));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSecurityGroups&listAll=true&virtualmachineid=4&domainid=5&id=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetSecurityGroup() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "getSecurityGroup", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSecurityGroups&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetSecurityGroupByName() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "getSecurityGroupByName", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("some-name"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSecurityGroups&listAll=true&securitygroupname=some-name HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testCreateSecurityGroup() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "createSecurityGroup", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("goo"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=createSecurityGroup&name=goo HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest authorizeSecurityGroupIngress3 = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("securitygroupid", "2")
- .addQueryParam("protocol", "tcp")
- .addQueryParam("startport", "22")
- .addQueryParam("endport", "22")
- .addQueryParam("cidrlist", "1.1.1.1/24,1.2.2.2/16").build();
-
- public void testAuthorizeIngressPortsToCIDRs() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "authorizeIngressPortsToCIDRs", String.class,
- String.class, int.class, int.class, Iterable.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, "tcp", 22, 22,
- ImmutableSet.of("1.1.1.1/24", "1.2.2.2/16")));
-
- assertRequestLineEquals(httpRequest, authorizeSecurityGroupIngress3.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest authorizeSecurityGroupIngress4 = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("securitygroupid", "2")
- .addQueryParam("protocol", "tcp")
- .addQueryParam("startport", "22")
- .addQueryParam("endport", "22")
- .addQueryParam("usersecuritygrouplist%5B0%5D.account", "adrian")
- .addQueryParam("usersecuritygrouplist%5B0%5D.group", "group1")
- .addQueryParam("usersecuritygrouplist%5B1%5D.account", "adrian")
- .addQueryParam("usersecuritygrouplist%5B1%5D.group", "group2")
- .addQueryParam("usersecuritygrouplist%5B2%5D.account", "bob")
- .addQueryParam("usersecuritygrouplist%5B2%5D.group", "group1").build();
-
- public void testAuthorizeIngressPortsToSecurityGroups() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "authorizeIngressPortsToSecurityGroups", String.class,
- String.class, int.class, int.class, Multimap.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, "tcp", 22, 22,
- ImmutableMultimap.of("adrian", "group1", "adrian", "group2", "bob", "group1")));
-
- assertRequestLineEquals(httpRequest, authorizeSecurityGroupIngress4.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest authorizeSecurityGroupIngress1 = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("protocol", "ICMP")
- .addQueryParam("securitygroupid", "2")
- .addQueryParam("icmpcode", "22")
- .addQueryParam("icmptype", "22")
- .addQueryParam("cidrlist", "1.1.1.1/24,1.2.2.2/16").build();
-
- public void testAuthorizeIngressICMPToCIDRs() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "authorizeIngressICMPToCIDRs", String.class , int.class,
- int.class, Iterable.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, 22, 22, ImmutableSet.of("1.1.1.1/24", "1.2.2.2/16")));
-
- assertRequestLineEquals(httpRequest, authorizeSecurityGroupIngress1.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- HttpRequest authorizeSecurityGroupIngress2 = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "authorizeSecurityGroupIngress")
- .addQueryParam("protocol", "ICMP")
- .addQueryParam("securitygroupid", "2")
- .addQueryParam("icmpcode", "22")
- .addQueryParam("icmptype", "22")
- .addQueryParam("usersecuritygrouplist%5B0%5D.account", "adrian")
- .addQueryParam("usersecuritygrouplist%5B0%5D.group", "group1")
- .addQueryParam("usersecuritygrouplist%5B1%5D.account", "adrian")
- .addQueryParam("usersecuritygrouplist%5B1%5D.group", "group2")
- .addQueryParam("usersecuritygrouplist%5B2%5D.account", "bob")
- .addQueryParam("usersecuritygrouplist%5B2%5D.group", "group1").build();
-
- public void testAuthorizeIngressICMPToSecurityGroups() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "authorizeIngressICMPToSecurityGroups", String.class,
- int.class, int.class, Multimap.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(2, 22, 22,
- ImmutableMultimap.of("adrian", "group1", "adrian", "group2", "bob", "group1")));
-
- assertRequestLineEquals(httpRequest, authorizeSecurityGroupIngress2.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testRevokeIngressRule() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "revokeIngressRule", String.class,
- AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5,
- AccountInDomainOptions.Builder.accountInDomain("adrian", "1")));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=revokeSecurityGroupIngress&id=5&account=adrian&domainid=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDeleteSecurityGroup() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(SecurityGroupApi.class, "deleteSecurityGroup", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteSecurityGroup&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java
deleted file mode 100644
index a4cb945..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.hash.Hashing.md5;
-import static com.google.common.io.BaseEncoding.base16;
-import static org.testng.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMultimap;
-
-/**
- * Tests behavior of {@code SessionApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "SessionApiExpectTest")
-public class SessionApiExpectTest extends BaseCloudStackExpectTest<SessionApi> {
-
- HttpRequest login = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "login")
- .addQueryParam("username", "jclouds")
- .addQueryParam("domain", "Partners/jclouds")
- .addQueryParam("password", "30e14b3727225d833aad2206acea1275")
- .addHeader("Accept", "application/json").build();
-
- public void testLoginWhenResponseIs2xxIncludesJSessionId() throws IOException {
- String domain = "Partners/jclouds";
- String user = "jclouds";
- String password = "jcl0ud";
- String md5password = base16().lowerCase().encode(md5().hashString(password, UTF_8).asBytes());
-
- String jSessionId = "90DD65D13AEAA590ECCA312D150B9F6D";
- SessionApi client = requestSendsResponse(login,
- HttpResponse.builder()
- .statusCode(200)
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Set-Cookie", "JSESSIONID=" + jSessionId + "; Path=/client")
- .build())
- .payload(payloadFromResource("/loginresponse.json"))
- .build());
-
- assertEquals(client.loginUserInDomainWithHashOfPassword(user, domain, md5password).toString(),
- LoginResponse.builder().timeout(1800).lastName("Kiran").registered(false).username("jclouds").firstName("Vijay")
- .domainId("11").accountType(Account.Type.DOMAIN_ADMIN).userId("19").sessionKey(
- "uYT4/MNiglgAKiZRQkvV8QP8gn0=").jSessionId(jSessionId).accountName("jclouds").build().toString());
- }
-
- public void testLogout() throws IOException {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=logout&sessionkey=dummy-session-key"))
- .build();
-
- SessionApi client = requestSendsResponse(request,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/logoutresponse.json"))
- .build());
-
- client.logoutUser("dummy-session-key");
- }
-
- @Override
- protected SessionApi clientFrom(CloudStackContext context) {
- return context.getApi().getSessionApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiLiveTest.java
deleted file mode 100644
index c5f3f9e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SessionApiLiveTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.hash.Hashing.md5;
-import static com.google.common.io.BaseEncoding.base16;
-import static org.jclouds.cloudstack.features.GlobalAccountApiLiveTest.createTestAccount;
-import static org.jclouds.cloudstack.features.GlobalUserApiLiveTest.createTestUser;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.domain.ApiKeyPair;
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.util.ApiKeyPairs;
-import org.jclouds.rest.AuthorizationException;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code SessionApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "SessionApiLiveTest")
-public class SessionApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test
- public void testCreateContextUsingUserAndPasswordAuthentication() {
- skipIfNotGlobalAdmin();
-
- Account testAccount = null;
- User testUser = null;
-
- String prefix = this.prefix + "-session";
- try {
- testAccount = createTestAccount(globalAdminClient, prefix);
- testUser = createTestUser(globalAdminClient, testAccount, prefix);
-
- String expectedUsername = prefix + "-user";
- assertEquals(testUser.getName(), expectedUsername);
-
- checkLoginAsTheNewUser(expectedUsername);
-
- ApiKeyPair expected = globalAdminClient.getUserClient().registerUserKeys(testUser.getId());
- ApiKeyPair actual = ApiKeyPairs.loginToEndpointAsUsernameInDomainWithPasswordAndReturnApiKeyPair(
- URI.create(endpoint), prefix + "-user", "password", "");
-
- assertEquals(actual, expected);
-
- } finally {
- if (testUser != null)
- globalAdminClient.getUserClient().deleteUser(testUser.getId());
- if (testAccount != null)
- globalAdminClient.getAccountApi().deleteAccount(testAccount.getId());
- }
- }
-
- @Test(expectedExceptions = AuthorizationException.class)
- public void testTryToGetApiKeypairWithWrongCredentials() {
- ApiKeyPairs.loginToEndpointAsUsernameInDomainWithPasswordAndReturnApiKeyPair(
- URI.create(endpoint), "dummy-missing-user", "with-a-wrong-password", "");
- }
-
- private void checkLoginAsTheNewUser(String expectedUsername) {
- LoginResponse response = globalAdminClient.getSessionApi().loginUserInDomainWithHashOfPassword(
- expectedUsername, "", base16().lowerCase().encode(md5().hashString("password", UTF_8).asBytes()));
-
- assertNotNull(response);
- assertNotNull(response.getSessionKey());
- assertNotNull(response.getJSessionId());
-
- client.getSessionApi().logoutUser(response.getSessionKey());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java
deleted file mode 100644
index 91801d6..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiLiveTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.find;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNotSame;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertTrue;
-
-import java.util.Set;
-
-import javax.annotation.Resource;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.Snapshot;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListSnapshotsOptions;
-import org.jclouds.logging.Logger;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code SnapshotApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "SnapshotApiLiveTest")
-public class SnapshotApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Resource Logger logger = Logger.NULL;
-
- public void testListSnapshots() {
- Set<Snapshot> snapshots = client.getSnapshotApi().listSnapshots();
- assertNotNull(snapshots);
- assertFalse(snapshots.isEmpty());
-
- for (Snapshot snapshot : snapshots) {
- checkSnapshot(snapshot);
- }
- }
-
- public void testListSnapshotsById() {
- Iterable<String> snapshotIds = Iterables.transform(client.getSnapshotApi().listSnapshots(), new Function<Snapshot, String>() {
- public String apply(Snapshot input) {
- return input.getId();
- }
- });
- assertNotNull(snapshotIds);
- assertFalse(Iterables.isEmpty(snapshotIds));
-
- for (String id : snapshotIds) {
- Set<Snapshot> found = client.getSnapshotApi().listSnapshots(ListSnapshotsOptions.Builder.id(id));
- assertNotNull(found);
- assertEquals(1, found.size());
- Snapshot snapshot = Iterables.getOnlyElement(found);
- assertEquals(id, snapshot.getId());
- checkSnapshot(snapshot);
- }
- }
-
- public void testListSnapshotsNonexistantId() {
- Set<Snapshot> found = client.getSnapshotApi().listSnapshots(ListSnapshotsOptions.Builder.id("foo"));
- assertNotNull(found);
- assertTrue(found.isEmpty());
- }
-
- public void testGetSnapshotById() {
- Iterable<String> snapshotIds = Iterables.transform(client.getSnapshotApi().listSnapshots(), new Function<Snapshot, String>() {
- public String apply(Snapshot input) {
- return input.getId();
- }
- });
- assertNotNull(snapshotIds);
- assertFalse(Iterables.isEmpty(snapshotIds));
-
- for (String id : snapshotIds) {
- Snapshot found = client.getSnapshotApi().getSnapshot(id);
- assertNotNull(found);
- assertEquals(id, found.getId());
- checkSnapshot(found);
- }
- }
-
- public void testGetSnapshotNonexistantId() {
- Snapshot found = client.getSnapshotApi().getSnapshot("foo");
- assertNull(found);
- }
-
- protected Volume getPreferredVolume() {
- for (Volume candidate : client.getVolumeApi().listVolumes()) {
- if (candidate.getState() == Volume.State.READY)
- return candidate;
- }
- throw new AssertionError("No suitable Volume found.");
- }
-
- public void testCreateSnapshotFromVolume() {
- final Volume volume = getPreferredVolume(); //fail fast if none
- logger.info("creating snapshot from volume %s", volume);
- AsyncCreateResponse job = client.getSnapshotApi().createSnapshot(volume.getId());
- assertTrue(jobComplete.apply(job.getJobId()));
- Snapshot snapshot = findSnapshotWithId(job.getId());
- logger.info("created snapshot %s from volume %s", snapshot, volume);
- checkSnapshot(snapshot);
- client.getSnapshotApi().deleteSnapshot(snapshot.getId());
- }
-
- private void checkSnapshot(final Snapshot snapshot) {
- assertNotNull(snapshot.getId());
- assertNotNull(snapshot.getName());
- assertNotSame(Snapshot.Type.UNRECOGNIZED, snapshot.getSnapshotType());
- }
-
- private Snapshot findSnapshotWithId(final String id) {
- return find(client.getSnapshotApi().listSnapshots(), new Predicate<Snapshot>() {
- @Override
- public boolean apply(Snapshot arg0) {
- return arg0.getId().equals(id);
- }
- });
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java
deleted file mode 100644
index 897bf3c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/SnapshotApiTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Snapshot;
-import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateSnapshotOptions;
-import org.jclouds.cloudstack.options.ListSnapshotPoliciesOptions;
-import org.jclouds.cloudstack.options.ListSnapshotsOptions;
-import org.jclouds.cloudstack.util.SnapshotPolicySchedules;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.Invokable;
-/**
- * Tests the behaviour of SnapshotApi.
- *
- * @see SnapshotApi
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "SnapshotApiTest")
-public class SnapshotApiTest extends BaseCloudStackApiTest<SnapshotApi> {
-
- public void testCreateSnapshot() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "createSnapshot", String.class, CreateSnapshotOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=createSnapshot&volumeid=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testCreateSnapshotOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "createSnapshot", String.class, CreateSnapshotOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5, CreateSnapshotOptions.Builder.accountInDomain("acc", "7").policyId("9")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=createSnapshot&volumeid=5&account=acc&domainid=7&policyid=9 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListSnapshots() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "listSnapshots", ListSnapshotsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSnapshots&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testGetSnapshot() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "getSnapshot", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSnapshots&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListSnapshotsOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "listSnapshots", ListSnapshotsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListSnapshotsOptions.Builder.accountInDomain("acc", "7").id("5").interval(Snapshot.Interval.MONTHLY).isRecursive(true).keyword("fred").name("fred's snapshot").snapshotType(Snapshot.Type.RECURRING).volumeId("11")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSnapshots&listAll=true&account=acc&domainid=7&id=5&intervaltype=MONTHLY&isrecursive=true&keyword=fred&name=fred%27s%20snapshot&snapshottype=RECURRING&volumeid=11 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteSnapshot() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "deleteSnapshot", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(14));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteSnapshot&id=14 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest extractIso = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createSnapshotPolicy")
- .addQueryParam("maxsnaps", "10")
- .addQueryParam("timezone", "UTC")
- .addQueryParam("volumeid", "12")
- .addQueryParam("intervaltype", "MONTHLY")
- .addQueryParam("schedule", "07%3A06%3A05").build();
-
- public void testCreateSnapshotPolicy() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "createSnapshotPolicy", SnapshotPolicySchedule.class, String.class, String.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(SnapshotPolicySchedules.monthly(5, 6, 7), 10, "UTC", 12));
-
- assertRequestLineEquals(httpRequest, extractIso.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteSnapshotPolicy() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "deleteSnapshotPolicy", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(7));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteSnapshotPolicies&id=7 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteSnapshotPolicies() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "deleteSnapshotPolicies", Iterable.class);
- Iterable<String> ids = ImmutableSet.of("3", "5", "7");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ids));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteSnapshotPolicies&ids=3,5,7 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListSnapshotPolicies() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "listSnapshotPolicies", String.class, ListSnapshotPoliciesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(10));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSnapshotPolicies&listAll=true&volumeid=10 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListSnapshotPoliciesOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(SnapshotApi.class, "listSnapshotPolicies", String.class, ListSnapshotPoliciesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(10, ListSnapshotPoliciesOptions.Builder.accountInDomain("fred", "4").keyword("bob")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listSnapshotPolicies&listAll=true&volumeid=10&account=fred&domainid=4&keyword=bob HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
[42/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
deleted file mode 100644
index 2b3fcdf..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class PortForwardingRule
- */
-public class PortForwardingRule implements Comparable<PortForwardingRule> {
-
- public static enum Protocol {
- TCP,
- UDP,
- ICMP,
- UNKNOWN;
-
- public static Protocol fromValue(String value) {
- try {
- return valueOf(value.toUpperCase());
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return name().toLowerCase();
- }
- }
-
- public static enum State {
- STAGED, // Rule been created but has never got through network rule conflict detection.
- // Rules in this state can not be sent to network elements.
- ADD, // Add means the rule has been created and has gone through network rule conflict detection.
- ACTIVE, // Rule has been sent to the network elements and reported to be active.
- DELETING, // Revoke means this rule has been revoked. If this rule has been sent to the
- // network elements, the rule will be deleted from database.
- UNKNOWN;
-
- public static State fromValue(String value) {
- try {
- return valueOf(value.toUpperCase());
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromPortForwardingRule(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String IPAddress;
- protected String IPAddressId;
- protected int privatePort;
- protected Protocol protocol;
- protected int publicPort;
- protected State state;
- protected String virtualMachineDisplayName;
- protected String virtualMachineId;
- protected String virtualMachineName;
- protected Set<String> CIDRs = ImmutableSet.of();
- protected int privateEndPort;
- protected int publicEndPort;
-
- /**
- * @see PortForwardingRule#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getIPAddress()
- */
- public T IPAddress(String IPAddress) {
- this.IPAddress = IPAddress;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getIPAddressId()
- */
- public T IPAddressId(String IPAddressId) {
- this.IPAddressId = IPAddressId;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getPrivatePort()
- */
- public T privatePort(int privatePort) {
- this.privatePort = privatePort;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getProtocol()
- */
- public T protocol(Protocol protocol) {
- this.protocol = protocol;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getPublicPort()
- */
- public T publicPort(int publicPort) {
- this.publicPort = publicPort;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getState()
- */
- public T state(State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getVirtualMachineDisplayName()
- */
- public T virtualMachineDisplayName(String virtualMachineDisplayName) {
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getVirtualMachineId()
- */
- public T virtualMachineId(String virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getVirtualMachineName()
- */
- public T virtualMachineName(String virtualMachineName) {
- this.virtualMachineName = virtualMachineName;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getCIDRs()
- */
- public T CIDRs(Set<String> CIDRs) {
- this.CIDRs = ImmutableSet.copyOf(checkNotNull(CIDRs, "CIDRs"));
- return self();
- }
-
- public T CIDRs(String... in) {
- return CIDRs(ImmutableSet.copyOf(in));
- }
-
- /**
- * @see PortForwardingRule#getPrivateEndPort()
- */
- public T privateEndPort(int privateEndPort) {
- this.privateEndPort = privateEndPort;
- return self();
- }
-
- /**
- * @see PortForwardingRule#getPublicEndPort()
- */
- public T publicEndPort(int publicEndPort) {
- this.publicEndPort = publicEndPort;
- return self();
- }
-
- public PortForwardingRule build() {
- return new PortForwardingRule(id, IPAddress, IPAddressId, privatePort, protocol, publicPort, state, virtualMachineDisplayName,
- virtualMachineId, virtualMachineName, CIDRs, privateEndPort, publicEndPort);
- }
-
- public T fromPortForwardingRule(PortForwardingRule in) {
- return this
- .id(in.getId())
- .IPAddress(in.getIPAddress())
- .IPAddressId(in.getIPAddressId())
- .privatePort(in.getPrivatePort())
- .protocol(in.getProtocol())
- .publicPort(in.getPublicPort())
- .state(in.getState())
- .virtualMachineDisplayName(in.getVirtualMachineDisplayName())
- .virtualMachineId(in.getVirtualMachineId())
- .virtualMachineName(in.getVirtualMachineName())
- .CIDRs(in.getCIDRs())
- .privateEndPort(in.getPrivateEndPort())
- .publicEndPort(in.getPublicEndPort());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String IPAddress;
- private final String IPAddressId;
- private final int privatePort;
- private final PortForwardingRule.Protocol protocol;
- private final int publicPort;
- private final PortForwardingRule.State state;
- private final String virtualMachineDisplayName;
- private final String virtualMachineId;
- private final String virtualMachineName;
- private final Set<String> CIDRs;
- private final int privateEndPort;
- private final int publicEndPort;
-
- @ConstructorProperties({
- "id", "ipaddress", "ipaddressid", "privateport", "protocol", "publicport", "state", "virtualmachinedisplayname",
- "virtualmachineid", "virtualmachinename", "cidrlist", "privateendport", "publicendport"
- })
- private PortForwardingRule(String id, @Nullable String IPAddress, @Nullable String IPAddressId, int privatePort,
- @Nullable Protocol protocol, int publicPort, @Nullable State state, @Nullable String virtualMachineDisplayName,
- @Nullable String virtualMachineId, @Nullable String virtualMachineName, @Nullable String CIDRs,
- int privateEndPort, int publicEndPort) {
- this(id, IPAddress, IPAddressId, privatePort, protocol, publicPort, state, virtualMachineDisplayName, virtualMachineId,
- virtualMachineName, splitStringOnCommas(CIDRs), privateEndPort, publicEndPort);
- }
-
- private static Set<String> splitStringOnCommas(String in) {
- return in == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(in.split(","));
- }
-
- protected PortForwardingRule(String id, @Nullable String IPAddress, @Nullable String IPAddressId, int privatePort,
- @Nullable Protocol protocol, int publicPort, @Nullable State state,
- @Nullable String virtualMachineDisplayName, @Nullable String virtualMachineId,
- @Nullable String virtualMachineName, @Nullable Set<String> CIDRs, int privateEndPort, int publicEndPort) {
- this.id = checkNotNull(id, "id");
- this.IPAddress = IPAddress;
- this.IPAddressId = IPAddressId;
- this.privatePort = privatePort;
- this.protocol = protocol;
- this.publicPort = publicPort;
- this.state = state;
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- this.virtualMachineId = virtualMachineId;
- this.virtualMachineName = virtualMachineName;
- this.CIDRs = CIDRs == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(CIDRs);
- this.privateEndPort = privateEndPort;
- this.publicEndPort = publicEndPort;
- }
-
- /**
- * @return the ID of the port forwarding rule
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the public ip address for the port forwarding rule
- */
- @Nullable
- public String getIPAddress() {
- return this.IPAddress;
- }
-
- /**
- * @return the public ip address id for the port forwarding rule
- */
- @Nullable
- public String getIPAddressId() {
- return this.IPAddressId;
- }
-
- /**
- * @return the private port for the port forwarding rule
- */
- public int getPrivatePort() {
- return this.privatePort;
- }
-
- /**
- * @return the protocol of the port forwarding rule
- */
- @Nullable
- public Protocol getProtocol() {
- return this.protocol;
- }
-
- /**
- * @return the public port for the port forwarding rule
- */
- public int getPublicPort() {
- return this.publicPort;
- }
-
- /**
- * @return the state of the rule
- */
- @Nullable
- public State getState() {
- return this.state;
- }
-
- /**
- * @return the VM display name for the port forwarding rule
- */
- @Nullable
- public String getVirtualMachineDisplayName() {
- return this.virtualMachineDisplayName;
- }
-
- /**
- * @return the VM ID for the port forwarding rule
- */
- @Nullable
- public String getVirtualMachineId() {
- return this.virtualMachineId;
- }
-
- /**
- * @return the VM name for the port forwarding rule
- */
- @Nullable
- public String getVirtualMachineName() {
- return this.virtualMachineName;
- }
-
- /**
- * @return the cidr list to forward traffic from
- */
- public Set<String> getCIDRs() {
- return this.CIDRs;
- }
-
- /**
- * @return the starting port of port forwarding rule's private port range
- */
- public int getPrivateEndPort() {
- return this.privateEndPort;
- }
-
- /**
- * @return the starting port of port forwarding rule's public port range
- */
- public int getPublicEndPort() {
- return this.publicEndPort;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, IPAddress, IPAddressId, privatePort, protocol, publicPort, state, virtualMachineDisplayName, virtualMachineId, virtualMachineName, CIDRs, privateEndPort, publicEndPort);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- PortForwardingRule that = PortForwardingRule.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.IPAddress, that.IPAddress)
- && Objects.equal(this.IPAddressId, that.IPAddressId)
- && Objects.equal(this.privatePort, that.privatePort)
- && Objects.equal(this.protocol, that.protocol)
- && Objects.equal(this.publicPort, that.publicPort)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.virtualMachineDisplayName, that.virtualMachineDisplayName)
- && Objects.equal(this.virtualMachineId, that.virtualMachineId)
- && Objects.equal(this.virtualMachineName, that.virtualMachineName)
- && Objects.equal(this.CIDRs, that.CIDRs)
- && Objects.equal(this.privateEndPort, that.privateEndPort)
- && Objects.equal(this.publicEndPort, that.publicEndPort);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("privatePort", privatePort)
- .add("protocol", protocol).add("publicPort", publicPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName)
- .add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("CIDRs", CIDRs)
- .add("privateEndPort", privateEndPort).add("publicEndPort", publicEndPort);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(PortForwardingRule o) {
- return id.compareTo(o.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Project.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Project.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Project.java
deleted file mode 100644
index 29323a4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Project.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Representation of the API project response
- */
-public class Project implements Comparable<Project> {
-
- public static enum State {
- ACTIVE, DISABLED, SUSPENDED, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, name());
- }
-
- public static State fromValue(String state) {
- try {
- return valueOf(CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromDomain(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected String displayText;
- protected String domain;
- protected String domainId;
- protected String name;
- protected State state;
-
- /**
- * @see org.jclouds.cloudstack.domain.Project#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see org.jclouds.cloudstack.domain.Project#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see org.jclouds.cloudstack.domain.Project#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see org.jclouds.cloudstack.domain.Project#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see org.jclouds.cloudstack.domain.Project#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see org.jclouds.cloudstack.domain.Project#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see org.jclouds.cloudstack.domain.Project#getState()
- */
- public T state(State state) {
- this.state = state;
- return self();
- }
-
-
- public Project build() {
- return new Project(id, account, displayText, domain, domainId, name, state);
- }
-
- public T fromDomain(Project in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .displayText(in.getDisplayText())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .name(in.getName())
- .state(in.getState());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final String displayText;
- private final String domain;
- private final String domainId;
- private final String name;
- private final State state;
-
- @ConstructorProperties({
- "id", "account", "displaytext", "domain", "domainid", "name", "state"
- })
- protected Project(String id, String account, String displayText, String domain, String domainId,
- String name, State state) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.displayText = displayText;
- this.domain = domain;
- this.domainId = domainId;
- this.name = name;
- this.state = checkNotNull(state, "state");
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- @Nullable
- public String getName() {
- return this.name;
- }
-
- public State getState() {
- return this.state;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, displayText, domain, domainId, name, state);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Project that = Project.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.state, that.state);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("id", id).add("account", account).add("displayText", displayText)
- .add("domain", domain).add("domainId", domainId).add("name", name).add("state", state);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Project other) {
- return id.compareTo(other.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
deleted file mode 100644
index 1d6cff3..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class PublicIPAddress
- */
-public class PublicIPAddress {
-
- /**
- */
- public static enum State {
- ALLOCATING, ALLOCATED, RELEASING, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static State fromValue(String state) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromPublicIPAddress(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected Date allocated;
- protected String associatedNetworkId;
- protected String domain;
- protected String domainId;
- protected boolean usesVirtualNetwork;
- protected String IPAddress;
- protected boolean isSourceNAT;
- protected boolean isStaticNAT;
- protected String networkId;
- protected PublicIPAddress.State state;
- protected String virtualMachineDisplayName;
- protected String virtualMachineId;
- protected String virtualMachineName;
- protected String VLANId;
- protected String VLANName;
- protected String zoneId;
- protected String zoneName;
- protected String jobId;
- protected Integer jobStatus;
-
- /**
- * @see PublicIPAddress#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getAllocated()
- */
- public T allocated(Date allocated) {
- this.allocated = allocated;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getAssociatedNetworkId()
- */
- public T associatedNetworkId(String associatedNetworkId) {
- this.associatedNetworkId = associatedNetworkId;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see PublicIPAddress#isUsesVirtualNetwork()
- */
- public T usesVirtualNetwork(boolean usesVirtualNetwork) {
- this.usesVirtualNetwork = usesVirtualNetwork;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getIPAddress()
- */
- public T IPAddress(String IPAddress) {
- this.IPAddress = IPAddress;
- return self();
- }
-
- /**
- * @see PublicIPAddress#isSourceNAT()
- */
- public T isSourceNAT(boolean isSourceNAT) {
- this.isSourceNAT = isSourceNAT;
- return self();
- }
-
- /**
- * @see PublicIPAddress#isStaticNAT()
- */
- public T isStaticNAT(boolean isStaticNAT) {
- this.isStaticNAT = isStaticNAT;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getNetworkId()
- */
- public T networkId(String networkId) {
- this.networkId = networkId;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getState()
- */
- public T state(PublicIPAddress.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getVirtualMachineDisplayName()
- */
- public T virtualMachineDisplayName(String virtualMachineDisplayName) {
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getVirtualMachineId()
- */
- public T virtualMachineId(String virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getVirtualMachineName()
- */
- public T virtualMachineName(String virtualMachineName) {
- this.virtualMachineName = virtualMachineName;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getVLANId()
- */
- public T VLANId(String VLANId) {
- this.VLANId = VLANId;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getVLANName()
- */
- public T VLANName(String VLANName) {
- this.VLANName = VLANName;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see PublicIPAddress#getJobStatus()
- */
- public T jobStatus(Integer jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- public PublicIPAddress build() {
- return new PublicIPAddress(id, account, allocated, associatedNetworkId, domain, domainId, usesVirtualNetwork, IPAddress, isSourceNAT, isStaticNAT, networkId, state, virtualMachineDisplayName, virtualMachineId, virtualMachineName, VLANId, VLANName, zoneId, zoneName, jobId, jobStatus);
- }
-
- public T fromPublicIPAddress(PublicIPAddress in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .allocated(in.getAllocated())
- .associatedNetworkId(in.getAssociatedNetworkId())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .usesVirtualNetwork(in.isUsesVirtualNetwork())
- .IPAddress(in.getIPAddress())
- .isSourceNAT(in.isSourceNAT())
- .isStaticNAT(in.isStaticNAT())
- .networkId(in.getNetworkId())
- .state(in.getState())
- .virtualMachineDisplayName(in.getVirtualMachineDisplayName())
- .virtualMachineId(in.getVirtualMachineId())
- .virtualMachineName(in.getVirtualMachineName())
- .VLANId(in.getVLANId())
- .VLANName(in.getVLANName())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final Date allocated;
- private final String associatedNetworkId;
- private final String domain;
- private final String domainId;
- private final boolean usesVirtualNetwork;
- private final String IPAddress;
- private final boolean isSourceNAT;
- private final boolean isStaticNAT;
- private final String networkId;
- private final PublicIPAddress.State state;
- private final String virtualMachineDisplayName;
- private final String virtualMachineId;
- private final String virtualMachineName;
- private final String VLANId;
- private final String VLANName;
- private final String zoneId;
- private final String zoneName;
- private final String jobId;
- private final Integer jobStatus;
-
- @ConstructorProperties({
- "id", "account", "allocated", "associatednetworkid", "domain", "domainid", "forvirtualnetwork", "ipaddress", "issourcenat",
- "isstaticnat", "networkid", "state", "virtualmachinedisplayname", "virtualmachineid", "virtualmachinename", "VLANid",
- "VLANname", "zoneid", "zonename", "jobid", "jobstatus"
- })
- protected PublicIPAddress(String id, @Nullable String account, @Nullable Date allocated, @Nullable String associatedNetworkId,
- @Nullable String domain, @Nullable String domainId, boolean usesVirtualNetwork, @Nullable String IPAddress,
- boolean isSourceNAT, boolean isStaticNAT, @Nullable String networkId, @Nullable PublicIPAddress.State state,
- @Nullable String virtualMachineDisplayName, @Nullable String virtualMachineId, @Nullable String virtualMachineName,
- @Nullable String VLANId, @Nullable String VLANName, @Nullable String zoneId, @Nullable String zoneName,
- @Nullable String jobId, @Nullable Integer jobStatus) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.allocated = allocated;
- this.associatedNetworkId = associatedNetworkId;
- this.domain = domain;
- this.domainId = domainId;
- this.usesVirtualNetwork = usesVirtualNetwork;
- this.IPAddress = IPAddress;
- this.isSourceNAT = isSourceNAT;
- this.isStaticNAT = isStaticNAT;
- this.networkId = networkId;
- this.state = state;
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- this.virtualMachineId = virtualMachineId;
- this.virtualMachineName = virtualMachineName;
- this.VLANId = VLANId;
- this.VLANName = VLANName;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- }
-
- /**
- * @return public IP address id
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account the public IP address is associated with
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return date the public IP address was acquired
- */
- @Nullable
- public Date getAllocated() {
- return this.allocated;
- }
-
- /**
- * @return the ID of the Network associated with the IP address
- */
- @Nullable
- public String getAssociatedNetworkId() {
- return this.associatedNetworkId;
- }
-
- /**
- * @return the domain the public IP address is associated with
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain ID the public IP address is associated with
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return uses virtual network
- */
- public boolean isUsesVirtualNetwork() {
- return this.usesVirtualNetwork;
- }
-
- /**
- * @return public IP address
- */
- @Nullable
- public String getIPAddress() {
- return this.IPAddress;
- }
-
- /**
- * @return true if the IP address is a source nat address, false otherwise
- */
- public boolean isSourceNAT() {
- return this.isSourceNAT;
- }
-
- /**
- * @return true if this ip is for static nat, false otherwise
- */
- public boolean isStaticNAT() {
- return this.isStaticNAT;
- }
-
- /**
- * @return the ID of the Network where ip belongs to
- */
- @Nullable
- public String getNetworkId() {
- return this.networkId;
- }
-
- /**
- * @return State of the ip address. Can be: Allocating, Allocated and
- * Releasing
- */
- @Nullable
- public PublicIPAddress.State getState() {
- return this.state;
- }
-
- /**
- * @return virtual machine display name the ip address is assigned to (not
- * null only for static nat Ip)
- */
- @Nullable
- public String getVirtualMachineDisplayName() {
- return this.virtualMachineDisplayName;
- }
-
- /**
- * @return virtual machine id the ip address is assigned to (not null only
- * for static nat Ip)
- */
- @Nullable
- public String getVirtualMachineId() {
- return this.virtualMachineId;
- }
-
- /**
- * @return virtual machine name the ip address is assigned to (not null only
- * for static nat Ip)
- */
- @Nullable
- public String getVirtualMachineName() {
- return this.virtualMachineName;
- }
-
- /**
- * @return the ID of the VLAN associated with the IP address
- */
- @Nullable
- public String getVLANId() {
- return this.VLANId;
- }
-
- /**
- * @return the VLAN associated with the IP address
- */
- @Nullable
- public String getVLANName() {
- return this.VLANName;
- }
-
- /**
- * @return the ID of the zone the public IP address belongs to
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return the name of the zone the public IP address belongs to
- */
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- /**
- * @return shows the current pending asynchronous job ID. This tag is not
- * returned if no current pending jobs are acting on the virtual
- * machine
- */
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- /**
- * @return shows the current pending asynchronous job status
- */
- @Nullable
- public Integer getJobStatus() {
- return this.jobStatus;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, allocated, associatedNetworkId, domain, domainId, usesVirtualNetwork, IPAddress, isSourceNAT, isStaticNAT, networkId, state, virtualMachineDisplayName, virtualMachineId, virtualMachineName, VLANId, VLANName, zoneId, zoneName, jobId, jobStatus);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- PublicIPAddress that = PublicIPAddress.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.allocated, that.allocated)
- && Objects.equal(this.associatedNetworkId, that.associatedNetworkId)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.usesVirtualNetwork, that.usesVirtualNetwork)
- && Objects.equal(this.IPAddress, that.IPAddress)
- && Objects.equal(this.isSourceNAT, that.isSourceNAT)
- && Objects.equal(this.isStaticNAT, that.isStaticNAT)
- && Objects.equal(this.networkId, that.networkId)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.virtualMachineDisplayName, that.virtualMachineDisplayName)
- && Objects.equal(this.virtualMachineId, that.virtualMachineId)
- && Objects.equal(this.virtualMachineName, that.virtualMachineName)
- && Objects.equal(this.VLANId, that.VLANId)
- && Objects.equal(this.VLANName, that.VLANName)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("allocated", allocated).add("associatedNetworkId", associatedNetworkId)
- .add("domain", domain).add("domainId", domainId).add("usesVirtualNetwork", usesVirtualNetwork).add("IPAddress", IPAddress)
- .add("isSourceNAT", isSourceNAT).add("isStaticNAT", isStaticNAT).add("networkId", networkId).add("state", state)
- .add("virtualMachineDisplayName", virtualMachineDisplayName).add("virtualMachineId", virtualMachineId)
- .add("virtualMachineName", virtualMachineName).add("VLANId", VLANId).add("VLANName", VLANName).add("zoneId", zoneId)
- .add("zoneName", zoneName).add("jobId", jobId).add("jobStatus", jobStatus);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
deleted file mode 100644
index 9d59faf..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Class ResourceLimit
- */
-public class ResourceLimit {
-
- /**
- * Type of resource to update.
- */
- public enum ResourceType {
- /**
- * 0 - Instance. Number of instances a user can create.
- */
- INSTANCE(0),
- /**
- * 1 - IP. Number of public IP addresses a user can own.
- */
- IP(1),
- /**
- * 2 - Volume. Number of disk volumes a user can create.
- */
- VOLUME(2),
- /**
- * 3 - Snapshot. Number of snapshots a user can create.
- */
- SNAPSHOT(3),
- /**
- * 4 - Template. Number of templates that a user can register/create.
- */
- TEMPLATE(4),
- /**
- * 5 - Projects.
- */
- PROJECT(5),
- /**
- * 6 - Networks.
- */
- NETWORK(6),
- /**
- * 7 - VPC. Number of VPC the user can own.
- */
- VPC(7),
- /**
- * 8 - CPU. The number of CPUs the user can allocate.
- */
- CPU(8),
- /**
- * 9 - Memory. The amount of memory the user can allocate.
- */
- MEMORY(9),
- /**
- * 10 - Primary storage.
- */
- PRIMARY_STORAGE(10),
- /**
- * 11 - Secondary storage.
- */
- SECONDARY_STORAGE(11),
-
- UNRECOGNIZED(Integer.MAX_VALUE);
-
- private int code;
-
- private static final Map<Integer, ResourceType> INDEX = Maps.uniqueIndex(ImmutableSet.copyOf(ResourceType.values()),
- new Function<ResourceType, Integer>() {
-
- @Override
- public Integer apply(ResourceType input) {
- return input.code;
- }
-
- });
-
- ResourceType(int code) {
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-
- @Override
- public String toString() {
- return name();
- }
-
- public static ResourceType fromValue(String resourceType) {
- Integer code = Integer.valueOf(checkNotNull(resourceType, "resourcetype"));
- return INDEX.containsKey(code) ? INDEX.get(code) : UNRECOGNIZED;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromResourceLimit(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String account;
- protected String domain;
- protected String domainId;
- protected int max;
- protected ResourceType resourceType;
-
- /**
- * @see ResourceLimit#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see ResourceLimit#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see ResourceLimit#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see ResourceLimit#getMax()
- */
- public T max(int max) {
- this.max = max;
- return self();
- }
-
- /**
- * @see ResourceLimit#getResourceType()
- */
- public T resourceType(ResourceType resourceType) {
- this.resourceType = resourceType;
- return self();
- }
-
- public ResourceLimit build() {
- return new ResourceLimit(account, domain, domainId, max, resourceType);
- }
-
- public T fromResourceLimit(ResourceLimit in) {
- return this
- .account(in.getAccount())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .max(in.getMax())
- .resourceType(in.getResourceType());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String account;
- private final String domain;
- private final String domainId;
- private final int max;
- private final ResourceLimit.ResourceType resourceType;
-
- @ConstructorProperties({
- "account", "domain", "domainid", "max", "resourcetype"
- })
- protected ResourceLimit(@Nullable String account, @Nullable String domain, @Nullable String domainId, int max,
- @Nullable ResourceType resourceType) {
- this.account = account;
- this.domain = domain;
- this.domainId = domainId;
- this.max = max;
- this.resourceType = resourceType;
- }
-
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- public int getMax() {
- return this.max;
- }
-
- @Nullable
- public ResourceType getResourceType() {
- return this.resourceType;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(account, domain, domainId, max, resourceType);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ResourceLimit that = ResourceLimit.class.cast(obj);
- return Objects.equal(this.account, that.account)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.max, that.max)
- && Objects.equal(this.resourceType, that.resourceType);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("account", account).add("domain", domain).add("domainId", domainId).add("max", max).add("resourceType", resourceType);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
deleted file mode 100644
index 356fb00..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedSet;
-
-/**
- * Class SecurityGroup
- */
-public class SecurityGroup implements Comparable<SecurityGroup> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromSecurityGroup(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected String name;
- protected String description;
- protected String domain;
- protected String domainId;
- protected String jobId;
- protected Integer jobStatus;
- protected Set<IngressRule> ingressRules;
-
- /**
- * @see SecurityGroup#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see SecurityGroup#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see SecurityGroup#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see SecurityGroup#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see SecurityGroup#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see SecurityGroup#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see SecurityGroup#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see SecurityGroup#getJobStatus()
- */
- public T jobStatus(Integer jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- /**
- * @see SecurityGroup#getIngressRules()
- */
- public T ingressRules(Set<IngressRule> ingressRules) {
- this.ingressRules = ingressRules;
- return self();
- }
-
- public SecurityGroup build() {
- return new SecurityGroup(id, account, name, description, domain, domainId, jobId, jobStatus, ingressRules);
- }
-
- public T fromSecurityGroup(SecurityGroup in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .name(in.getName())
- .description(in.getDescription())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus())
- .ingressRules(in.getIngressRules());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final String name;
- private final String description;
- private final String domain;
- private final String domainId;
- private final String jobId;
- private final Integer jobStatus;
- private final Set<IngressRule> ingressRules;
-
- @ConstructorProperties({
- "id", "account", "name", "description", "domain", "domainid", "jobid", "jobstatus", "ingressrule"
- })
- protected SecurityGroup(String id, @Nullable String account, @Nullable String name, @Nullable String description,
- @Nullable String domain, @Nullable String domainId, @Nullable String jobId, @Nullable Integer jobStatus,
- @Nullable Set<IngressRule> ingressRules) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.name = name;
- this.description = description;
- this.domain = domain;
- this.domainId = domainId;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- this.ingressRules = ingressRules == null ? ImmutableSet.<IngressRule>of() : ImmutableSortedSet.copyOf(ingressRules);
- }
-
- /**
- * @return the id of the security group
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account owning the security group
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the name of the security group
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return an alternate display text of the security group.
- */
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- /**
- * @return Domain name for the security group
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain id of the security group
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return shows the current pending asynchronous job ID. This tag is not
- * returned if no current pending jobs are acting on the virtual
- * machine
- */
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- /**
- * @return shows the current pending asynchronous job status
- */
- @Nullable
- public Integer getJobStatus() {
- return this.jobStatus;
- }
-
- /**
- * @return the list of ingress rules associated with the security group
- */
- public Set<IngressRule> getIngressRules() {
- return this.ingressRules;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, name, description, domain, domainId, jobId, jobStatus, ingressRules);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- SecurityGroup that = SecurityGroup.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus)
- && Objects.equal(this.ingressRules, that.ingressRules);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
- .add("domain", domain).add("domainId", domainId).add("jobId", jobId).add("jobStatus", jobStatus).add("ingressRules", ingressRules);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(SecurityGroup o) {
- return id.compareTo(o.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
deleted file mode 100644
index d17ccca..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class ServiceOffering
- */
-public class ServiceOffering implements Comparable<ServiceOffering> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromServiceOffering(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String name;
- protected String displayText;
- protected Date created;
- protected String domain;
- protected String domainId;
- protected int cpuNumber;
- protected int cpuSpeed;
- protected int memory;
- protected boolean haSupport;
- protected StorageType storageType;
- protected boolean defaultUse;
- protected boolean systemOffering;
- protected boolean cpuUseLimited;
- protected long networkRate;
- protected boolean systemVmType;
- protected ImmutableSet.Builder<String> tags = ImmutableSet.<String>builder();
-
- /**
- * @see ServiceOffering#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see ServiceOffering#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see ServiceOffering#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see ServiceOffering#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see ServiceOffering#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see ServiceOffering#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see ServiceOffering#getCpuNumber()
- */
- public T cpuNumber(int cpuNumber) {
- this.cpuNumber = cpuNumber;
- return self();
- }
-
- /**
- * @see ServiceOffering#getCpuSpeed()
- */
- public T cpuSpeed(int cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- return self();
- }
-
- /**
- * @see ServiceOffering#getMemory()
- */
- public T memory(int memory) {
- this.memory = memory;
- return self();
- }
-
- /**
- * @see ServiceOffering#supportsHA()
- */
- public T supportsHA(boolean haSupport) {
- this.haSupport = haSupport;
- return self();
- }
-
- /**
- * @see ServiceOffering#getStorageType()
- */
- public T storageType(StorageType storageType) {
- this.storageType = storageType;
- return self();
- }
-
- /**
- * @see ServiceOffering#getTags()
- */
- public T tags(Iterable<String> tags) {
- this.tags = ImmutableSet.<String>builder().addAll(tags);
- return self();
- }
-
- /**
- * @see ServiceOffering#getTags()
- */
- public T tag(String tag) {
- this.tags.add(tag);
- return self();
- }
-
- /**
- * @see ServiceOffering#isDefaultUse()
- */
- public T defaultUse(boolean defaultUse) {
- this.defaultUse = defaultUse;
- return self();
- }
-
- /**
- * @see ServiceOffering#isSystemOffering()
- */
- public T systemOffering(boolean systemOffering) {
- this.systemOffering = systemOffering;
- return self();
- }
-
- /**
- * @see ServiceOffering#isCpuUseLimited()
- */
- public T cpuUseLimited(boolean cpuUseLimited) {
- this.cpuUseLimited = cpuUseLimited;
- return self();
- }
-
- /**
- * @see ServiceOffering#getNetworkRate()
- */
- public T networkRate(long networkRate) {
- this.networkRate = networkRate;
- return self();
- }
-
- /**
- * @see ServiceOffering#isSystemVmType()
- */
- public T systemVmType(boolean systemVmType) {
- this.systemVmType = systemVmType;
- return self();
- }
-
- public ServiceOffering build() {
- return new ServiceOffering(id, name, displayText, created, domain, domainId, cpuNumber, cpuSpeed, memory, haSupport, storageType,
- tags.build(), defaultUse, systemOffering, cpuUseLimited, networkRate, systemVmType);
- }
-
- public T fromServiceOffering(ServiceOffering in) {
- return this
- .id(in.getId())
- .name(in.getName())
- .displayText(in.getDisplayText())
- .created(in.getCreated())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .cpuNumber(in.getCpuNumber())
- .cpuSpeed(in.getCpuSpeed())
- .memory(in.getMemory())
- .supportsHA(in.supportsHA())
- .storageType(in.getStorageType())
- .tags(in.getTags())
- .defaultUse(in.isDefaultUse())
- .systemOffering(in.isSystemOffering())
- .cpuUseLimited(in.isCpuUseLimited())
- .networkRate(in.getNetworkRate())
- .systemVmType(in.isSystemVmType());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String name;
- private final String displayText;
- private final Date created;
- private final String domain;
- private final String domainId;
- private final int cpuNumber;
- private final int cpuSpeed;
- private final int memory;
- private final boolean haSupport;
- private final StorageType storageType;
- private final Set<String> tags;
- private final boolean defaultUse;
- private final boolean systemOffering;
- private final boolean cpuUseLimited;
- private final long networkRate;
- private final boolean systemVmType;
-
- @ConstructorProperties({
- "id", "name", "displaytext", "created", "domain", "domainid", "cpunumber", "cpuspeed", "memory", "offerha", "storagetype", "tags", "defaultuse", "issystem", "limitcpuuse", "networkrate", "systemvmtype"
- })
- protected ServiceOffering(String id, @Nullable String name, @Nullable String displayText, @Nullable Date created,
- @Nullable String domain, @Nullable String domainId, int cpuNumber, int cpuSpeed, int memory,
- boolean haSupport, @Nullable StorageType storageType, @Nullable Iterable<String> tags, boolean defaultUse,
- boolean systemOffering, boolean cpuUseLimited, long networkRate, boolean systemVmType) {
- this.id = checkNotNull(id, "id");
- this.name = name;
- this.displayText = displayText;
- this.created = created;
- this.domain = domain;
- this.domainId = domainId;
- this.cpuNumber = cpuNumber;
- this.cpuSpeed = cpuSpeed;
- this.memory = memory;
- this.haSupport = haSupport;
- this.storageType = storageType;
- this.tags = tags != null ? ImmutableSet.copyOf(tags) : ImmutableSet.<String> of();
- this.defaultUse = defaultUse;
- this.systemOffering = systemOffering;
- this.cpuUseLimited = cpuUseLimited;
- this.networkRate = networkRate;
- this.systemVmType = systemVmType;
- }
-
- /**
- * @return the id of the service offering
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the name of the service offering
- */
- public String getName() {
- return this.name;
- }
-
- /**
- * @return an alternate display text of the service offering.
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- /**
- * @return the date this service offering was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return Domain name for the offering
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain id of the service offering
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the number of CPU
- */
- public int getCpuNumber() {
- return this.cpuNumber;
- }
-
- /**
- * @return the clock rate CPU speed in Mhz
- */
- public int getCpuSpeed() {
- return this.cpuSpeed;
- }
-
- /**
- * @return the memory in MB
- */
- public int getMemory() {
- return this.memory;
- }
-
- public boolean supportsHA() {
- return this.haSupport;
- }
-
- /**
- * @return the storage type for this service offering
- */
- @Nullable
- public StorageType getStorageType() {
- return this.storageType;
- }
-
- /**
- * @return the tags for the service offering
- */
- public Set<String> getTags() {
- return tags;
- }
-
- /**
- * @return whether this is a default system vm offering
- */
- public boolean isDefaultUse() {
- return this.defaultUse;
- }
-
- /**
- * @return whether this is a system vm offering
- */
- public boolean isSystemOffering() {
- return this.systemOffering;
- }
-
- /**
- * @return whether restrict the CPU usage to committed service offering
- */
- public boolean isCpuUseLimited() {
- return this.cpuUseLimited;
- }
-
- /**
- * @return data transfer rate in megabits per second allowed.
- */
- public long getNetworkRate() {
- return this.networkRate;
- }
-
- /**
- * @return whether this is a the systemvm type for system vm offering
- */
- public boolean isSystemVmType() {
- return this.systemVmType;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name, displayText, created, domain, domainId, cpuNumber, cpuSpeed, memory, haSupport, storageType, tags, defaultUse, systemOffering, cpuUseLimited, networkRate, systemVmType);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ServiceOffering that = ServiceOffering.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.cpuNumber, that.cpuNumber)
- && Objects.equal(this.cpuSpeed, that.cpuSpeed)
- && Objects.equal(this.memory, that.memory)
- && Objects.equal(this.haSupport, that.haSupport)
- && Objects.equal(this.storageType, that.storageType)
- && Objects.equal(this.getTags(), that.getTags())
- && Objects.equal(this.defaultUse, that.defaultUse)
- && Objects.equal(this.systemOffering, that.systemOffering)
- && Objects.equal(this.cpuUseLimited, that.cpuUseLimited)
- && Objects.equal(this.networkRate, that.networkRate)
- && Objects.equal(this.systemVmType, that.systemVmType);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
- .add("domainId", domainId).add("cpuNumber", cpuNumber).add("cpuSpeed", cpuSpeed).add("memory", memory)
- .add("haSupport", haSupport).add("storageType", storageType).add("tags", getTags()).add("defaultUse", defaultUse)
- .add("systemOffering", systemOffering).add("cpuUseLimited", cpuUseLimited)
- .add("networkRate", networkRate).add("systemVmType", systemVmType);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(ServiceOffering o) {
- return id.compareTo(o.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
deleted file mode 100644
index d832a2a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class Snapshot
- */
-public class Snapshot {
-
- /**
- */
- public static enum State {
-
- BACKED_UP, CREATING, BACKING_UP, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static State fromValue(String state) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- /**
- */
- public static enum Type {
-
- MANUAL, RECURRING, UNRECOGNIZED;
-
- public static Type fromValue(String type) {
- try {
- return valueOf(checkNotNull(type, "type"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- /**
- */
- public static enum Interval {
-
- HOURLY, DAILY, WEEKLY, MONTHLY, template, none, UNRECOGNIZED;
-
- public static Interval fromValue(String type) {
- try {
- return valueOf(checkNotNull(type, "type"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromSnapshot(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected Date created;
- protected String domain;
- protected String domainId;
- protected Snapshot.Interval interval;
- protected String jobId;
- protected String jobStatus;
- protected String name;
- protected Snapshot.Type snapshotType;
- protected Snapshot.State state;
- protected String volumeId;
- protected String volumeName;
- protected Volume.Type volumeType;
-
- /**
- * @see Snapshot#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Snapshot#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see Snapshot#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see Snapshot#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see Snapshot#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see Snapshot#getInterval()
- */
- public T interval(Snapshot.Interval interval) {
- this.interval = interval;
- return self();
- }
-
- /**
- * @see Snapshot#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see Snapshot#getJobStatus()
- */
- public T jobStatus(String jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- /**
- * @see Snapshot#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Snapshot#getSnapshotType()
- */
- public T snapshotType(Snapshot.Type snapshotType) {
- this.snapshotType = snapshotType;
- return self();
- }
-
- /**
- * @see Snapshot#getState()
- */
- public T state(Snapshot.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see Snapshot#getVolumeId()
- */
- public T volumeId(String volumeId) {
- this.volumeId = volumeId;
- return self();
- }
-
- /**
- * @see Snapshot#getVolumeName()
- */
- public T volumeName(String volumeName) {
- this.volumeName = volumeName;
- return self();
- }
-
- /**
- * @see Snapshot#getVolumeType()
- */
- public T volumeType(Volume.Type volumeType) {
- this.volumeType = volumeType;
- return self();
- }
-
- public Snapshot build() {
- return new Snapshot(id, account, created, domain, domainId, interval, jobId, jobStatus, name, snapshotType, state,
- volumeId, volumeName, volumeType);
- }
-
- public T fromSnapshot(Snapshot in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .created(in.getCreated())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .interval(in.getInterval())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus())
- .name(in.getName())
- .snapshotType(in.getSnapshotType())
- .state(in.getState())
- .volumeId(in.getVolumeId())
- .volumeName(in.getVolumeName())
- .volumeType(in.getVolumeType());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final Date created;
- private final String domain;
- private final String domainId;
- private final Snapshot.Interval interval;
- private final String jobId;
- private final String jobStatus;
- private final String name;
- private final Snapshot.Type snapshotType;
- private final Snapshot.State state;
- private final String volumeId;
- private final String volumeName;
- private final Volume.Type volumeType;
-
- @ConstructorProperties({
- "id", "account", "created", "domain", "domainid", "intervaltype", "jobid", "jobstatus", "name", "snapshottype", "state", "volumeid", "volumename", "volumetype"
- })
- protected Snapshot(String id, @Nullable String account, @Nullable Date created, @Nullable String domain, @Nullable String domainId,
- @Nullable Snapshot.Interval interval, @Nullable String jobId, @Nullable String jobStatus, @Nullable String name,
- @Nullable Snapshot.Type snapshotType, @Nullable Snapshot.State state, @Nullable String volumeId, @Nullable String volumeName,
- @Nullable Volume.Type volumeType) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.created = created;
- this.domain = domain;
- this.domainId = domainId;
- this.interval = interval;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- this.name = name;
- this.snapshotType = snapshotType;
- this.state = state;
- this.volumeId = volumeId;
- this.volumeName = volumeName;
- this.volumeType = volumeType;
- }
-
- /**
- * @return ID of the snapshot
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account associated with the snapshot
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the date the snapshot was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the domain name of the snapshot's account
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain ID of the snapshot's account
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return valid types are hourly, daily, weekly, monthly, template, and none.
- */
- @Nullable
- public Snapshot.Interval getInterval() {
- return this.interval;
- }
-
- /**
- * @return the job ID associated with the snapshot. This is only displayed if the snapshot listed is part of a currently running asynchronous job.
- */
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- /**
- * @return the job status associated with the snapshot. This is only displayed if the snapshot listed is part of a currently running asynchronous job.
- */
- @Nullable
- public String getJobStatus() {
- return this.jobStatus;
- }
-
- /**
- * @return name of the snapshot
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the type of the snapshot
- */
- @Nullable
- public Snapshot.Type getSnapshotType() {
- return this.snapshotType;
- }
-
- /**
- * @return the state of the snapshot. BackedUp means that snapshot is ready to be used; Creating - the snapshot is being allocated on the primary storage; BackingUp - the snapshot is being backed up on secondary storage
- */
- @Nullable
- public Snapshot.State getState() {
- return this.state;
- }
-
- /**
- * @return ID of the disk volume
- */
- @Nullable
- public String getVolumeId() {
- return this.volumeId;
- }
-
- /**
- * @return name of the disk volume
- */
- @Nullable
- public String getVolumeName() {
- return this.volumeName;
- }
-
- /**
- * @return type of the disk volume
- */
- @Nullable
- public Volume.Type getVolumeType() {
- return this.volumeType;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, created, domain, domainId, interval, jobId, jobStatus, name, snapshotType, state, volumeId, volumeName, volumeType);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Snapshot that = Snapshot.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.interval, that.interval)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.snapshotType, that.snapshotType)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.volumeId, that.volumeId)
- && Objects.equal(this.volumeName, that.volumeName)
- && Objects.equal(this.volumeType, that.volumeType);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId)
- .add("interval", interval).add("jobId", jobId).add("jobStatus", jobStatus).add("name", name).add("snapshotType", snapshotType)
- .add("state", state).add("volumeId", volumeId).add("volumeName", volumeName).add("volumeType", volumeType);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
[21/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java
deleted file mode 100644
index d85cd05..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.zoneId;
-import static org.jclouds.util.Predicates2.retry;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.net.URLDecoder;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.ExtractMode;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateExtraction;
-import org.jclouds.cloudstack.domain.TemplateMetadata;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.CreateTemplateOptions;
-import org.jclouds.cloudstack.options.ListNetworksOptions;
-import org.jclouds.cloudstack.options.ListVolumesOptions;
-import org.jclouds.cloudstack.options.RegisterTemplateOptions;
-import org.jclouds.logging.Logger;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code TemplateApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "TemplateApiLiveTest")
-public class TemplateApiLiveTest extends BaseCloudStackApiLiveTest {
-
- private static final String IMPORT_VHD_URL = "http://www.frontiertown.co.uk/jclouds/empty.vhd";
- private VirtualMachine vmForCreation;
- private VirtualMachine vmForRegistration;
- private Template createdTemplate;
- private Template registeredTemplate;
-
- @Test
- public void testListTemplates() throws Exception {
- Set<Template> response = client.getTemplateApi().listTemplates();
- assert null != response;
- long templateCount = response.size();
- assertTrue(templateCount >= 0);
- for (Template template : response) {
- Template newDetails = Iterables.getOnlyElement(client.getTemplateApi().listTemplates(
- zoneId(template.getZoneId()).id(template.getId())));
- Logger.CONSOLE.info("Checking template: " + template);
-
- assertEquals(template, newDetails);
- assertEquals(template, client.getTemplateApi().getTemplateInZone(template.getId(), template.getZoneId()));
- assert template.getId() != null : template;
- assert template.getName() != null : template;
- assert template.getDisplayText() != null : template;
- assert template.getCreated() != null : template;
- assert template.getFormat() != null && template.getFormat() != Template.Format.UNRECOGNIZED : template;
- assert template.getOSType() != null : template;
- assert template.getOSTypeId() != null : template;
- assert template.getAccount() != null : template;
- assert template.getZone() != null : template;
- assert template.getZoneId() != null : template;
- assert template.getStatus() == null ||
- template.getStatus() == Template.Status.DOWNLOADED : template;
- assert template.getType() != null && template.getType() != Template.Type.UNRECOGNIZED : template;
- assert template.getHypervisor() != null : template;
- assert template.getDomain() != null : template;
- assert template.getDomainId() != null : template;
- assert template.getSize() > 0 : template;
- }
- }
-
- @Test(enabled = true)
- public void testCreateTemplate() throws Exception {
- Zone zone = Iterables.getFirst(client.getZoneApi().listZones(), null);
- assertNotNull(zone);
- Iterable<Network> networks = client.getNetworkApi().listNetworks(ListNetworksOptions.Builder.zoneId(zone.getId()).isDefault(true));
- networks = Iterables.filter(networks, new Predicate<Network>() {
- @Override
- public boolean apply(Network network) {
- return network != null && network.getState().equals("Implemented");
- }
- });
- assertTrue(Iterables.size(networks) >= 1);
- Network network = Iterables.get(networks, 0);
- assertNotNull(network);
-
- // Create a VM and stop it
- String defaultTemplate = template != null ? template.getImageId() : null;
- vmForCreation = VirtualMachineApiLiveTest.createVirtualMachineInNetwork(network, defaultTemplate, client, jobComplete, virtualMachineRunning);
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().stopVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
-
- // Work out the VM's volume
- Set<Volume> volumes = client.getVolumeApi().listVolumes(ListVolumesOptions.Builder.virtualMachineId(vmForCreation.getId()));
- assertEquals(volumes.size(), 1);
- Volume volume = Iterables.getOnlyElement(volumes);
-
- // Create a template
- CreateTemplateOptions options = CreateTemplateOptions.Builder.volumeId(volume.getId());
- AsyncCreateResponse response = client.getTemplateApi().createTemplate(TemplateMetadata.builder().name(prefix + "-createTemplate").osTypeId(vmForCreation.getGuestOSId()).displayText("jclouds live testCreateTemplate").build(), options);
- assertTrue(jobComplete.apply(response.getJobId()), vmForCreation.toString());
- createdTemplate = client.getTemplateApi().getTemplateInZone(response.getId(), vmForCreation.getZoneId());
-
- // Assertions
- assertNotNull(createdTemplate);
- }
-
- @Test(enabled = true, dependsOnMethods = "testRegisterTemplate")
- public void testExtractTemplate() throws Exception {
- // Initiate the extraction and wait for it to complete
- AsyncCreateResponse response = client.getTemplateApi().extractTemplate(registeredTemplate.getId(), ExtractMode.HTTP_DOWNLOAD, registeredTemplate.getZoneId());
- assertTrue(jobComplete.apply(response.getJobId()), registeredTemplate.toString());
-
- // Get the result
- AsyncJob<TemplateExtraction> asyncJob = client.getAsyncJobApi().getAsyncJob(response.getJobId());
- TemplateExtraction extract = asyncJob.getResult();
- assertNotNull(extract);
-
- // Check that the URL can be retrieved
- String extractUrl = extract.getUrl();
- assertNotNull(extractUrl);
- URI uri = new URI(URLDecoder.decode(extractUrl, "utf-8"));
- assertTrue(cloudStackContext.utils().http().exists(uri), "does not exist: " + uri);
- }
-
- @Test(enabled = true)
- public void testRegisterTemplate() throws Exception {
- Zone zone = Iterables.getFirst(client.getZoneApi().listZones(), null);
- assertNotNull(zone);
- Iterable<Network> networks = client.getNetworkApi().listNetworks(ListNetworksOptions.Builder.zoneId(zone.getId()).isDefault(true));
- networks = Iterables.filter(networks, new Predicate<Network>() {
- @Override
- public boolean apply(Network network) {
- return network != null && network.getName().equals("Virtual Network");
- }
- });
- assertEquals(Iterables.size(networks), 1);
- Network network = Iterables.getOnlyElement(networks, null);
- assertNotNull(network);
- Set<OSType> osTypes = client.getGuestOSApi().listOSTypes();
- OSType osType = Iterables.getFirst(osTypes, null);
-
- // Register a template
- RegisterTemplateOptions options = RegisterTemplateOptions.Builder.bits(32).isExtractable(true);
- TemplateMetadata templateMetadata = TemplateMetadata.builder().name(prefix + "-registerTemplate").osTypeId(osType.getId()).displayText("jclouds live testRegisterTemplate").build();
- Set<Template> templates = client.getTemplateApi().registerTemplate(templateMetadata, "VHD", "XenServer", IMPORT_VHD_URL, zone.getId(), options);
- registeredTemplate = Iterables.getOnlyElement(templates, null);
- assertNotNull(registeredTemplate);
-
- // Ensure it is available
- final String zoneId = zone.getId();
- Predicate<Template> templateReadyPredicate = new Predicate<Template>() {
- @Override
- public boolean apply(Template template) {
- if (template == null) return false;
- Template t2 = client.getTemplateApi().getTemplateInZone(template.getId(), zoneId);
- Logger.CONSOLE.info("%s", t2.getStatus());
- return t2.getStatus() == Template.Status.DOWNLOADED;
- }
- };
- assertTrue(retry(templateReadyPredicate, 60000).apply(registeredTemplate));
-
- // Create a VM that uses this template
- vmForRegistration = VirtualMachineApiLiveTest.createVirtualMachineInNetwork(network, registeredTemplate.getId(), client, jobComplete, virtualMachineRunning);
- assertNotNull(vmForRegistration);
- }
-
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (vmForCreation != null) {
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().stopVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
- assertTrue(virtualMachineDestroyed.apply(vmForCreation));
- }
- if (vmForRegistration != null) {
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().stopVirtualMachine(vmForRegistration.getId())), vmForRegistration.toString());
- assertTrue(jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vmForRegistration.getId())), vmForRegistration.toString());
- assert virtualMachineDestroyed.apply(vmForRegistration);
- }
- if (createdTemplate != null) {
- AsyncCreateResponse deleteJob = client.getTemplateApi().deleteTemplate(createdTemplate.getId());
- assertTrue(jobComplete.apply(deleteJob.getJobId()));
- }
- if (registeredTemplate != null) {
- AsyncCreateResponse deleteJob = client.getTemplateApi().deleteTemplate(registeredTemplate.getId());
- assertTrue(jobComplete.apply(deleteJob.getJobId()));
- }
- super.tearDownContext();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
deleted file mode 100644
index 002d6b0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.ExtractMode;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateFilter;
-import org.jclouds.cloudstack.domain.TemplateMetadata;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.CreateTemplateOptions;
-import org.jclouds.cloudstack.options.DeleteTemplateOptions;
-import org.jclouds.cloudstack.options.ExtractTemplateOptions;
-import org.jclouds.cloudstack.options.ListTemplatesOptions;
-import org.jclouds.cloudstack.options.RegisterTemplateOptions;
-import org.jclouds.cloudstack.options.UpdateTemplateOptions;
-import org.jclouds.cloudstack.options.UpdateTemplatePermissionsOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code TemplateApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "TemplateApiTest")
-public class TemplateApiTest extends BaseCloudStackApiTest<TemplateApi> {
-
- public void testCreateTemplate() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "createTemplate", TemplateMetadata.class, CreateTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build()));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=createTemplate&name=thename&ostypeid=10&displaytext=description HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testCreateTemplateOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "createTemplate", TemplateMetadata.class, CreateTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), CreateTemplateOptions.Builder.bits(32).isFeatured(true).isPublic(true).passwordEnabled(true).requiresHVM(true).snapshotId("11").volumeId("12")));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=createTemplate&bits=32&isfeatured=true&ispublic=true&passwordenabled=true&requireshvm=true&snapshotid=11&volumeid=12&name=thename&ostypeid=10&displaytext=description HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest registerTemplate = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "registerTemplate")
- .addQueryParam("format", "QCOW2")
- .addQueryParam("hypervisor", "xen")
- .addQueryParam("url", "http%3A//example.com/")
- .addQueryParam("zoneid", "20")
- .addQueryParam("name", "thename")
- .addQueryParam("ostypeid", "10")
- .addQueryParam("displaytext", "description").build();
-
- public void testRegisterTemplate() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "registerTemplate", TemplateMetadata.class, String.class, String.class, String.class, String.class, RegisterTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), Template.Format.QCOW2, "xen", "http://example.com/", 20));
-
- assertRequestLineEquals(httpRequest, registerTemplate.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest registerTemplateOptions = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "registerTemplate")
- .addQueryParam("format", "QCOW2")
- .addQueryParam("hypervisor", "xen")
- .addQueryParam("url", "http%3A//example.com/")
- .addQueryParam("zoneid", "20")
- .addQueryParam("account", "mydomain")
- .addQueryParam("domainid", "3")
- .addQueryParam("bits", "32")
- .addQueryParam("checksum", "ABC")
- .addQueryParam("isextractable", "true")
- .addQueryParam("isfeatured", "true")
- .addQueryParam("ispublic", "true")
- .addQueryParam("passwordenabled", "true")
- .addQueryParam("requireshvm", "true")
- .addQueryParam("name", "thename")
- .addQueryParam("ostypeid", "10")
- .addQueryParam("displaytext", "description").build();
-
- public void testRegisterTemplateOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "registerTemplate", TemplateMetadata.class, String.class, String.class, String.class, String.class, RegisterTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), Template.Format.QCOW2, "xen", "http://example.com/", 20,
- RegisterTemplateOptions.Builder.accountInDomain("mydomain", "3").bits(32).checksum("ABC").isExtractable(true).isFeatured(true).isPublic(true).passwordEnabled(true).requiresHVM(true)));
-
- assertRequestLineEquals(httpRequest, registerTemplateOptions.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateTemplate() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "updateTemplate", String.class, UpdateTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplate&id=17 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateTemplateOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "updateTemplate", String.class, UpdateTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, UpdateTemplateOptions.Builder.bootable(true).displayText("description").format(Template.Format.VHD).name("thename").osTypeId("12").passwordEnabled(true)));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplate&id=17&bootable=true&displaytext=description&format=VHD&name=thename&ostypeid=12&passwordenabled=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest copyTemplate = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "copyTemplate")
- .addQueryParam("id", "17")
- .addQueryParam("sourcezoneid", "18")
- .addQueryParam("destzoneid", "19").build();
-
- public void testCopyTemplate() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "copyTemplateToZone", String.class, String.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, 18, 19));
-
- assertRequestLineEquals(httpRequest, copyTemplate.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteTemplate() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "deleteTemplate", String.class, DeleteTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=deleteTemplate&id=17 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteTemplateOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "deleteTemplate", String.class, DeleteTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, DeleteTemplateOptions.Builder.zoneId("8")));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=deleteTemplate&id=17&zoneid=8 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListTemplates() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TemplateApi.class, "listTemplates");
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&templatefilter=executable HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListTemplatesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TemplateApi.class, "listTemplates", ListTemplatesOptions.class);
- GeneratedHttpRequest httpRequest = processor
- .createRequest(
- method, ImmutableList.<Object> of(
- ListTemplatesOptions.Builder.accountInDomain("adrian", "6").hypervisor("xen")
- .filter(TemplateFilter.FEATURED)));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&account=adrian&domainid=6&hypervisor=xen&templatefilter=featured HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetTemplate() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(TemplateApi.class, "getTemplateInZone", String.class, String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5, 1));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&templatefilter=executable&id=5&zoneid=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testUpdateTemplatePermissions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "updateTemplatePermissions", String.class, UpdateTemplatePermissionsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplatePermissions&id=17 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateTemplatePermissionsOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "updateTemplatePermissions", String.class, UpdateTemplatePermissionsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, UpdateTemplatePermissionsOptions.Builder.accounts(ImmutableSet.of("5", "6")).isExtractable(true).isFeatured(true).isPublic(true).op(UpdateTemplatePermissionsOptions.Operation.add)));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplatePermissions&id=17&accounts=5,6&isextractable=true&isfeatured=true&ispublic=true&op=add HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListTemplatePermissions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "listTemplatePermissions", String.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listTemplatePermissions&listAll=true&id=17 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListTemplatePermissionsOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "listTemplatePermissions", String.class, AccountInDomainOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, AccountInDomainOptions.Builder.accountInDomain("fred", "8")));
-
- assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listTemplatePermissions&listAll=true&id=17&account=fred&domainid=8 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest extractTemplate = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "extractTemplate")
- .addQueryParam("id", "3")
- .addQueryParam("mode", "HTTP_DOWNLOAD")
- .addQueryParam("zoneid", "5").build();
-
- public void testExtractTemplate() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "extractTemplate", String.class, ExtractMode.class, String.class, ExtractTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5));
-
- assertRequestLineEquals(httpRequest, extractTemplate.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- HttpRequest extractTemplateOptions = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "extractTemplate")
- .addQueryParam("id", "3")
- .addQueryParam("mode", "HTTP_DOWNLOAD")
- .addQueryParam("zoneid", "5")
- .addQueryParam("url", "http%3A//example.com/").build();
-
- public void testExtractTemplateOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(TemplateApi.class, "extractTemplate", String.class, ExtractMode.class, String.class, ExtractTemplateOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5, ExtractTemplateOptions.Builder.url("http://example.com/")));
-
- assertRequestLineEquals(httpRequest, extractTemplateOptions.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java
deleted file mode 100644
index 3037502..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Random;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.VMGroup;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListVMGroupsOptions;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code VMGroupApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "VMGroupApiLiveTest")
-public class VMGroupApiLiveTest extends BaseCloudStackApiLiveTest {
-
- private VMGroup groupCreated;
-
- public VMGroupApiLiveTest() {
- prefix += "2";
- }
-
- @Test
- public void testCreateListDestroyVMGroup() {
- VMGroupApi vmGroupClient = client.getVMGroupApi();
- String name = "jclouds-test-" + (Integer.toHexString(new Random().nextInt()));
- groupCreated = vmGroupClient.createInstanceGroup(name);
- assertEquals(groupCreated.getName(), name);
-
- Set<VMGroup> search = vmGroupClient.listInstanceGroups(ListVMGroupsOptions.Builder.name(name));
- assertEquals(1, search.size());
- VMGroup groupFound = Iterables.getOnlyElement(search);
- assertEquals(groupFound, groupCreated);
-
- vmGroupClient.deleteInstanceGroup(groupCreated.getId());
- groupCreated = null;
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (groupCreated != null) {
- client.getVMGroupApi().deleteInstanceGroup(groupCreated.getId());
- }
- super.tearDownContext();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java
deleted file mode 100644
index b534557..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateVMGroupOptions;
-import org.jclouds.cloudstack.options.ListVMGroupsOptions;
-import org.jclouds.cloudstack.options.UpdateVMGroupOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code VMGroupApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "VMGroupApiTest")
-public class VMGroupApiTest extends BaseCloudStackApiTest<VMGroupApi> {
-
- public void testListVMGroups() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VMGroupApi.class, "listInstanceGroups", ListVMGroupsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listInstanceGroups&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListVMGroupsOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VMGroupApi.class, "listInstanceGroups", ListVMGroupsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListVMGroupsOptions.Builder.account("fred")
- .domainId("5").id("6")));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listInstanceGroups&listAll=true&account=fred&domainid=5&id=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetVMGroup() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VMGroupApi.class, "getInstanceGroup", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listInstanceGroups&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testCreateVMGroup() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VMGroupApi.class, "createInstanceGroup", String.class, CreateVMGroupOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("goo"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=createInstanceGroup&name=goo HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testCreateVMGroupOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VMGroupApi.class, "createInstanceGroup", String.class, CreateVMGroupOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("goo", CreateVMGroupOptions.Builder.account("foo").domainId("42")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=createInstanceGroup&name=goo&account=foo&domainid=42 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testUpdateVMGroup() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VMGroupApi.class, "updateInstanceGroup", String.class, UpdateVMGroupOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5, UpdateVMGroupOptions.Builder.name("fred")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateInstanceGroup&id=5&name=fred HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDeleteVMGroup() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VMGroupApi.class, "deleteInstanceGroup", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteInstanceGroup&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java
deleted file mode 100644
index 3b8b043..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.EncryptedPasswordAndPrivateKey;
-import org.jclouds.cloudstack.functions.WindowsLoginCredentialsFromEncryptedData;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.encryption.internal.JCECrypto;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-/**
- * Test the CloudStack VirtualMachineApiClient
- */
-@Test(groups = "unit", testName = "VirtualMachineApiExpectTest")
-public class VirtualMachineApiExpectTest extends BaseCloudStackExpectTest<VirtualMachineApi> {
-
- public void testGetPasswordForVirtualMachineWhenResponseIs2xx() throws NoSuchAlgorithmException, CertificateException {
- String privateKey = "-----BEGIN RSA PRIVATE KEY-----\n" +
- "MIICXgIBAAKBgQDnaPKhTNgw7qPJVp3qsT+7XhhAbip25a0AnUgq8Fb9LPcZk00p\n" +
- "jm+m4JrKmDWKZWrHMNBhCNHMzvV9KrAXUMzL4s7mdEicbxTKratTYoyJM7a87bcZ\n" +
- "xr+Gtoq4tm031Cix3LKyJUB0iSVU5V/Zx4QcaF5+FWcYMVI26x2Eaz+O7wIDAQAB\n" +
- "AoGBAOI8sDkSL6pnJKmKjQkOEQjVjVAwZEOpd+HJ4uxX3DPY6huO7zlZj77Oh4ba\n" +
- "GD4duK7VAmRbgwGAtHCSc2XYEN7ICnfkQrm+3Q8nS824Sz21WlzdCxKDFkDcC1wK\n" +
- "RjE7SwXN1Kj8Xq8Vpf+z6OzHatSRZD85JM3u0/QCksOJTVIBAkEA9OpycYTuUYjC\n" +
- "2pLrO5kkl0nIHbNPvFNZyle19AsHH0z/ClV8DiFtGQpwhqwCoWT0cTmSACPD/quA\n" +
- "hdc2mvV+4QJBAPHiBi/7qDpJldLLvK5ALbn1yRaPSDXLccvFV4FkSS9b/2+mOM2a\n" +
- "8JkolVCzImxAm0ZZDZeAGKJj1RZDsMIP188CQCfZKWus7DWZ4dI8S0e0IA75czTZ\n" +
- "4uRKT3arlLAzRyJhnbFpvThzWdPULgDLZdYqndb6PfYF27LI5q1gGcNWpCECQQCB\n" +
- "r8/ldiZyafW8eaQGQT7DD7brM5Nh1FyFBp+uLljW3ZqNADBAfKw3Uf0MsZ7pL5KR\n" +
- "GzogWnvaxXAAafahdeEdAkEAzBT+UcxFmcPUO33PnuuiX5KIqThc6aHjjH5O7yzO\n" +
- "m4Et9JwQiSgcPBmNY5NKPgmcpvUi9jDylSUV0VUu436RpQ==\n" +
- "-----END RSA PRIVATE KEY-----";
-
- VirtualMachineApi client = requestSendsResponse(
- HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=getVMPassword&id=1&apiKey=identity&signature=SVA2r1KRj4yG03rATMLPZWS%2BKnw%3D")
- .addHeader("Accept", "application/json")
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/getvmpasswordresponse.json"))
- .build());
-
- String actual = client.getEncryptedPasswordForVirtualMachine("1");
- String expected = "EFOwm8icZ4sEib4y6ntVHUKHZJQrGBdyPkL1L9lpFHYhs3JfAtL5E5bxBP5Er27bJyOZPjKFcInX\r\n" +
- "pQ0LZlQBZDd5/ac0NSoM6tAX3H30pYxNw4t2f9u8aJ48oOEvufgGxTTHnM9qHXD04lt+Ouql6i2q\r\n" +
- "HxBqCxFkMZEla3LFieE=\r\n";
-
- assertEquals(actual, expected);
-
- WindowsLoginCredentialsFromEncryptedData passwordDecrypt = new WindowsLoginCredentialsFromEncryptedData(new JCECrypto());
-
- assertEquals(passwordDecrypt.apply(
- EncryptedPasswordAndPrivateKey.builder().encryptedPassword(actual).privateKey(privateKey).build()).getOptionalPassword().get(), "bX7vvptvw");
- }
-
- HttpRequest deployVirtualMachineInZone = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "deployVirtualMachine")
- .addQueryParam("zoneid", "zone1")
- .addQueryParam("serviceofferingid", "serviceOffering1")
- .addQueryParam("templateid", "template1")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "pBjjnTq7/ezN94Uj0gpy2T//cJQ%3D")
- .addHeader("Accept", "application/json")
- .build();
-
- public void testDeployVirtualMachineIs2xxVersion3x() {
- HttpResponse deployVirtualMachineInZoneResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/deployvirtualmachineresponse.json")).build();
- VirtualMachineApi client = requestSendsResponse(deployVirtualMachineInZone, deployVirtualMachineInZoneResponse);
-
- AsyncCreateResponse async = client.deployVirtualMachineInZone("zone1", "serviceOffering1", "template1");
-
- assertEquals(async, AsyncCreateResponse.builder().id("1234").jobId("50006").build());
- }
-
- public void testDeployVirtualMachineIs2xxVersion4x() {
- HttpResponse deployVirtualMachineInZoneResponse = HttpResponse.builder().statusCode(200)
- .payload(payloadFromResource("/deployvirtualmachineresponse4x.json")).build();
- VirtualMachineApi client = requestSendsResponse(deployVirtualMachineInZone, deployVirtualMachineInZoneResponse);
-
- AsyncCreateResponse async = client.deployVirtualMachineInZone("zone1", "serviceOffering1", "template1");
-
- assertEquals(
- async,
- AsyncCreateResponse.builder().id("1cce6cb7-2268-47ff-9696-d9e610f6619a")
- .jobId("13330fc9-8b3e-4582-aa3e-90883c041ff0").build());
- }
-
- @Override
- protected VirtualMachineApi clientFrom(CloudStackContext context) {
- return context.getApi().getVirtualMachineApi();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiLiveTest.java
deleted file mode 100644
index 2ca160c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiLiveTest.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.in;
-import static com.google.common.collect.Iterables.find;
-import static com.google.common.collect.Iterables.get;
-import static com.google.common.collect.Iterables.getFirst;
-import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.collect.Sets.filter;
-import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.isDefault;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.logging.Logger;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.GuestIPType;
-import org.jclouds.cloudstack.domain.NIC;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.CreateNetworkOptions;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-import org.jclouds.cloudstack.options.ListNetworkOfferingsOptions;
-import org.jclouds.cloudstack.options.ListNetworksOptions;
-import org.jclouds.cloudstack.options.ListTemplatesOptions;
-import org.jclouds.cloudstack.options.ListVirtualMachinesOptions;
-import org.jclouds.util.InetAddresses2;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Ordering;
-import com.google.common.net.HostAndPort;
-import com.google.common.net.HostSpecifier;
-
-/**
- * Tests behavior of {@code VirtualMachineApiLiveTest}
- */
-@Test(groups = "live", singleThreaded = true, testName = "VirtualMachineApiLiveTest")
-public class VirtualMachineApiLiveTest extends BaseCloudStackApiLiveTest {
- private static final Logger logger = Logger.getAnonymousLogger();
-
- private VirtualMachine vm = null;
-
- static final Ordering<ServiceOffering> DEFAULT_SIZE_ORDERING = new Ordering<ServiceOffering>() {
- public int compare(ServiceOffering left, ServiceOffering right) {
- return ComparisonChain.start().compare(left.getCpuNumber(), right.getCpuNumber())
- .compare(left.getMemory(), right.getMemory()).result();
- }
- };
-
- public static VirtualMachine createVirtualMachine(CloudStackApi client, String defaultTemplate,
- Predicate<String> jobComplete, Predicate<VirtualMachine> virtualMachineRunning) {
- Set<Network> networks = client.getNetworkApi().listNetworks(isDefault(true));
- if (!networks.isEmpty()) {
- Network network = get(filter(networks, new Predicate<Network>() {
- @Override
- public boolean apply(Network network) {
- return network != null && network.getState().equals("Implemented");
- }
- }), 0);
- return createVirtualMachineInNetwork(network,
- defaultTemplateOrPreferredInZone(defaultTemplate, client, network.getZoneId()), client, jobComplete,
- virtualMachineRunning);
- } else {
- String zoneId = find(client.getZoneApi().listZones(), new Predicate<Zone>() {
-
- @Override
- public boolean apply(Zone arg0) {
- return arg0.isSecurityGroupsEnabled();
- }
-
- }).getId();
- return createVirtualMachineWithSecurityGroupInZone(zoneId,
- defaultTemplateOrPreferredInZone(defaultTemplate, client, zoneId),
- get(client.getSecurityGroupApi().listSecurityGroups(), 0).getId(), client, jobComplete,
- virtualMachineRunning);
- }
- }
-
- public static VirtualMachine createVirtualMachineWithSecurityGroupInZone(String zoneId, String templateId, String groupId,
- CloudStackApi client, Predicate<String> jobComplete,
- Predicate<VirtualMachine> virtualMachineRunning) {
- return createVirtualMachineWithOptionsInZone(new DeployVirtualMachineOptions().securityGroupId(groupId), zoneId,
- templateId, client, jobComplete, virtualMachineRunning);
- }
-
- public static VirtualMachine createVirtualMachineInNetwork(Network network, String templateId,
- CloudStackApi client, Predicate<String> jobComplete,
- Predicate<VirtualMachine> virtualMachineRunning) {
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
- String zoneId = network.getZoneId();
- options.networkId(network.getId());
- return createVirtualMachineWithOptionsInZone(options, zoneId, templateId, client, jobComplete,
- virtualMachineRunning);
- }
-
- public static VirtualMachine createVirtualMachineInNetworkWithIp(
- CloudStackApi client, String templateId, Set<Network> networks, Map<String, String> ipToNetwork,
- Predicate<String> jobComplete, Predicate<VirtualMachine> virtualMachineRunning) {
-
- DeployVirtualMachineOptions options = new DeployVirtualMachineOptions();
-
- String zoneId = getFirst(networks, null).getZoneId();
- options.networkIds(Iterables.transform(networks, new Function<Network, String>() {
- @Override
- public String apply(Network network) {
- return network.getId();
- }
- }));
- options.ipsToNetworks(ipToNetwork);
-
- return createVirtualMachineWithOptionsInZone(options, zoneId, templateId,
- client, jobComplete, virtualMachineRunning);
- }
-
- public static VirtualMachine createVirtualMachineWithOptionsInZone(DeployVirtualMachineOptions options, String zoneId,
- String templateId, CloudStackApi client, Predicate<String> jobComplete,
- Predicate<VirtualMachine> virtualMachineRunning) {
- String serviceOfferingId = DEFAULT_SIZE_ORDERING.min(client.getOfferingApi().listServiceOfferings()).getId();
-
- System.out.printf("serviceOfferingId %s, templateId %s, zoneId %s, options %s%n", serviceOfferingId, templateId,
- zoneId, options);
- AsyncCreateResponse job = client.getVirtualMachineApi().deployVirtualMachineInZone(zoneId, serviceOfferingId,
- templateId, options);
- assertTrue(jobComplete.apply(job.getJobId()));
- AsyncJob<VirtualMachine> jobWithResult = client.getAsyncJobApi().<VirtualMachine> getAsyncJob(job.getJobId());
- if (jobWithResult.getError() != null)
- Throwables.propagate(new ExecutionException(String.format("job %s failed with exception %s", job.getId(),
- jobWithResult.getError().toString())) {
- });
- VirtualMachine vm = jobWithResult.getResult();
- if (vm.isPasswordEnabled()) {
- assert vm.getPassword() != null : vm;
- }
- assertTrue(virtualMachineRunning.apply(vm));
- assertEquals(vm.getServiceOfferingId(), serviceOfferingId);
- assertEquals(vm.getTemplateId(), templateId);
- assertEquals(vm.getZoneId(), zoneId);
- return vm;
- }
-
- @Test
- public void testCreateVirtualMachine() throws Exception {
- String defaultTemplate = template != null ? template.getImageId() : null;
- vm = createVirtualMachine(client, defaultTemplate, jobComplete, virtualMachineRunning);
- if (vm.getPassword() != null) {
- conditionallyCheckSSH();
- }
- assert in(ImmutableSet.of("ROOT", "NetworkFilesystem", "IscsiLUN", "VMFS", "PreSetup"))
- .apply(vm.getRootDeviceType()) : vm;
- checkVm(vm);
- }
-
- @Test
- public void testCreateVirtualMachineWithSpecificIp() throws Exception {
- skipIfNotGlobalAdmin();
-
- String defaultTemplate = template != null ? template.getImageId() : null;
- Network network = null;
-
- try {
- Template template = getOnlyElement(
- client.getTemplateApi().listTemplates(ListTemplatesOptions.Builder.id(defaultTemplate)));
- logger.info("Using template: " + template);
-
- Set<Network> allSafeNetworksInZone = adminClient.getNetworkApi().listNetworks(
- ListNetworksOptions.Builder.zoneId(template.getZoneId()).isSystem(false));
- for (Network net : allSafeNetworksInZone) {
- if (net.getName().equals(prefix + "-ip-network")) {
- logger.info("Deleting VMs in network: " + net);
-
- Set<VirtualMachine> machinesInNetwork = adminClient.getVirtualMachineApi().listVirtualMachines(
- ListVirtualMachinesOptions.Builder.networkId(net.getId()));
-
- for (VirtualMachine machine : machinesInNetwork) {
- if (machine.getState().equals(VirtualMachine.State.RUNNING)) {
- logger.info("Deleting VM: " + machine);
- destroyMachine(machine);
- }
- }
-
- assertTrue(adminJobComplete.apply(
- adminClient.getNetworkApi().deleteNetwork(net.getId())), net.toString());
- }
- }
-
- NetworkOffering offering = getFirst(
- client.getOfferingApi().listNetworkOfferings(
- ListNetworkOfferingsOptions.Builder.zoneId(template.getZoneId()).specifyVLAN(true)), null);
- checkNotNull(offering, "No network offering found");
- logger.info("Using network offering: " + offering);
-
- network = adminClient.getNetworkApi().createNetworkInZone(
- template.getZoneId(), offering.getId(), prefix + "-ip-network", "",
- CreateNetworkOptions.Builder.startIP("192.168.0.1").endIP("192.168.0.5")
- .netmask("255.255.255.0").gateway("192.168.0.1").vlan("21"));
- logger.info("Created network: " + network);
-
- Network requiredNetwork = getOnlyElement(filter(adminClient.getNetworkApi().listNetworks(
- ListNetworksOptions.Builder.zoneId(template.getZoneId())), new Predicate<Network>() {
- @Override
- public boolean apply(Network network) {
- return network.isDefault() &&
- network.getGuestIPType() == GuestIPType.VIRTUAL;
- }
- }));
- logger.info("Required network: " + requiredNetwork);
-
- String ipAddress = "192.168.0.4";
-
- Map<String, String> ipsToNetworks = Maps.newHashMap();
- ipsToNetworks.put(ipAddress, network.getId());
-
- vm = createVirtualMachineInNetworkWithIp(
- adminClient, defaultTemplate, ImmutableSet.of(requiredNetwork, network),
- ipsToNetworks, adminJobComplete, adminVirtualMachineRunning);
- logger.info("Created VM: " + vm);
-
- boolean hasStaticIpNic = false;
- for (NIC nic : vm.getNICs()) {
- if (nic.getNetworkId() == network.getId()) {
- hasStaticIpNic = true;
- assertEquals(nic.getIPAddress(), ipAddress);
- }
- }
- assert hasStaticIpNic;
- checkVm(vm);
-
- } finally {
- if (vm != null) {
- destroyMachine(vm);
- vm = null;
- }
- if (network != null) {
- String jobId = adminClient.getNetworkApi().deleteNetwork(network.getId());
- adminJobComplete.apply(jobId);
- network = null;
- }
- }
- }
-
- private void destroyMachine(VirtualMachine virtualMachine) {
- assertTrue(adminJobComplete.apply(
- adminClient.getVirtualMachineApi().destroyVirtualMachine(virtualMachine.getId())), virtualMachine.toString());
- assertTrue(adminVirtualMachineDestroyed.apply(virtualMachine));
- }
-
- private void conditionallyCheckSSH() {
- if (vm.getPassword() != null && !loginCredentials.getOptionalPassword().isPresent())
- loginCredentials = loginCredentials.toBuilder().password(vm.getPassword()).build();
- assert HostSpecifier.isValid(vm.getIPAddress());
- if (!InetAddresses2.isPrivateIPAddress(vm.getIPAddress())) {
- // not sure if the network is public or not, so we have to test
- HostAndPort socket = HostAndPort.fromParts(vm.getIPAddress(), 22);
- System.err.printf("testing socket %s%n", socket);
- System.err.printf("testing ssh %s%n", socket);
- checkSSH(socket);
- } else {
- System.err.printf("skipping ssh %s, as private%n", vm.getIPAddress());
- }
- }
-
- @Test(dependsOnMethods = "testCreateVirtualMachine")
- public void testLifeCycle() throws Exception {
- String job = client.getVirtualMachineApi().stopVirtualMachine(vm.getId());
- assertTrue(jobComplete.apply(job));
- vm = client.getVirtualMachineApi().getVirtualMachine(vm.getId());
- assertEquals(vm.getState(), VirtualMachine.State.STOPPED);
-
- if (vm.isPasswordEnabled()) {
- job = client.getVirtualMachineApi().resetPasswordForVirtualMachine(vm.getId());
- assertTrue(jobComplete.apply(job));
- vm = client.getAsyncJobApi().<VirtualMachine> getAsyncJob(job).getResult();
- if (vm.getPassword() != null) {
- conditionallyCheckSSH();
- }
- }
-
- job = client.getVirtualMachineApi().startVirtualMachine(vm.getId());
- assertTrue(jobComplete.apply(job));
- vm = client.getVirtualMachineApi().getVirtualMachine(vm.getId());
- assertEquals(vm.getState(), VirtualMachine.State.RUNNING);
-
- job = client.getVirtualMachineApi().rebootVirtualMachine(vm.getId());
- assertTrue(jobComplete.apply(job));
- vm = client.getVirtualMachineApi().getVirtualMachine(vm.getId());
- assertEquals(vm.getState(), VirtualMachine.State.RUNNING);
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (vm != null) {
- destroyMachine(vm);
- vm = null;
- }
- super.tearDownContext();
- }
-
- @Test
- public void testListVirtualMachines() throws Exception {
- Set<VirtualMachine> response = client.getVirtualMachineApi().listVirtualMachines();
- assert null != response;
- assertTrue(response.size() >= 0);
- for (VirtualMachine vm : response) {
- VirtualMachine newDetails = getOnlyElement(client.getVirtualMachineApi().listVirtualMachines(
- ListVirtualMachinesOptions.Builder.id(vm.getId())));
- assertEquals(vm.getId(), newDetails.getId());
- checkVm(vm);
- }
- }
-
- protected void checkVm(VirtualMachine vm) {
- assertEquals(vm.getId(), client.getVirtualMachineApi().getVirtualMachine(vm.getId()).getId());
- assert vm.getId() != null : vm;
- assert vm.getName() != null : vm;
- // vm.getDisplayName() can be null, so skip that check.
- assert vm.getAccount() != null : vm;
- assert vm.getDomain() != null : vm;
- assert vm.getDomainId() != null : vm;
- assert vm.getCreated() != null : vm;
- assert vm.getState() != null : vm;
- assert vm.getZoneId() != null : vm;
- assert vm.getZoneName() != null : vm;
- assert vm.getTemplateId() != null : vm;
- assert vm.getTemplateName() != null : vm;
- assert vm.getServiceOfferingId() != null : vm;
- assert vm.getServiceOfferingName() != null : vm;
- assert vm.getCpuCount() > 0 : vm;
- assert vm.getCpuSpeed() > 0 : vm;
- assert vm.getMemory() > 0 : vm;
- assert vm.getGuestOSId() != null : vm;
- assert vm.getRootDeviceId() != null : vm;
- // assert vm.getRootDeviceType() != null : vm;
- if (vm.getJobId() != null)
- assert vm.getJobStatus() != null : vm;
- assert vm.getNICs() != null && !vm.getNICs().isEmpty() : vm;
- for (NIC nic : vm.getNICs()) {
- assert nic.getId() != null : vm;
- assert nic.getNetworkId() != null : vm;
- assert nic.getTrafficType() != null : vm;
- assert nic.getGuestIPType() != null : vm;
- switch (vm.getState()) {
- case RUNNING:
- assert nic.getNetmask() != null : vm;
- assert nic.getGateway() != null : vm;
- assert nic.getIPAddress() != null : vm;
- break;
- case STARTING:
- assert nic.getNetmask() == null : vm;
- assert nic.getGateway() == null : vm;
- assert nic.getIPAddress() == null : vm;
- break;
- default:
- assert nic.getNetmask() != null : vm;
- assert nic.getGateway() != null : vm;
- assert nic.getIPAddress() != null : vm;
- }
-
- }
- assert vm.getSecurityGroups() != null && vm.getSecurityGroups().size() >= 0 : vm;
- assert vm.getHypervisor() != null : vm;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiTest.java
deleted file mode 100644
index c06c08b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.AssignVirtualMachineOptions;
-import org.jclouds.cloudstack.options.ListVirtualMachinesOptions;
-import org.jclouds.cloudstack.options.StopVirtualMachineOptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code VirtualMachineApi}
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "VirtualMachineApiTest")
-public class VirtualMachineApiTest extends BaseCloudStackApiTest<VirtualMachineApi> {
- public void testListVirtualMachines() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "listVirtualMachines",
- ListVirtualMachinesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listVirtualMachines&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testListVirtualMachinesOptions() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "listVirtualMachines",
- ListVirtualMachinesOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(
- ListVirtualMachinesOptions.Builder.accountInDomain("adrian", "6").usesVirtualNetwork(true)));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listVirtualMachines&listAll=true&account=adrian&domainid=6&forvirtualnetwork=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testGetVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "getVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listVirtualMachines&listAll=true&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest,
- Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testRebootVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "rebootVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=rebootVirtualMachine&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testStartVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "startVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=startVirtualMachine&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testStopVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "stopVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("5"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=stopVirtualMachine&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testStopVirtualMachineForced() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "stopVirtualMachine", String.class,
- StopVirtualMachineOptions.class);
-
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("5",
- StopVirtualMachineOptions.Builder.forced(true)));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=stopVirtualMachine&id=5&forced=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testResetPasswordForVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "resetPasswordForVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=resetPasswordForVirtualMachine&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testChangeServiceForVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "changeServiceForVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=changeServiceForVirtualMachine&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testUpdateVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "updateVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateVirtualMachine&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testDestroyVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "destroyVirtualMachine", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=destroyVirtualMachine&id=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
-
- }
-
- public void testAssignVirtualMachine() throws SecurityException, NoSuchMethodException, IOException {
- Invokable<?, ?> method = method(VirtualMachineApi.class, "assignVirtualMachine", String.class,
- AssignVirtualMachineOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("abcd",
- AssignVirtualMachineOptions.Builder.accountInDomain("adrian", "6")));
-
- assertRequestLineEquals(
- httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=assignVirtualMachine&virtualmachineid=abcd&account=adrian&domainid=6 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
-
- }
-}
[45/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
deleted file mode 100644
index ceb0f84..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Representation of the API configuration entry response
- */
-public class ConfigurationEntry implements Comparable<ConfigurationEntry> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromConfigurationEntry(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String category;
- protected String description;
- protected String name;
- protected String value;
-
- /**
- * @see ConfigurationEntry#getCategory()
- */
- public T category(String category) {
- this.category = category;
- return self();
- }
-
- /**
- * @see ConfigurationEntry#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see ConfigurationEntry#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see ConfigurationEntry#getValue()
- */
- public T value(String value) {
- this.value = value;
- return self();
- }
-
- public ConfigurationEntry build() {
- return new ConfigurationEntry(category, description, name, value);
- }
-
- public T fromConfigurationEntry(ConfigurationEntry in) {
- return this
- .category(in.getCategory())
- .description(in.getDescription())
- .name(in.getName())
- .value(in.getValue());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String category;
- private final String description;
- private final String name;
- private final String value;
-
- @ConstructorProperties({
- "category", "description", "name", "value"
- })
- protected ConfigurationEntry(@Nullable String category, @Nullable String description, String name, @Nullable String value) {
- this.category = category;
- this.description = description;
- this.name = checkNotNull(name, "name");
- this.value = value;
- }
-
- @Nullable
- public String getCategory() {
- return this.category;
- }
-
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- public String getName() {
- return this.name;
- }
-
- @Nullable
- public String getValue() {
- return this.value;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(category, description, name, value);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ConfigurationEntry that = ConfigurationEntry.class.cast(obj);
- return Objects.equal(this.category, that.category)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.value, that.value);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("category", category).add("description", description).add("name", name).add("value", value);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(ConfigurationEntry other) {
- return name.compareTo(other.getName());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
deleted file mode 100644
index 9f9377f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class DiskOffering
- */
-public class DiskOffering implements Comparable<DiskOffering> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromDiskOffering(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String name;
- protected String displayText;
- protected Date created;
- protected String domain;
- protected String domainId;
- protected int diskSize;
- protected boolean customized;
- protected ImmutableSet.Builder<String> tags = ImmutableSet.<String>builder();
-
- /**
- * @see DiskOffering#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see DiskOffering#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see DiskOffering#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see DiskOffering#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see DiskOffering#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see DiskOffering#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see DiskOffering#getDiskSize()
- */
- public T diskSize(int diskSize) {
- this.diskSize = diskSize;
- return self();
- }
-
- /**
- * @see DiskOffering#isCustomized()
- */
- public T customized(boolean customized) {
- this.customized = customized;
- return self();
- }
-
- /**
- * @see DiskOffering#getTags()
- */
- public T tags(Iterable<String> tags) {
- this.tags = ImmutableSet.<String>builder().addAll(tags);
- return self();
- }
-
- /**
- * @see DiskOffering#getTags()
- */
- public T tag(String tag) {
- this.tags.add(tag);
- return self();
- }
-
- public DiskOffering build() {
- return new DiskOffering(id, name, displayText, created, domain, domainId, diskSize, customized, tags.build());
- }
-
- public T fromDiskOffering(DiskOffering in) {
- return this
- .id(in.getId())
- .name(in.getName())
- .displayText(in.getDisplayText())
- .created(in.getCreated())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .diskSize(in.getDiskSize())
- .customized(in.isCustomized())
- .tags(in.getTags());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String name;
- private final String displayText;
- private final Date created;
- private final String domain;
- private final String domainId;
- private final int diskSize;
- private final boolean customized;
- private final Set<String> tags;
-
- @ConstructorProperties({
- "id", "name", "displaytext", "created", "domain", "domainid", "disksize", "iscustomized", "tags"
- })
- protected DiskOffering(String id, @Nullable String name, @Nullable String displayText, @Nullable Date created,
- @Nullable String domain, @Nullable String domainId, int diskSize, boolean customized,
- @Nullable Iterable<String> tags) {
- this.id = checkNotNull(id, "id");
- this.name = name;
- this.displayText = displayText;
- this.created = created;
- this.domain = domain;
- this.domainId = domainId;
- this.diskSize = diskSize;
- this.customized = customized;
- this.tags = tags != null ? ImmutableSet.copyOf(tags) : ImmutableSet.<String> of();
- }
-
- /**
- * @return the id of the disk offering
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the name of the disk offering
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return an alternate display text of the disk offering.
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- /**
- * @return the date this disk offering was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return Domain name for the offering
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain id of the disk offering
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the size of the disk offering in GB
- */
- public int getDiskSize() {
- return this.diskSize;
- }
-
- /**
- * @return the ha support in the disk offering
- */
- public boolean isCustomized() {
- return this.customized;
- }
-
- /**
- * @return the tags for the disk offering
- */
- public Set<String> getTags() {
- return this.tags;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name, displayText, created, domain, domainId, diskSize, customized, tags);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- DiskOffering that = DiskOffering.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.diskSize, that.diskSize)
- && Objects.equal(this.customized, that.customized)
- && Objects.equal(this.tags, that.tags);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
- .add("domainId", domainId).add("diskSize", diskSize).add("customized", customized).add("tags", tags);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(DiskOffering other) {
- return id.compareTo(other.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Domain.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Domain.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Domain.java
deleted file mode 100644
index 29f0fd4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Domain.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Representation of the API domain response
- */
-public class Domain implements Comparable<Domain> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromDomain(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected boolean hasChild;
- protected long level;
- protected String name;
- protected String networkDomain;
- protected String parentDomainId;
- protected String parentDomainName;
-
- /**
- * @see Domain#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Domain#hasChild()
- */
- public T hasChild(boolean hasChild) {
- this.hasChild = hasChild;
- return self();
- }
-
- /**
- * @see Domain#getLevel()
- */
- public T level(long level) {
- this.level = level;
- return self();
- }
-
- /**
- * @see Domain#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Domain#getNetworkDomain()
- */
- public T networkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- return self();
- }
-
- /**
- * @see Domain#getParentDomainId()
- */
- public T parentDomainId(String parentDomainId) {
- this.parentDomainId = parentDomainId;
- return self();
- }
-
- /**
- * @see Domain#getParentDomainName()
- */
- public T parentDomainName(String parentDomainName) {
- this.parentDomainName = parentDomainName;
- return self();
- }
-
- public Domain build() {
- return new Domain(id, hasChild, level, name, networkDomain, parentDomainId, parentDomainName);
- }
-
- public T fromDomain(Domain in) {
- return this
- .id(in.getId())
- .hasChild(in.hasChild())
- .level(in.getLevel())
- .name(in.getName())
- .networkDomain(in.getNetworkDomain())
- .parentDomainId(in.getParentDomainId())
- .parentDomainName(in.getParentDomainName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final boolean hasChild;
- private final long level;
- private final String name;
- private final String networkDomain;
- private final String parentDomainId;
- private final String parentDomainName;
-
- @ConstructorProperties({
- "id", "haschild", "level", "name", "networkdomain", "parentdomainid", "parentdomainname"
- })
- protected Domain(String id, boolean hasChild, long level, @Nullable String name, @Nullable String networkDomain,
- @Nullable String parentDomainId, @Nullable String parentDomainName) {
- this.id = checkNotNull(id, "id");
- this.hasChild = hasChild;
- this.level = level;
- this.name = name;
- this.networkDomain = networkDomain;
- this.parentDomainId = parentDomainId;
- this.parentDomainName = parentDomainName;
- }
-
- public String getId() {
- return this.id;
- }
-
- public boolean hasChild() {
- return this.hasChild;
- }
-
- public long getLevel() {
- return this.level;
- }
-
- @Nullable
- public String getName() {
- return this.name;
- }
-
- @Nullable
- public String getNetworkDomain() {
- return this.networkDomain;
- }
-
- @Nullable
- public String getParentDomainId() {
- return this.parentDomainId;
- }
-
- @Nullable
- public String getParentDomainName() {
- return this.parentDomainName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, hasChild, level, name, networkDomain, parentDomainId, parentDomainName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Domain that = Domain.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.hasChild, that.hasChild)
- && Objects.equal(this.level, that.level)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.networkDomain, that.networkDomain)
- && Objects.equal(this.parentDomainId, that.parentDomainId)
- && Objects.equal(this.parentDomainName, that.parentDomainName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("hasChild", hasChild).add("level", level).add("name", name).add("networkDomain", networkDomain).add("parentDomainId", parentDomainId).add("parentDomainName", parentDomainName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Domain other) {
- return id.compareTo(other.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
deleted file mode 100644
index bb81cd1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-public final class EncryptedPasswordAndPrivateKey {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return builder().fromEncryptedPasswordAndPrivateKey(this);
- }
-
- public static final class Builder {
-
- protected String encryptedPassword;
- protected String privateKey;
-
- /**
- * @see EncryptedPasswordAndPrivateKey#getEncryptedPassword()
- */
- public Builder encryptedPassword(String encryptedPassword) {
- this.encryptedPassword = encryptedPassword;
- return this;
- }
-
- /**
- * @see EncryptedPasswordAndPrivateKey#getPrivateKey()
- */
- public Builder privateKey(String privateKey) {
- this.privateKey = privateKey;
- return this;
- }
-
- public EncryptedPasswordAndPrivateKey build() {
- return new EncryptedPasswordAndPrivateKey(encryptedPassword, privateKey);
- }
-
- public Builder fromEncryptedPasswordAndPrivateKey(EncryptedPasswordAndPrivateKey in) {
- return encryptedPassword(in.getEncryptedPassword())
- .privateKey(in.getPrivateKey());
- }
- }
-
- private final String encryptedPassword;
- private final String privateKey;
-
- @ConstructorProperties({
- "encryptedPassword", "privateKey"
- })
- public EncryptedPasswordAndPrivateKey(@Nullable String encryptedPassword, @Nullable String privateKey) {
- this.encryptedPassword = encryptedPassword;
- this.privateKey = privateKey;
- }
-
- /**
- * @return the encrypted password String representation
- */
- @Nullable
- public String getEncryptedPassword() {
- return this.encryptedPassword;
- }
-
- /**
- * @return get the string representation of the private key
- */
- @Nullable
- public String getPrivateKey() {
- return this.privateKey;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(encryptedPassword, privateKey);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- EncryptedPasswordAndPrivateKey that = EncryptedPasswordAndPrivateKey.class.cast(obj);
- return Objects.equal(this.encryptedPassword, that.encryptedPassword)
- && Objects.equal(this.privateKey, that.privateKey);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
- .add("encryptedPassword", encryptedPassword).add("privateKey", privateKey).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Event.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Event.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Event.java
deleted file mode 100644
index 87c442b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Event.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class Event
- */
-public class Event implements Comparable<Event> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromEvent(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected String description;
- protected Date created;
- protected String domain;
- protected String domainId;
- protected String level;
- protected String parentId;
- protected String state;
- protected String type;
- protected String username;
-
- /**
- * @see Event#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Event#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see Event#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see Event#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see Event#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see Event#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see Event#getLevel()
- */
- public T level(String level) {
- this.level = level;
- return self();
- }
-
- /**
- * @see Event#getParentId()
- */
- public T parentId(String parentId) {
- this.parentId = parentId;
- return self();
- }
-
- /**
- * @see Event#getState()
- */
- public T state(String state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see Event#getType()
- */
- public T type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Event#getUsername()
- */
- public T username(String username) {
- this.username = username;
- return self();
- }
-
- public Event build() {
- return new Event(id, account, description, created, domain, domainId, level, parentId, state, type, username);
- }
-
- public T fromEvent(Event in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .description(in.getDescription())
- .created(in.getCreated())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .level(in.getLevel())
- .parentId(in.getParentId())
- .state(in.getState())
- .type(in.getType())
- .username(in.getUsername());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final String description;
- private final Date created;
- private final String domain;
- private final String domainId;
- private final String level;
- private final String parentId;
- private final String state;
- private final String type;
- private final String username;
-
- @ConstructorProperties({
- "id", "account", "description", "created", "domain", "domainId", "level", "parentId", "state", "type", "username"
- })
- protected Event(String id, @Nullable String account, @Nullable String description, @Nullable Date created,
- @Nullable String domain, @Nullable String domainId, @Nullable String level, @Nullable String parentId,
- @Nullable String state, @Nullable String type, @Nullable String username) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.description = description;
- this.created = created;
- this.domain = domain;
- this.domainId = domainId;
- this.level = level;
- this.parentId = parentId;
- this.state = state;
- this.type = type;
- this.username = username;
- }
-
- /**
- * @return the ID of the event
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account name for the account that owns the object being acted on in the event
- * (e.g. the owner of the virtual machine, ip address, or security group)
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the description of the event
- */
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- /**
- * @return the date the event was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the name of the account's domain
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the id of the account's domain
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the event level (INFO, WARN, ERROR)
- */
- @Nullable
- public String getLevel() {
- return this.level;
- }
-
- /**
- * @return whether the event is parented
- */
- @Nullable
- public String getParentId() {
- return this.parentId;
- }
-
- /**
- * @return the state of the event
- */
- @Nullable
- public String getState() {
- return this.state;
- }
-
- /**
- * @return the type of the event (see event types)
- */
- @Nullable
- public String getType() {
- return this.type;
- }
-
- /**
- * @return the name of the user who performed the action (can be different from the account if
- * an admin is performing an action for a user, e.g. starting/stopping a user's virtual machine)
- */
- @Nullable
- public String getUsername() {
- return this.username;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, description, created, domain, domainId, level, parentId, state, type, username);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Event that = Event.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.level, that.level)
- && Objects.equal(this.parentId, that.parentId)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.username, that.username);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("description", description).add("created", created)
- .add("domain", domain).add("domainId", domainId).add("level", level).add("parentId", parentId)
- .add("state", state).add("type", type).add("username", username);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Event other) {
- return id.compareTo(other.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java
deleted file mode 100644
index 79517c4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public enum ExtractMode {
-
- HTTP_DOWNLOAD, FTP_UPLOAD, UNRECOGNIZED;
-
- public static ExtractMode fromValue(String format) {
- try {
- return valueOf(checkNotNull(format, "format"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
deleted file mode 100644
index 37e79e2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class FirewallRule
- */
-public class FirewallRule implements Comparable<FirewallRule> {
-
- /**
- */
- public static enum Protocol {
- TCP,
- UDP,
- ICMP,
- UNKNOWN;
-
- public static Protocol fromValue(String value) {
- try {
- return valueOf(value.toUpperCase());
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return name().toUpperCase();
- }
- }
-
- public static enum State {
- STAGED, // Rule been created but has never got through network rule conflict detection.
- // Rules in this state can not be sent to network elements.
- ADD, // Add means the rule has been created and has gone through network rule conflict detection.
- ACTIVE, // Rule has been sent to the network elements and reported to be active.
- DELETING, // Revoke means this rule has been revoked. If this rule has been sent to the
- // network elements, the rule will be deleted from database.
- UNKNOWN;
-
- public static State fromValue(String value) {
- try {
- return valueOf(value.toUpperCase());
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromFirewallRule(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected Set<String> CIDRs = ImmutableSet.of();
- protected int startPort;
- protected int endPort;
- protected String icmpCode;
- protected String icmpType;
- protected String ipAddress;
- protected String ipAddressId;
- protected FirewallRule.Protocol protocol;
- protected FirewallRule.State state;
-
- /**
- * @see FirewallRule#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see FirewallRule#getCIDRs()
- */
- public T CIDRs(Set<String> CIDRs) {
- this.CIDRs = ImmutableSet.copyOf(checkNotNull(CIDRs, "CIDRs"));
- return self();
- }
-
- public T CIDRs(String... in) {
- return CIDRs(ImmutableSet.copyOf(in));
- }
-
- /**
- * @see FirewallRule#getStartPort()
- */
- public T startPort(int startPort) {
- this.startPort = startPort;
- return self();
- }
-
- /**
- * @see FirewallRule#getEndPort()
- */
- public T endPort(int endPort) {
- this.endPort = endPort;
- return self();
- }
-
- /**
- * @see FirewallRule#getIcmpCode()
- */
- public T icmpCode(String icmpCode) {
- this.icmpCode = icmpCode;
- return self();
- }
-
- /**
- * @see FirewallRule#getIcmpType()
- */
- public T icmpType(String icmpType) {
- this.icmpType = icmpType;
- return self();
- }
-
- /**
- * @see FirewallRule#getIpAddress()
- */
- public T ipAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- return self();
- }
-
- /**
- * @see FirewallRule#getIpAddressId()
- */
- public T ipAddressId(String ipAddressId) {
- this.ipAddressId = ipAddressId;
- return self();
- }
-
- /**
- * @see FirewallRule#getProtocol()
- */
- public T protocol(FirewallRule.Protocol protocol) {
- this.protocol = protocol;
- return self();
- }
-
- /**
- * @see FirewallRule#getState()
- */
- public T state(FirewallRule.State state) {
- this.state = state;
- return self();
- }
-
- public FirewallRule build() {
- return new FirewallRule(id, CIDRs, startPort, endPort, icmpCode, icmpType, ipAddress, ipAddressId, protocol, state);
- }
-
- public T fromFirewallRule(FirewallRule in) {
- return this
- .id(in.getId())
- .CIDRs(in.getCIDRs())
- .startPort(in.getStartPort())
- .endPort(in.getEndPort())
- .icmpCode(in.getIcmpCode())
- .icmpType(in.getIcmpType())
- .ipAddress(in.getIpAddress())
- .ipAddressId(in.getIpAddressId())
- .protocol(in.getProtocol())
- .state(in.getState());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final Set<String> CIDRs;
- private final int startPort;
- private final int endPort;
- private final String icmpCode;
- private final String icmpType;
- private final String ipAddress;
- private final String ipAddressId;
- private final FirewallRule.Protocol protocol;
- private final FirewallRule.State state;
-
- @ConstructorProperties({
- "id", "cidrlist", "startport", "endport", "icmpcode", "icmptype", "ipaddress", "ipaddressid", "protocol", "state"
- })
- private FirewallRule(String id, @Nullable String CIDRs, int startPort, int endPort, @Nullable String icmpCode,
- @Nullable String icmpType, @Nullable String ipAddress, @Nullable String ipAddressId,
- @Nullable Protocol protocol, @Nullable State state) {
- this(id, splitStringOnCommas(CIDRs), startPort, endPort, icmpCode, icmpType, ipAddress, ipAddressId, protocol, state);
- }
-
- private static Set<String> splitStringOnCommas(String in) {
- return in == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(in.split(","));
- }
-
-
- protected FirewallRule(String id, @Nullable Iterable<String> CIDRs, int startPort, int endPort, @Nullable String icmpCode,
- @Nullable String icmpType, @Nullable String ipAddress, @Nullable String ipAddressId,
- @Nullable FirewallRule.Protocol protocol, @Nullable FirewallRule.State state) {
- this.id = checkNotNull(id, "id");
- this.CIDRs = CIDRs == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(CIDRs);
- this.startPort = startPort;
- this.endPort = endPort;
- this.icmpCode = icmpCode;
- this.icmpType = icmpType;
- this.ipAddress = ipAddress;
- this.ipAddressId = ipAddressId;
- this.protocol = protocol;
- this.state = state;
- }
-
- public String getId() {
- return this.id;
- }
-
- public Set<String> getCIDRs() {
- return this.CIDRs;
- }
-
- public int getStartPort() {
- return this.startPort;
- }
-
- public int getEndPort() {
- return this.endPort;
- }
-
- @Nullable
- public String getIcmpCode() {
- return this.icmpCode;
- }
-
- @Nullable
- public String getIcmpType() {
- return this.icmpType;
- }
-
- @Nullable
- public String getIpAddress() {
- return this.ipAddress;
- }
-
- @Nullable
- public String getIpAddressId() {
- return this.ipAddressId;
- }
-
- @Nullable
- public FirewallRule.Protocol getProtocol() {
- return this.protocol;
- }
-
- @Nullable
- public FirewallRule.State getState() {
- return this.state;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, CIDRs, startPort, endPort, icmpCode, icmpType, ipAddress, ipAddressId, protocol, state);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- FirewallRule that = FirewallRule.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.CIDRs, that.CIDRs)
- && Objects.equal(this.startPort, that.startPort)
- && Objects.equal(this.endPort, that.endPort)
- && Objects.equal(this.icmpCode, that.icmpCode)
- && Objects.equal(this.icmpType, that.icmpType)
- && Objects.equal(this.ipAddress, that.ipAddress)
- && Objects.equal(this.ipAddressId, that.ipAddressId)
- && Objects.equal(this.protocol, that.protocol)
- && Objects.equal(this.state, that.state);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("CIDRs", CIDRs).add("startPort", startPort).add("endPort", endPort).add("icmpCode", icmpCode)
- .add("icmpType", icmpType).add("ipAddress", ipAddress).add("ipAddressId", ipAddressId).add("protocol", protocol).add("state", state);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(FirewallRule other) {
- return id.compareTo(other.getId());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
deleted file mode 100644
index 27e43ec..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * @see org.jclouds.cloudstack.features.OfferingApi#listNetworkOfferings
- */
-public enum GuestIPType {
-
- /**
- * guest IP address will be issued by Dhcp server in the guest virtual
- * network. Dhcp role is played by domain router.
- */
- VIRTUAL,
-
- /**
- * traffic directly to the network and VMs created here are assigned an IP
- * directly from the network as configured
- */
- DIRECT,
-
- /**
- * TODO: add comments to explain the meaning (cs3 only)
- */
- SHARED,
- ISOLATED,
-
- UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static GuestIPType fromValue(String type) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Host.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Host.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Host.java
deleted file mode 100644
index d80982b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Host.java
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.CaseFormat.UPPER_CAMEL;
-import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Represents a host issued by Cloudstack
- */
-public class Host implements Comparable<Host> {
-
- public static enum ClusterType {
- CLOUD_MANAGED,
- EXTERNAL_MANAGED,
- UNKNOWN;
-
- public static ClusterType fromValue(String value) {
- try {
- return valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, value));
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
- }
- }
-
- public static enum State {
- CONNECTING,
- UP,
- DOWN,
- DISCONNECTED,
- UPDATING,
- PREPARE_FOR_MAINTENANCE,
- ERROR_IN_MAINTENANCE,
- MAINTENANCE,
- ALERT,
- REMOVED,
- REBALANCING,
- UNKNOWN;
-
- public static State fromValue(String value) {
- try {
- return valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, value));
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
- }
- }
-
- public static enum Type {
- STORAGE,
- ROUTING,
- SECONDARY_STORAGE,
- SECONDARY_STORAGE_CMD_EXECUTOR,
- CONSOLE_PROXY,
- EXTERNAL_FIREWALL,
- EXTERNAL_LOAD_BALANCER,
- PXE_SERVER,
- TRAFFIC_MONITOR,
- EXTERNAL_DHCP,
- SECONDARY_STORAGE_VM,
- LOCAL_SECONDARY_STORAGE,
- UNKNOWN;
-
- public static Type fromValue(String value) {
- try {
- if (value.equals("SecondaryStorageVM")) {
- return SECONDARY_STORAGE_VM;
- }
- return valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, value));
-
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- if (this == SECONDARY_STORAGE_VM) {
- return "SecondaryStorageVM"; // note the inconsistency in VM naming
- }
- return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromHost(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected AllocationState allocationState;
- protected int averageLoad;
- protected String capabilities;
- protected String clusterId;
- protected String clusterName;
- protected Host.ClusterType clusterType;
- protected String cpuAllocated;
- protected int cpuNumber;
- protected int cpuSpeed;
- protected String cpuUsed;
- protected float cpuWithOverProvisioning;
- protected Date created;
- protected Date disconnected;
- protected long diskSizeAllocated;
- protected long diskSizeTotal;
- protected String events;
- protected boolean hasEnoughCapacity;
- protected ImmutableSet.Builder<String> tags = ImmutableSet.<String>builder();
- protected String hypervisor;
- protected String ipAddress;
- protected boolean localStorageActive;
- protected String jobId;
- protected AsyncJob.Status jobStatus;
- protected Date lastPinged;
- protected String managementServerId;
- protected long memoryAllocated;
- protected long memoryTotal;
- protected long memoryUsed;
- protected String name;
- protected long networkKbsRead;
- protected long networkKbsWrite;
- protected String osCategoryId;
- protected String osCategoryName;
- protected String podId;
- protected String podName;
- protected Date removed;
- protected Host.State state;
- protected Host.Type type;
- protected String version;
- protected String zoneId;
- protected String zoneName;
-
- /**
- * @see Host#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Host#getAllocationState()
- */
- public T allocationState(AllocationState allocationState) {
- this.allocationState = allocationState;
- return self();
- }
-
- /**
- * @see Host#getAverageLoad()
- */
- public T averageLoad(int averageLoad) {
- this.averageLoad = averageLoad;
- return self();
- }
-
- /**
- * @see Host#getCapabilities()
- */
- public T capabilities(String capabilities) {
- this.capabilities = capabilities;
- return self();
- }
-
- /**
- * @see Host#getClusterId()
- */
- public T clusterId(String clusterId) {
- this.clusterId = clusterId;
- return self();
- }
-
- /**
- * @see Host#getClusterName()
- */
- public T clusterName(String clusterName) {
- this.clusterName = clusterName;
- return self();
- }
-
- /**
- * @see Host#getClusterType()
- */
- public T clusterType(Host.ClusterType clusterType) {
- this.clusterType = clusterType;
- return self();
- }
-
- /**
- * @see Host#getCpuAllocated()
- */
- public T cpuAllocated(String cpuAllocated) {
- this.cpuAllocated = cpuAllocated;
- return self();
- }
-
- /**
- * @see Host#getCpuNumber()
- */
- public T cpuNumber(int cpuNumber) {
- this.cpuNumber = cpuNumber;
- return self();
- }
-
- /**
- * @see Host#getCpuSpeed()
- */
- public T cpuSpeed(int cpuSpeed) {
- this.cpuSpeed = cpuSpeed;
- return self();
- }
-
- /**
- * @see Host#getCpuUsed()
- */
- public T cpuUsed(String cpuUsed) {
- this.cpuUsed = cpuUsed;
- return self();
- }
-
- /**
- * @see Host#getCpuWithOverProvisioning()
- */
- public T cpuWithOverProvisioning(float cpuWithOverProvisioning) {
- this.cpuWithOverProvisioning = cpuWithOverProvisioning;
- return self();
- }
-
- /**
- * @see Host#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see Host#getDisconnected()
- */
- public T disconnected(Date disconnected) {
- this.disconnected = disconnected;
- return self();
- }
-
- /**
- * @see Host#getDiskSizeAllocated()
- */
- public T diskSizeAllocated(long diskSizeAllocated) {
- this.diskSizeAllocated = diskSizeAllocated;
- return self();
- }
-
- /**
- * @see Host#getDiskSizeTotal()
- */
- public T diskSizeTotal(long diskSizeTotal) {
- this.diskSizeTotal = diskSizeTotal;
- return self();
- }
-
- /**
- * @see Host#getEvents()
- */
- public T events(String events) {
- this.events = events;
- return self();
- }
-
- /**
- * @see Host#isHasEnoughCapacity()
- */
- public T hasEnoughCapacity(boolean hasEnoughCapacity) {
- this.hasEnoughCapacity = hasEnoughCapacity;
- return self();
- }
-
- /**
- * @see Host#getTags()
- */
- public T tags(Iterable<String> tags) {
- this.tags = ImmutableSet.<String>builder().addAll(tags);
- return self();
- }
-
- /**
- * @see Host#getTags()
- */
- public T tag(String tag) {
- this.tags.add(tag);
- return self();
- }
-
- /**
- * @see Host#getHypervisor()
- */
- public T hypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- return self();
- }
-
- /**
- * @see Host#getIpAddress()
- */
- public T ipAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- return self();
- }
-
- /**
- * @see Host#isLocalStorageActive()
- */
- public T localStorageActive(boolean localStorageActive) {
- this.localStorageActive = localStorageActive;
- return self();
- }
-
- /**
- * @see Host#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see Host#getJobStatus()
- */
- public T jobStatus(AsyncJob.Status jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- /**
- * @see Host#getLastPinged()
- */
- public T lastPinged(Date lastPinged) {
- this.lastPinged = lastPinged;
- return self();
- }
-
- /**
- * @see Host#getManagementServerId()
- */
- public T managementServerId(String managementServerId) {
- this.managementServerId = managementServerId;
- return self();
- }
-
- /**
- * @see Host#getMemoryAllocated()
- */
- public T memoryAllocated(long memoryAllocated) {
- this.memoryAllocated = memoryAllocated;
- return self();
- }
-
- /**
- * @see Host#getMemoryTotal()
- */
- public T memoryTotal(long memoryTotal) {
- this.memoryTotal = memoryTotal;
- return self();
- }
-
- /**
- * @see Host#getMemoryUsed()
- */
- public T memoryUsed(long memoryUsed) {
- this.memoryUsed = memoryUsed;
- return self();
- }
-
- /**
- * @see Host#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Host#getNetworkKbsRead()
- */
- public T networkKbsRead(long networkKbsRead) {
- this.networkKbsRead = networkKbsRead;
- return self();
- }
-
- /**
- * @see Host#getNetworkKbsWrite()
- */
- public T networkKbsWrite(long networkKbsWrite) {
- this.networkKbsWrite = networkKbsWrite;
- return self();
- }
-
- /**
- * @see Host#getOsCategoryId()
- */
- public T osCategoryId(String osCategoryId) {
- this.osCategoryId = osCategoryId;
- return self();
- }
-
- /**
- * @see Host#getOsCategoryName()
- */
- public T osCategoryName(String osCategoryName) {
- this.osCategoryName = osCategoryName;
- return self();
- }
-
- /**
- * @see Host#getPodId()
- */
- public T podId(String podId) {
- this.podId = podId;
- return self();
- }
-
- /**
- * @see Host#getPodName()
- */
- public T podName(String podName) {
- this.podName = podName;
- return self();
- }
-
- /**
- * @see Host#getRemoved()
- */
- public T removed(Date removed) {
- this.removed = removed;
- return self();
- }
-
- /**
- * @see Host#getState()
- */
- public T state(Host.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see Host#getType()
- */
- public T type(Host.Type type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Host#getVersion()
- */
- public T version(String version) {
- this.version = version;
- return self();
- }
-
- /**
- * @see Host#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see Host#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
-
- public Host build() {
- return new Host(id, allocationState, averageLoad, capabilities, clusterId, clusterName, clusterType, cpuAllocated, cpuNumber, cpuSpeed, cpuUsed, cpuWithOverProvisioning, created, disconnected, diskSizeAllocated, diskSizeTotal, events, hasEnoughCapacity, tags.build(), hypervisor, ipAddress, localStorageActive, jobId, jobStatus, lastPinged, managementServerId, memoryAllocated, memoryTotal, memoryUsed, name, networkKbsRead, networkKbsWrite, osCategoryId, osCategoryName, podId, podName, removed, state, type, version, zoneId, zoneName);
- }
-
- public T fromHost(Host in) {
- return this
- .id(in.getId())
- .allocationState(in.getAllocationState())
- .averageLoad(in.getAverageLoad())
- .capabilities(in.getCapabilities())
- .clusterId(in.getClusterId())
- .clusterName(in.getClusterName())
- .clusterType(in.getClusterType())
- .cpuAllocated(in.getCpuAllocated())
- .cpuNumber(in.getCpuNumber())
- .cpuSpeed(in.getCpuSpeed())
- .cpuUsed(in.getCpuUsed())
- .cpuWithOverProvisioning(in.getCpuWithOverProvisioning())
- .created(in.getCreated())
- .disconnected(in.getDisconnected())
- .diskSizeAllocated(in.getDiskSizeAllocated())
- .diskSizeTotal(in.getDiskSizeTotal())
- .events(in.getEvents())
- .hasEnoughCapacity(in.isHasEnoughCapacity())
- .tags(in.getTags())
- .hypervisor(in.getHypervisor())
- .ipAddress(in.getIpAddress())
- .localStorageActive(in.isLocalStorageActive())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus())
- .lastPinged(in.getLastPinged())
- .managementServerId(in.getManagementServerId())
- .memoryAllocated(in.getMemoryAllocated())
- .memoryTotal(in.getMemoryTotal())
- .memoryUsed(in.getMemoryUsed())
- .name(in.getName())
- .networkKbsRead(in.getNetworkKbsRead())
- .networkKbsWrite(in.getNetworkKbsWrite())
- .osCategoryId(in.getOsCategoryId())
- .osCategoryName(in.getOsCategoryName())
- .podId(in.getPodId())
- .podName(in.getPodName())
- .removed(in.getRemoved())
- .state(in.getState())
- .type(in.getType())
- .version(in.getVersion())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final AllocationState allocationState;
- private final int averageLoad;
- private final String capabilities;
- private final String clusterId;
- private final String clusterName;
- private final Host.ClusterType clusterType;
- private final String cpuAllocated;
- private final int cpuNumber;
- private final int cpuSpeed;
- private final String cpuUsed;
- private final float cpuWithOverProvisioning;
- private final Date created;
- private final Date disconnected;
- private final long diskSizeAllocated;
- private final long diskSizeTotal;
- private final String events;
- private final boolean hasEnoughCapacity;
- private final Set<String> tags;
- private final String hypervisor;
- private final String ipAddress;
- private final boolean localStorageActive;
- private final String jobId;
- private final AsyncJob.Status jobStatus;
- private final Date lastPinged;
- private final String managementServerId;
- private final long memoryAllocated;
- private final long memoryTotal;
- private final long memoryUsed;
- private final String name;
- private final long networkKbsRead;
- private final long networkKbsWrite;
- private final String osCategoryId;
- private final String osCategoryName;
- private final String podId;
- private final String podName;
- private final Date removed;
- private final Host.State state;
- private final Host.Type type;
- private final String version;
- private final String zoneId;
- private final String zoneName;
-
- @ConstructorProperties({
- "id", "allocationstate", "averageload", "capabilities", "clusterid", "clustername", "clustertype", "cpuallocated", "cpunumber", "cpuspeed", "cpuused", "cpuwithoverprovisioning", "created", "disconnected", "disksizeallocated", "disksizetotal", "events", "hasenoughcapacity", "hosttags", "hypervisor", "ipaddress", "islocalstorageactive", "jobid", "jobstatus", "lastpinged", "managementserverid", "memoryallocated", "memorytotal", "memoryused", "name", "networkkbsread", "networkkbswrite", "oscategoryid", "oscategoryname", "podid", "podname", "removed", "state", "type", "version", "zoneid", "zonename"
- })
- protected Host(String id, @Nullable AllocationState allocationState, int averageLoad, @Nullable String capabilities,
- @Nullable String clusterId, @Nullable String clusterName, @Nullable Host.ClusterType clusterType,
- @Nullable String cpuAllocated, int cpuNumber, int cpuSpeed, @Nullable String cpuUsed,
- float cpuWithOverProvisioning, @Nullable Date created, @Nullable Date disconnected, long diskSizeAllocated,
- long diskSizeTotal, @Nullable String events, boolean hasEnoughCapacity, @Nullable Iterable<String> tags,
- @Nullable String hypervisor, @Nullable String ipAddress, boolean localStorageActive, @Nullable String jobId,
- @Nullable AsyncJob.Status jobStatus, @Nullable Date lastPinged, @Nullable String managementServerId,
- long memoryAllocated, long memoryTotal, long memoryUsed, @Nullable String name, long networkKbsRead, long networkKbsWrite,
- @Nullable String osCategoryId, @Nullable String osCategoryName, @Nullable String podId, @Nullable String podName,
- @Nullable Date removed, @Nullable Host.State state, @Nullable Host.Type type, @Nullable String version, @Nullable String zoneId,
- @Nullable String zoneName) {
- this.id = checkNotNull(id, "id");
- this.allocationState = allocationState;
- this.averageLoad = averageLoad;
- this.capabilities = capabilities;
- this.clusterId = clusterId;
- this.clusterName = clusterName;
- this.clusterType = clusterType;
- this.cpuAllocated = cpuAllocated;
- this.cpuNumber = cpuNumber;
- this.cpuSpeed = cpuSpeed;
- this.cpuUsed = cpuUsed;
- this.cpuWithOverProvisioning = cpuWithOverProvisioning;
- this.created = created;
- this.disconnected = disconnected;
- this.diskSizeAllocated = diskSizeAllocated;
- this.diskSizeTotal = diskSizeTotal;
- this.events = events;
- this.hasEnoughCapacity = hasEnoughCapacity;
- this.tags = tags != null ? ImmutableSet.copyOf(tags) : ImmutableSet.<String> of();
- this.hypervisor = hypervisor;
- this.ipAddress = ipAddress;
- this.localStorageActive = localStorageActive;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- this.lastPinged = lastPinged;
- this.managementServerId = managementServerId;
- this.memoryAllocated = memoryAllocated;
- this.memoryTotal = memoryTotal;
- this.memoryUsed = memoryUsed;
- this.name = name;
- this.networkKbsRead = networkKbsRead;
- this.networkKbsWrite = networkKbsWrite;
- this.osCategoryId = osCategoryId;
- this.osCategoryName = osCategoryName;
- this.podId = podId;
- this.podName = podName;
- this.removed = removed;
- this.state = state;
- this.type = type;
- this.version = version;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public AllocationState getAllocationState() {
- return this.allocationState;
- }
-
- public int getAverageLoad() {
- return this.averageLoad;
- }
-
- @Nullable
- public String getCapabilities() {
- return this.capabilities;
- }
-
- @Nullable
- public String getClusterId() {
- return this.clusterId;
- }
-
- @Nullable
- public String getClusterName() {
- return this.clusterName;
- }
-
- @Nullable
- public Host.ClusterType getClusterType() {
- return this.clusterType;
- }
-
- @Nullable
- public String getCpuAllocated() {
- return this.cpuAllocated;
- }
-
- public int getCpuNumber() {
- return this.cpuNumber;
- }
-
- public int getCpuSpeed() {
- return this.cpuSpeed;
- }
-
- @Nullable
- public String getCpuUsed() {
- return this.cpuUsed;
- }
-
- public float getCpuWithOverProvisioning() {
- return this.cpuWithOverProvisioning;
- }
-
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- @Nullable
- public Date getDisconnected() {
- return this.disconnected;
- }
-
- public long getDiskSizeAllocated() {
- return this.diskSizeAllocated;
- }
-
- public long getDiskSizeTotal() {
- return this.diskSizeTotal;
- }
-
- @Nullable
- public String getEvents() {
- return this.events;
- }
-
- public boolean isHasEnoughCapacity() {
- return this.hasEnoughCapacity;
- }
-
- /**
- * @return the tags for the host
- */
- public Set<String> getTags() {
- return this.tags;
- }
-
-
- @Nullable
- public String getHypervisor() {
- return this.hypervisor;
- }
-
- @Nullable
- public String getIpAddress() {
- return this.ipAddress;
- }
-
- public boolean isLocalStorageActive() {
- return this.localStorageActive;
- }
-
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- @Nullable
- public AsyncJob.Status getJobStatus() {
- return this.jobStatus;
- }
-
- @Nullable
- public Date getLastPinged() {
- return this.lastPinged;
- }
-
- @Nullable
- public String getManagementServerId() {
- return this.managementServerId;
- }
-
- public long getMemoryAllocated() {
- return this.memoryAllocated;
- }
-
- public long getMemoryTotal() {
- return this.memoryTotal;
- }
-
- public long getMemoryUsed() {
- return this.memoryUsed;
- }
-
- @Nullable
- public String getName() {
- return this.name;
- }
-
- public long getNetworkKbsRead() {
- return this.networkKbsRead;
- }
-
- public long getNetworkKbsWrite() {
- return this.networkKbsWrite;
- }
-
- @Nullable
- public String getOsCategoryId() {
- return this.osCategoryId;
- }
-
- @Nullable
- public String getOsCategoryName() {
- return this.osCategoryName;
- }
-
- @Nullable
- public String getPodId() {
- return this.podId;
- }
-
- @Nullable
- public String getPodName() {
- return this.podName;
- }
-
- @Nullable
- public Date getRemoved() {
- return this.removed;
- }
-
- @Nullable
- public Host.State getState() {
- return this.state;
- }
-
- @Nullable
- public Host.Type getType() {
- return this.type;
- }
-
- @Nullable
- public String getVersion() {
- return this.version;
- }
-
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, allocationState, averageLoad, capabilities, clusterId, clusterName, clusterType, cpuAllocated, cpuNumber, cpuSpeed, cpuUsed, cpuWithOverProvisioning, created, disconnected, diskSizeAllocated, diskSizeTotal, events, hasEnoughCapacity, tags, hypervisor, ipAddress, localStorageActive, jobId, jobStatus, lastPinged, managementServerId, memoryAllocated, memoryTotal, memoryUsed, name, networkKbsRead, networkKbsWrite, osCategoryId, osCategoryName, podId, podName, removed, state, type, version, zoneId, zoneName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Host that = Host.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.allocationState, that.allocationState)
- && Objects.equal(this.averageLoad, that.averageLoad)
- && Objects.equal(this.capabilities, that.capabilities)
- && Objects.equal(this.clusterId, that.clusterId)
- && Objects.equal(this.clusterName, that.clusterName)
- && Objects.equal(this.clusterType, that.clusterType)
- && Objects.equal(this.cpuAllocated, that.cpuAllocated)
- && Objects.equal(this.cpuNumber, that.cpuNumber)
- && Objects.equal(this.cpuSpeed, that.cpuSpeed)
- && Objects.equal(this.cpuUsed, that.cpuUsed)
- && Objects.equal(this.cpuWithOverProvisioning, that.cpuWithOverProvisioning)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.disconnected, that.disconnected)
- && Objects.equal(this.diskSizeAllocated, that.diskSizeAllocated)
- && Objects.equal(this.diskSizeTotal, that.diskSizeTotal)
- && Objects.equal(this.events, that.events)
- && Objects.equal(this.hasEnoughCapacity, that.hasEnoughCapacity)
- && Objects.equal(this.tags, that.tags)
- && Objects.equal(this.hypervisor, that.hypervisor)
- && Objects.equal(this.ipAddress, that.ipAddress)
- && Objects.equal(this.localStorageActive, that.localStorageActive)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus)
- && Objects.equal(this.lastPinged, that.lastPinged)
- && Objects.equal(this.managementServerId, that.managementServerId)
- && Objects.equal(this.memoryAllocated, that.memoryAllocated)
- && Objects.equal(this.memoryTotal, that.memoryTotal)
- && Objects.equal(this.memoryUsed, that.memoryUsed)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.networkKbsRead, that.networkKbsRead)
- && Objects.equal(this.networkKbsWrite, that.networkKbsWrite)
- && Objects.equal(this.osCategoryId, that.osCategoryId)
- && Objects.equal(this.osCategoryName, that.osCategoryName)
- && Objects.equal(this.podId, that.podId)
- && Objects.equal(this.podName, that.podName)
- && Objects.equal(this.removed, that.removed)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.version, that.version)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("allocationState", allocationState).add("averageLoad", averageLoad)
- .add("capabilities", capabilities).add("clusterId", clusterId).add("clusterName", clusterName)
- .add("clusterType", clusterType).add("cpuAllocated", cpuAllocated).add("cpuNumber", cpuNumber)
- .add("cpuSpeed", cpuSpeed).add("cpuUsed", cpuUsed).add("cpuWithOverProvisioning", cpuWithOverProvisioning)
- .add("created", created).add("disconnected", disconnected).add("diskSizeAllocated", diskSizeAllocated)
- .add("diskSizeTotal", diskSizeTotal).add("events", events).add("hasEnoughCapacity", hasEnoughCapacity)
- .add("tags", tags).add("hypervisor", hypervisor).add("ipAddress", ipAddress)
- .add("localStorageActive", localStorageActive).add("jobId", jobId).add("jobStatus", jobStatus)
- .add("lastPinged", lastPinged).add("managementServerId", managementServerId).add("memoryAllocated", memoryAllocated)
- .add("memoryTotal", memoryTotal).add("memoryUsed", memoryUsed).add("name", name).add("networkKbsRead", networkKbsRead)
- .add("networkKbsWrite", networkKbsWrite).add("osCategoryId", osCategoryId).add("osCategoryName", osCategoryName)
- .add("podId", podId).add("podName", podName).add("removed", removed).add("state", state).add("type", type)
- .add("version", version).add("zoneId", zoneId).add("zoneName", zoneName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Host other) {
- return this.getId().compareTo(other.getId());
- }
-}
[50/51] [abbrv] stratos git commit: fixing minor issues
Posted by im...@apache.org.
fixing minor issues
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/762845d1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/762845d1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/762845d1
Branch: refs/heads/master
Commit: 762845d1d3222c83e7578c7e2babde21b01d89f3
Parents: 6d01d73
Author: asankasanjaya <pr...@gmail.com>
Authored: Tue Nov 11 13:57:53 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:31 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/CloudstackIaas.java | 21 ++++++++++----------
.../util/CloudControllerConstants.java | 2 +-
.../main/resources/conf/cloud-controller.xml | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/762845d1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index e8024b5..aba06f1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -198,7 +198,8 @@ public class CloudstackIaas extends Iaas {
* we cannot assign public ips.
* <p/>
* When we use an advanced zone, a public IP address will get automatically assigned to the vm. So we don't need
- * to find an unallocated IP address and assign that address to the vm (Not like in ec2 and openstack).
+ * to find an unallocated IP address and assign that address to the vm. If you are using a basic zone you cannot
+ * assign public IPs
* <p/>
* So this method will find the IP that has been assigned to the vm and return it.
*/
@@ -223,7 +224,7 @@ public class CloudstackIaas extends Iaas {
if (publicIPAddress.getVirtualMachineId().equals(id)) { //check whether this instance has
// already got an public ip or not
ip = publicIPAddress.getIPAddress(); //A public ip has been successfully assigned to the vm
- log.debug("Successfully associated an IP address " + ip
+ log.info("Successfully associated an IP address " + ip
+ " for node with id: " + node.getId());
break;
}
@@ -233,7 +234,7 @@ public class CloudstackIaas extends Iaas {
if (ip == null || ip.isEmpty()) { //IP has not been successfully assigned to VM(That means there are
// no more IPs available for the VM)
String msg = "No address associated for node with id: " + node.getId();
- log.debug(msg);
+ log.warn(msg);
throw new CloudControllerException(msg);
}
@@ -331,7 +332,7 @@ public class CloudstackIaas extends Iaas {
String diskOfferingID = iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class)
.getDiskOfferingId();
if (zone == null && diskOfferingID == null) {
- log.fatal("Cannot create a new volume in the , [zone] : " + zone + " of Iaas : " + iaasInfo);
+ log.error("Could not create a volume in the , [zone] : " + zone + " of Iaas : " + iaasInfo);
return null;
}
@@ -339,7 +340,7 @@ public class CloudstackIaas extends Iaas {
Volume volume;
if (StringUtils.isEmpty(snapshotId)) {
- if (log.isDebugEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Creating a volume in the zone " + zone);
}
@@ -348,7 +349,7 @@ public class CloudstackIaas extends Iaas {
// volume = blockStoreApi.createVolumeInAvailabilityZone(zone, sizeGB);
} else {
- if (log.isDebugEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Creating a volume in the zone " + zone + " from the snapshot " + snapshotId);
}
volumeApi.createVolumeFromSnapshotInZone(null, diskOfferingID, zone);
@@ -421,8 +422,8 @@ public class CloudstackIaas extends Iaas {
try {
// waiting 5seconds till volumes are actually attached.
Thread.sleep(5000);
- } catch (InterruptedException e) {
- e.printStackTrace();
+ } catch (InterruptedException ignored) {
+
}
//If volume state is not 'READY'
@@ -481,8 +482,8 @@ public class CloudstackIaas extends Iaas {
return null;
}
- private boolean waitForStatus(String volumeId, Volume.State expectedStatus, int timeoutInMins) throws TimeoutException {
- int timeout = 1000 * 60 * timeoutInMins;
+ private boolean waitForStatus(String volumeId, Volume.State expectedStatus, int timeoutInMilliseconds) throws TimeoutException {
+ int timeout = 1000 * 60 * timeoutInMilliseconds;
long timout = System.currentTimeMillis() + timeout;
IaasProvider iaasInfo = getIaasProvider();
http://git-wip-us.apache.org/repos/asf/stratos/blob/762845d1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 5509b46..0b58c5f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -98,7 +98,7 @@ public final class CloudControllerConstants {
.replaceAll("[/.]", "_");
//cloudstack specific
- public static final String USER_NAME = "userName";
+ public static final String USER_NAME = "username";
public static final String DOMAIN_ID = "domainId";
public static final String DISK_OFFERING = "diskOffering";
public static final String NETWORK_IDS= "networkIds";
http://git-wip-us.apache.org/repos/asf/stratos/blob/762845d1/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
index 18d67d5..dd2306a 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/cloud-controller.xml
@@ -61,7 +61,7 @@
<property name="securityGroupIds" value="security_group_Id1,security_group_id2"/>
<property name="networkIds" value="network_Id1,network_Id2"/>
<property name="diskOffering" value="disk_offering_Id"/>
- <property name="userName" value="username"/>
+ <property name="username" value="username"/>
<property name="domainId" value="domainId"/>
<property name="keyPair" value="asanka-key"/>
<property name="tags" value="tag1,tag2,tag3" />
[25/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiLiveTest.java
deleted file mode 100644
index 03fbe3d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalDomainApiLiveTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.find;
-import static org.jclouds.cloudstack.options.UpdateDomainOptions.Builder.name;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import org.jclouds.cloudstack.domain.Domain;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-
-/**
- * Tests behavior of {@code GlobalDomainApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalDomainApiLiveTest")
-public class GlobalDomainApiLiveTest extends BaseCloudStackApiLiveTest {
-
- private GlobalDomainApi domainClient;
- private Domain rootDomain;
-
- @BeforeMethod
- public void before() {
- domainClient = globalAdminClient.getDomainClient();
- rootDomain = find(domainClient.listDomains(), new Predicate<Domain>() {
- @Override
- public boolean apply(Domain domain) {
- return domain != null && domain.getName().equals("ROOT");
- }
- });
- }
-
- @Test(expectedExceptions = IllegalStateException.class)
- public void testCreateUpdateDeleteDomain() throws InterruptedException {
- skipIfNotDomainAdmin();
-
- Domain domain = null;
- try {
- domain = domainClient.createDomain(prefix + "-domain");
- checkDomain(domain, rootDomain, prefix + "-domain");
-
- Domain updated = domainClient.updateDomain(domain.getId(), name(prefix + "-domain-2"));
- checkDomain(updated, rootDomain, prefix + "-domain-2");
- assertEquals(updated.getId(), domain.getId());
-
- } finally {
- if (domain != null) {
- domainClient.deleteDomainAndAttachedResources(domain.getId());
- }
- }
- Thread.sleep(5000);
- assertNull(domainClient.getDomainById(domain.getId()));
- }
-
- private void checkDomain(Domain domain, Domain rootDomain, String expectedName) {
- assertEquals(domain.getParentDomainId(), rootDomain.getId());
- assertEquals(domain.getName(), expectedName);
- assertEquals(domain.getParentDomainName(), rootDomain.getName());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiExpectTest.java
deleted file mode 100644
index 9fd82db..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiExpectTest.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.cloudstack.options.AddClusterOptions;
-import org.jclouds.cloudstack.options.AddHostOptions;
-import org.jclouds.cloudstack.options.AddSecondaryStorageOptions;
-import org.jclouds.cloudstack.options.DeleteHostOptions;
-import org.jclouds.cloudstack.options.UpdateClusterOptions;
-import org.jclouds.cloudstack.options.UpdateHostOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack GlobalHostApi
- */
-@Test(groups = "unit", testName = "GlobalConfigurationApiExpectTest")
-public class GlobalHostApiExpectTest extends BaseCloudStackExpectTest<GlobalHostApi> {
-
- @Test
- public void testListHostsWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=listHosts&listAll=true&apiKey=identity&signature=NnYyyEy30G3V2dcIt7w4WZ68AU8%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/listhostsresponse.json"))
- .statusCode(200).build();
-
- Set<Host> actual = requestSendsResponse(request, response).listHosts();
-
- Date lastPinged = makeDate(1970, Calendar.JANUARY, 16, 0, 54, 43, "GMT+02:00");
- Date created = makeDate(2011, Calendar.NOVEMBER, 26, 23, 28, 36, "GMT+02:00");
- Host host1 = Host.builder().id("1").name("cs2-xevsrv.alucloud.local").state(Host.State.UP).type(Host.Type.ROUTING).ipAddress("10.26.26.107").zoneId("1").zoneName("Dev Zone 1").podId("1").podName("Dev Pod 1").version("2.2.12.20110928142833").hypervisor("XenServer").cpuNumber(24).cpuSpeed(2266).cpuAllocated("2.76%").cpuUsed("0.1%").cpuWithOverProvisioning(54384.0F).networkKbsRead(4443).networkKbsWrite(15048).memoryTotal(100549733760L).memoryAllocated(3623878656L).memoryUsed(3623878656L).capabilities("xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64").lastPinged(lastPinged).managementServerId("223098941760041").clusterId("1").clusterName("Xen Clust 1").clusterType(Host.ClusterType.CLOUD_MANAGED).localStorageActive(false).created(created).events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping").hasEnough
Capacity(false).allocationState(AllocationState.ENABLED).build();
-
- Date disconnected = makeDate(2011, Calendar.NOVEMBER, 26, 23, 33, 38, "GMT+02:00");
- lastPinged = makeDate(1970, Calendar.JANUARY, 16, 0, 42, 30, "GMT+02:00");
- created = makeDate(2011, Calendar.NOVEMBER, 26, 23, 33, 38, "GMT+02:00");
- Host host2 = Host.builder().id("2").name("nfs://10.26.26.165/mnt/nfs/cs_sec").state(Host.State.ALERT).disconnected(disconnected).type(Host.Type.SECONDARY_STORAGE).ipAddress("nfs").zoneId("1").zoneName("Dev Zone 1").version("2.2.12.20110928142833").hypervisor("None").lastPinged(lastPinged).localStorageActive(false).created(created).events("ManagementServerDown; AgentDisconnected; Remove; MaintenanceRequested; AgentConnected; Ping").hasEnoughCapacity(false).allocationState(AllocationState.ENABLED).build();
-
- lastPinged = makeDate(1970, Calendar.JANUARY, 16, 0, 54, 43, "GMT+02:00");
- created = makeDate(2011, Calendar.NOVEMBER, 26, 23, 35, 51, "GMT+02:00");
- Host host3 = Host.builder().id("3").name("s-1-VM").state(Host.State.UP).type(Host.Type.SECONDARY_STORAGE_VM).ipAddress("10.26.26.81").zoneId("1").zoneName("Dev Zone 1").podId("1").podName("Dev Pod 1").version("2.2.12.20110928142833").lastPinged(lastPinged).managementServerId("223098941760041").localStorageActive(false).created(created).events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping").hasEnoughCapacity(false).allocationState(AllocationState.ENABLED).build();
-
- lastPinged = makeDate(1970, Calendar.JANUARY, 16, 0, 54, 43, "GMT+02:00");
- created = makeDate(2011, Calendar.NOVEMBER, 26, 23, 36, 46, "GMT+02:00");
- Host host4 = Host.builder().id("4").name("v-2-VM").state(Host.State.UP).type(Host.Type.CONSOLE_PROXY).ipAddress("10.26.26.96").zoneId("1").zoneName("Dev Zone 1").podId("1").podName("Dev Pod 1").version("2.2.12.20110928142833").lastPinged(lastPinged).managementServerId("223098941760041").localStorageActive(false).created(created).events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping").hasEnoughCapacity(false).allocationState(AllocationState.ENABLED).build();
-
- Set<Host> expected = ImmutableSet.of(host1, host2, host3, host4);
-
- assertEquals(actual, expected);
- }
-
- @Test
- public void testListHostsEmptyOn404() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=listHosts&listAll=true&apiKey=identity&signature=NnYyyEy30G3V2dcIt7w4WZ68AU8%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder().statusCode(404).build();
- GlobalHostApi client = requestSendsResponse(request, response);
-
- assertEquals(client.listHosts(), ImmutableSet.of());
- }
-
- HttpRequest addHost = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "addHost")
- .addQueryParam("zoneid", "1")
- .addQueryParam("url", "http%3A//example.com")
- .addQueryParam("hypervisor", "XenServer")
- .addQueryParam("username", "fred")
- .addQueryParam("password", "sekrit")
- .addQueryParam("hosttags", "")
- .addQueryParam("allocationstate", "Enabled")
- .addQueryParam("clusterid", "1")
- .addQueryParam("clustername", "Xen%20Clust%201")
- .addQueryParam("podid", "1")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "ExGaljKKQIlVbWk5hd0BnnjmBzs=")
- .addHeader("Accept", "application/json").build();
-
- @Test
- public void testAddHostWhenResponseIs2xx() {
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/addhostresponse.json"))
- .statusCode(200).build();
-
- Date lastPinged = makeDate(1970, Calendar.JANUARY, 16, 0, 54, 43, "GMT+02:00");
- Date created = makeDate(2011, Calendar.NOVEMBER, 26, 23, 28, 36, "GMT+02:00");
- Host expected = Host.builder().id("1").name("cs2-xevsrv.alucloud.local").state(Host.State.UP).type(Host.Type.ROUTING).ipAddress("10.26.26.107").zoneId("1").zoneName("Dev Zone 1").podId("1").podName("Dev Pod 1").version("2.2.12.20110928142833").hypervisor("XenServer").cpuNumber(24).cpuSpeed(2266).cpuAllocated("2.76%").cpuUsed("0.1%").cpuWithOverProvisioning(54384.0F).networkKbsRead(4443).networkKbsWrite(15048).memoryTotal(100549733760L).memoryAllocated(3623878656L).memoryUsed(3623878656L).capabilities("xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64").lastPinged(lastPinged).managementServerId("223098941760041").clusterId("1").clusterName("Xen Clust 1").clusterType(Host.ClusterType.CLOUD_MANAGED).localStorageActive(false).created(created).events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping").hasEno
ughCapacity(false).allocationState(AllocationState.ENABLED).build();
-
- Host actual = requestSendsResponse(addHost, response).addHost("1", "http://example.com", "XenServer", "fred", "sekrit",
- AddHostOptions.Builder.hostTags(ImmutableSet.<String>of()).allocationState(AllocationState.ENABLED).clusterId("1").clusterName("Xen Clust 1").podId("1"));
-
- assertEquals(actual, expected);
- }
-
- @Test
- public void testUpdateHostWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=updateHost&id=1&allocationstate=Enabled&hosttags=&oscategoryid=5&apiKey=identity&signature=qTxNq9yQG8S108giqS/ROFzgev8%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/updatehostresponse.json"))
- .statusCode(200).build();
-
- Date lastPinged = makeDate(1970, Calendar.JANUARY, 16, 0, 54, 43, "GMT+02:00");
- Date created = makeDate(2011, Calendar.NOVEMBER, 26, 23, 28, 36, "GMT+02:00");
- Host expected = Host.builder().id("1").name("cs2-xevsrv.alucloud.local").state(Host.State.UP).type(Host.Type.ROUTING).ipAddress("10.26.26.107").zoneId("1").zoneName("Dev Zone 1").podId("1").podName("Dev Pod 1").version("2.2.12.20110928142833").hypervisor("XenServer").cpuNumber(24).cpuSpeed(2266).cpuAllocated("2.76%").cpuUsed("0.1%").cpuWithOverProvisioning(54384.0F).networkKbsRead(4443).networkKbsWrite(15048).memoryTotal(100549733760L).memoryAllocated(3623878656L).memoryUsed(3623878656L).capabilities("xen-3.0-x86_64 , xen-3.0-x86_32p , hvm-3.0-x86_32 , hvm-3.0-x86_32p , hvm-3.0-x86_64").lastPinged(lastPinged).managementServerId("223098941760041").clusterId("1").clusterName("Xen Clust 1").clusterType(Host.ClusterType.CLOUD_MANAGED).localStorageActive(false).created(created).events("PrepareUnmanaged; HypervisorVersionChanged; ManagementServerDown; PingTimeout; AgentDisconnected; MaintenanceRequested; HostDown; AgentConnected; StartAgentRebalance; ShutdownRequested; Ping").hasEno
ughCapacity(false).allocationState(AllocationState.ENABLED).build();
-
- Host actual = requestSendsResponse(request, response).updateHost("1", UpdateHostOptions.Builder.allocationState(AllocationState.ENABLED).hostTags(ImmutableSet.<String>of()).osCategoryId("5"));
-
- assertEquals(actual, expected);
- }
-
- HttpRequest updateHostPassword = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "updateHostPassword")
- .addQueryParam("hostid", "1")
- .addQueryParam("username", "fred")
- .addQueryParam("password", "sekrit")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "g9nMKDWoiU72y0HhaRFekZCgfJc=")
- .addHeader("Accept", "application/json").build();
-
- @Test
- public void testUpdateHostPasswordWhenResponseIs2xx() {
- HttpResponse response = HttpResponse.builder()
- .statusCode(200).build();
- requestSendsResponse(updateHostPassword, response).updateHostPassword("1", "fred", "sekrit");
- }
-
- @Test
- public void testDeleteHostWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=deleteHost&id=1&forced=true&forcedestroylocalstorage=true&apiKey=identity&signature=ZdvO1BWBkdPiDAjsVlKtqDe6N7k%3D")
- .addHeader("Accept", "application/json")
- .build();
- HttpResponse response = HttpResponse.builder()
- .statusCode(200).build();
-
- requestSendsResponse(request, response).deleteHost("1", DeleteHostOptions.Builder.forced(true).forceDestroyLocalStorage(true));
- }
-
- @Test
- public void testPrepareHostForMaintenanceWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=prepareHostForMaintenance&id=1&apiKey=identity&signature=9tDwdox/xAKmZr9kVrR6Ttnxf3U%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/preparehostformaintenanceresponse.json"))
- .statusCode(200).build();
-
- String actual = requestSendsResponse(request, response).prepareHostForMaintenance("1");
- assertEquals(actual, "2036");
- }
-
- @Test
- public void testCancelHostMaintenanceWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=cancelHostMaintenance&id=1&apiKey=identity&signature=9RduzuBoyRZKNTzAoVqUo9gRTfk%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/cancelhostmaintenanceresponse.json"))
- .statusCode(200).build();
-
- String actual = requestSendsResponse(request, response).cancelHostMaintenance("1");
- assertEquals(actual, "2036");
- }
-
- @Test
- public void testReconnectHostWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=reconnectHost&id=1&apiKey=identity&signature=wJEF02vwdyOnJOTa%2BWMMK906aRU%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/reconnecthostresponse.json"))
- .statusCode(200).build();
-
- String actual = requestSendsResponse(request, response).reconnectHost("1");
- assertEquals(actual, "2036");
- }
-
- @Test
- public void testAddSecondaryStorageWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=addSecondaryStorage&url=nfs%3A//10.26.26.165/mnt/nfs/cs_sec&zoneid=1&apiKey=identity&signature=MccRKx1yPP43ImiO70WlhVDlAIA%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/addsecondarystorageresponse.json"))
- .statusCode(200).build();
-
- Date disconnected = makeDate(2011, Calendar.NOVEMBER, 26, 23, 33, 38, "GMT+02:00");
- Date lastPinged = makeDate(1970, Calendar.JANUARY, 16, 0, 42, 30, "GMT+02:00");
- Date created = makeDate(2011, Calendar.NOVEMBER, 26, 23, 33, 38, "GMT+02:00");
- Host expected = Host.builder().id("2").name("nfs://10.26.26.165/mnt/nfs/cs_sec").state(Host.State.ALERT).disconnected(disconnected).type(Host.Type.SECONDARY_STORAGE).ipAddress("nfs").zoneId("1").zoneName("Dev Zone 1").version("2.2.12.20110928142833").hypervisor("None").lastPinged(lastPinged).localStorageActive(false).created(created).events("ManagementServerDown; AgentDisconnected; Remove; MaintenanceRequested; AgentConnected; Ping").hasEnoughCapacity(false).allocationState(AllocationState.ENABLED).build();
-
- Host actual = requestSendsResponse(request, response).addSecondaryStorage("nfs://10.26.26.165/mnt/nfs/cs_sec", AddSecondaryStorageOptions.Builder.zoneId("1"));
-
- assertEquals(actual, expected);
- }
-
- @Test
- public void testListClustersWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=listClusters&listAll=true&apiKey=identity&signature=lbimqg0OKIq8sgQBpNmi4oQNFog%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/listclustersresponse.json"))
- .statusCode(200).build();
-
- Set<Cluster> actual = requestSendsResponse(request, response).listClusters();
-
- Cluster cluster1 = Cluster.builder().id("1").name("Xen Clust 1").podId("1").podName("Dev Pod 1").zoneId("1").zoneName("Dev Zone 1").hypervisor("XenServer").clusterType(Host.ClusterType.CLOUD_MANAGED).allocationState(AllocationState.ENABLED).managedState(Cluster.ManagedState.MANAGED).build();
- Cluster cluster2 = Cluster.builder().id("2").name("Xen Clust 1").podId("2").podName("Dev Pod 2").zoneId("2").zoneName("Dev Zone 2").hypervisor("XenServer").clusterType(Host.ClusterType.CLOUD_MANAGED).allocationState(AllocationState.ENABLED).managedState(Cluster.ManagedState.MANAGED).build();
- ImmutableSet<Cluster> expected = ImmutableSet.of(cluster1, cluster2);
-
- assertEquals(actual, expected);
- }
-
- @Test
- public void testListClustersEmptyOn404() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=listClusters&listAll=true&apiKey=identity&signature=lbimqg0OKIq8sgQBpNmi4oQNFog%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder().statusCode(404).build();
- GlobalHostApi client = requestSendsResponse(request, response);
-
- assertEquals(client.listClusters(), ImmutableSet.of());
- }
-
- HttpRequest addCluster = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "addCluster")
- .addQueryParam("zoneid", "1")
- .addQueryParam("clustername", "Xen Clust 1")
- .addQueryParam("clustertype", "CloudManaged")
- .addQueryParam("hypervisor", "XenServer")
- .addQueryParam("allocationstate", "Enabled")
- .addQueryParam("podid", "1")
- .addQueryParam("url", "http://example.com/cluster")
- .addQueryParam("username", "fred")
- .addQueryParam("password", "sekrit")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "2uIQ5qF0bVycXK111wxvogWp1Yw=")
- .addHeader("Accept", "application/json").build();
-
- @Test
- public void testAddClusterWhenResponseIs2xx() {
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/addclusterresponse.json"))
- .statusCode(200).build();
-
- Cluster expected = Cluster.builder().id("1").name("Xen Clust 1").podId("1").podName("Dev Pod 1").zoneId("1").zoneName("Dev Zone 1").hypervisor("XenServer").clusterType(Host.ClusterType.CLOUD_MANAGED).allocationState(AllocationState.ENABLED).managedState(Cluster.ManagedState.MANAGED).build();
-
- Cluster actual = requestSendsResponse(addCluster, response).addCluster("1", "Xen Clust 1", Host.ClusterType.CLOUD_MANAGED, "XenServer", AddClusterOptions.Builder.allocationState(AllocationState.ENABLED).podId("1").url("http://example.com/cluster").username("fred").password("sekrit"));
-
- assertEquals(actual, expected);
- }
-
- HttpRequest updateCluster = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "updateCluster")
- .addQueryParam("id", "1")
- .addQueryParam("allocationstate", "Enabled")
- .addQueryParam("clustername", "Xen Clust 1")
- .addQueryParam("clustertype", "CloudManaged")
- .addQueryParam("hypervisor", "XenServer")
- .addQueryParam("managedstate", "Managed")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "/wbuYKwInciSXWkUf05lEfJZShQ=")
- .addHeader("Accept", "application/json").build();
-
- @Test
- public void testUpdateClusterWhenResponseIs2xx() {
- HttpResponse response = HttpResponse.builder()
- .payload(payloadFromResource("/updateclusterresponse.json"))
- .statusCode(200).build();
-
- Cluster expected = Cluster.builder().id("1").name("Xen Clust 1").podId("1").podName("Dev Pod 1").zoneId("1").zoneName("Dev Zone 1").hypervisor("XenServer").clusterType(Host.ClusterType.CLOUD_MANAGED).allocationState(AllocationState.ENABLED).managedState(Cluster.ManagedState.MANAGED).build();
-
- Cluster actual = requestSendsResponse(updateCluster, response).updateCluster("1", UpdateClusterOptions.Builder.allocationState(AllocationState.ENABLED).clusterName("Xen Clust 1").clusterType(Host.ClusterType.CLOUD_MANAGED).hypervisor("XenServer").managedState(Cluster.ManagedState.MANAGED));
-
- assertEquals(actual, expected);
- }
-
- HttpRequest updateClusterPassword = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "updateHostPassword")
- .addQueryParam("clusterid", "1")
- .addQueryParam("username", "fred")
- .addQueryParam("password", "sekrit")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "xwc83%2BoYK0cuAiFQAlg/7/1IVHE=")
- .addHeader("Accept", "application/json").build();
-
- @Test
- public void testUpdateClusterPasswordWhenResponseIs2xx() {
- HttpResponse response = HttpResponse.builder()
- .statusCode(200).build();
- requestSendsResponse(updateClusterPassword, response).updateClusterPassword("1", "fred", "sekrit");
- }
-
- @Test
- public void testDeleteClusterWhenResponseIs2xx() {
- HttpRequest request = HttpRequest.builder()
- .method("GET")
- .endpoint("http://localhost:8080/client/api?response=json&command=deleteCluster&id=1&apiKey=identity&signature=CKH26MFgKGY7Sosd17LjBMNa3AI%3D")
- .addHeader("Accept", "application/json").build();
- HttpResponse response = HttpResponse.builder()
- .statusCode(200).build();
-
- requestSendsResponse(request, response).deleteCluster("1");
- }
-
- private Date makeDate(int year, int month, int date, int hour, int minute, int second, String timeZoneName) {
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone(timeZoneName));
- cal.set(Calendar.YEAR, year);
- cal.set(Calendar.MONTH, month);
- cal.set(Calendar.DATE, date);
- cal.set(Calendar.HOUR_OF_DAY, hour);
- cal.set(Calendar.MINUTE, minute);
- cal.set(Calendar.SECOND, second);
- cal.set(Calendar.MILLISECOND, 0);
- return cal.getTime();
- }
-
- @Override
- protected GlobalHostApi clientFrom(CloudStackContext context) {
- return context.getGlobalApi().getHostClient();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiLiveTest.java
deleted file mode 100644
index 1ed94fd..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiLiveTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Strings;
-
-/**
- * Tests behavior of {@code GlobalHostApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalHostApiLiveTest")
-public class GlobalHostApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(groups = "live", enabled = true)
- public void testListHosts() throws Exception {
- skipIfNotGlobalAdmin();
-
- Set<Host> hosts = globalAdminClient.getHostClient().listHosts();
- assert !hosts.isEmpty() : hosts;
-
- for (Host host : hosts) {
- checkHost(host);
- }
- }
-
- private void checkHost(Host host) {
- if (host.getType() == Host.Type.ROUTING) {
- assert host.getCpuNumber() > 0;
- assert host.getAverageLoad() >= 0;
- assert host.getHypervisor() != null;
- }
- assert host.getEvents() != null;
- if (host.getType() == Host.Type.SECONDARY_STORAGE_VM) {
- assert host.getName().startsWith("s-");
- }
- if (host.getType() == Host.Type.CONSOLE_PROXY) {
- assert host.getName().startsWith("v-");
- }
- }
-
- @Test(groups = "live", enabled = true)
- public void testListClusters() throws Exception {
- skipIfNotGlobalAdmin();
-
- Set<Cluster> clusters = globalAdminClient.getHostClient().listClusters();
- assert !clusters.isEmpty() : clusters;
-
- for (Cluster cluster : clusters) {
- checkCluster(cluster);
- }
- }
-
- private void checkCluster(Cluster cluster) {
- assertNotNull(cluster.getId());
- assertFalse(Strings.isNullOrEmpty(cluster.getName()));
- assertNotEquals(AllocationState.UNKNOWN, cluster.getAllocationState());
- assertNotEquals(Host.ClusterType.UNKNOWN, cluster.getClusterType());
- assertFalse(Strings.isNullOrEmpty(cluster.getHypervisor()));
- assertNotEquals(Cluster.ManagedState.UNRECOGNIZED, cluster.getManagedState());
- assertNotNull(cluster.getPodId());
- assertFalse(Strings.isNullOrEmpty(cluster.getPodName()));
- assertNotNull(cluster.getZoneId());
- assertFalse(Strings.isNullOrEmpty(cluster.getZoneName()));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiTest.java
deleted file mode 100644
index 8b1d986..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalHostApiTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListHostsOptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GlobalHostApi}
- */
-@Test(groups = "unit", testName = "GlobalHostApiTest")
-public class GlobalHostApiTest extends BaseCloudStackApiTest<GlobalHostApi> {
-
- public void testListHosts() throws Exception {
- Invokable<?, ?> method = method(GlobalHostApi.class, "listHosts", ListHostsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listHosts&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiLiveTest.java
deleted file mode 100644
index 48117c0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiLiveTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static com.google.common.collect.Iterables.getFirst;
-import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.OPTIONAL;
-import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.REQUIRED;
-import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.diskSizeInGB;
-import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.highlyAvailable;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import org.jclouds.cloudstack.domain.DiskOffering;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.StorageType;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.UpdateDiskOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions;
-import org.jclouds.logging.Logger;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Tests behavior of {@code GlobalOfferingApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalOfferingApiLiveTest")
-public class GlobalOfferingApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(groups = "live", enabled = true)
- public void testCreateServiceOffering() throws Exception {
- skipIfNotGlobalAdmin();
-
- String name = prefix + "-test-create-service-offering";
- String displayText = name + "-display";
- ServiceOffering offering = null;
- try {
- offering = globalAdminClient.getOfferingApi().
- createServiceOffering(name, displayText, 2, 1024, 2048, highlyAvailable(true).storageType(StorageType.LOCAL));
- Logger.CONSOLE.info("Created Service Offering: " + offering);
-
- assertEquals(offering.getName(), name);
- assertEquals(offering.getDisplayText(), displayText);
- checkServiceOffering(offering);
-
- offering = globalAdminClient.getOfferingApi()
- .updateServiceOffering(offering.getId(),
- UpdateServiceOfferingOptions.Builder.name(name + "-2").displayText(displayText + "-2"));
-
- assertEquals(offering.getName(), name + "-2");
- assertEquals(offering.getDisplayText(), displayText + "-2");
- checkServiceOffering(offering);
-
- } finally {
- if (offering != null) {
- globalAdminClient.getOfferingApi().deleteServiceOffering(offering.getId());
- }
- }
- }
-
- private void checkServiceOffering(ServiceOffering offering) {
- assertNotNull(offering.getId());
- assertEquals(offering.getCpuNumber(), 2);
- assertEquals(offering.getCpuSpeed(), 1024);
- assertEquals(offering.getMemory(), 2048);
- assertTrue(offering.supportsHA());
- assertEquals(offering.getStorageType(), StorageType.LOCAL);
- }
-
- @Test(groups = "live", enabled = true)
- public void testCreateDiskOffering() throws Exception {
- skipIfNotGlobalAdmin();
-
- String name = prefix + "-test-create-disk-offering";
- String displayText = name + "-display";
- DiskOffering offering = null;
- try {
- offering = globalAdminClient.getOfferingApi().
- createDiskOffering(name, displayText,
- diskSizeInGB(100).customized(true).tags(ImmutableSet.<String>of("dummy-tag")));
-
- assertEquals(offering.getName(), name);
- assertEquals(offering.getDisplayText(), displayText);
- checkDiskOffering(offering);
-
- offering = globalAdminClient.getOfferingApi().
- updateDiskOffering(offering.getId(),
- UpdateDiskOfferingOptions.Builder.name(name + "-2").displayText(displayText + "-2"));
-
- assertEquals(offering.getName(), name + "-2");
- assertEquals(offering.getDisplayText(), displayText + "-2");
- checkDiskOffering(offering);
-
- } finally {
- if (offering != null) {
- globalAdminClient.getOfferingApi().deleteDiskOffering(offering.getId());
- }
- }
- }
-
- private void checkDiskOffering(DiskOffering offering) {
- assertTrue(offering.isCustomized());
- assertEquals(offering.getDiskSize(), 100);
- assertTrue(offering.getTags().contains("dummy-tag"));
- }
-
- @Test(groups = "live", enabled = true)
- public void testUpdateNetworkOffering() throws Exception {
- skipIfNotGlobalAdmin();
-
- NetworkOffering offering = getFirst(globalAdminClient.getOfferingApi().listNetworkOfferings(), null);
- assertNotNull(offering, "Unable to test, no network offering found.");
-
- String name = offering.getName();
- NetworkOfferingAvailabilityType availability = offering.getAvailability();
-
- try {
- NetworkOfferingAvailabilityType newValue = OPTIONAL;
- if (availability == OPTIONAL) {
- newValue = REQUIRED;
- }
- NetworkOffering updated = globalAdminClient.getOfferingApi().updateNetworkOffering(offering.getId(),
- UpdateNetworkOfferingOptions.Builder.name(prefix + name).availability(newValue));
-
- assertEquals(updated.getName(), prefix + name);
- assertEquals(updated.getAvailability(), newValue);
-
- } finally {
- globalAdminClient.getOfferingApi().updateNetworkOffering(offering.getId(),
- UpdateNetworkOfferingOptions.Builder.name(name).availability(availability));
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiTest.java
deleted file mode 100644
index b7243a4..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingApiTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.CreateDiskOfferingOptions;
-import org.jclouds.cloudstack.options.CreateServiceOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateDiskOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-
-/**
- * Tests behavior of {@code GlobalOfferingApi}
- */
-@Test(groups = "unit", testName = "GlobalOfferingApiTest")
-public class GlobalOfferingApiTest extends BaseCloudStackApiTest<GlobalOfferingApi> {
-
- HttpRequest createServiceOffering = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createServiceOffering")
- .addQueryParam("name", "name")
- .addQueryParam("displaytext", "displayText")
- .addQueryParam("cpunumber", "1")
- .addQueryParam("cpuspeed", "2")
- .addQueryParam("memory", "3").build();
-
- public void testCreateServiceOffering() throws Exception {
- Invokable<?, ?> method = method(GlobalOfferingApi.class, "createServiceOffering",
- String.class, String.class, int.class, int.class, int.class, CreateServiceOfferingOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("name", "displayText", 1, 2, 3));
-
- assertRequestLineEquals(httpRequest, createServiceOffering.getRequestLine());
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateServiceOffering() throws Exception {
- Invokable<?, ?> method = method(GlobalOfferingApi.class, "updateServiceOffering",
- String.class, UpdateServiceOfferingOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateServiceOffering&id=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteServiceOffering() throws Exception {
- Invokable<?, ?> method = method(GlobalOfferingApi.class, "deleteServiceOffering", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteServiceOffering&id=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testCreateDiskOffering() throws Exception {
- Invokable<?, ?> method = method(GlobalOfferingApi.class, "createDiskOffering",
- String.class, String.class, CreateDiskOfferingOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("name", "displayText"));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=createDiskOffering&name=name&displaytext=displayText HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateDiskOffering() throws Exception {
- Invokable<?, ?> method = method(GlobalOfferingApi.class, "updateDiskOffering",
- String.class, UpdateDiskOfferingOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateDiskOffering&id=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testDeleteDiskOffering() throws Exception {
- Invokable<?, ?> method = method(GlobalOfferingApi.class, "deleteDiskOffering", String.class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=deleteDiskOffering&id=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-
- public void testUpdateNetworkOffering() throws Exception {
- Invokable<?, ?> method = method(GlobalOfferingApi.class, "updateNetworkOffering",
- String.class, UpdateNetworkOfferingOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(1L));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=updateNetworkOffering&id=1 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiExpectTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiExpectTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiExpectTest.java
deleted file mode 100644
index 34eb37b..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiExpectTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.Pod;
-import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
-import org.jclouds.cloudstack.options.CreatePodOptions;
-import org.jclouds.cloudstack.options.UpdatePodOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Test the CloudStack PodClient
- */
-@Test(groups = "unit", testName = "GlobalPodApiExpectTest")
-public class GlobalPodApiExpectTest extends BaseCloudStackExpectTest<GlobalPodApi> {
-
- public void testListPodsWhenResponseIs2xx() {
- GlobalPodApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listPods&listAll=true&apiKey=identity&signature=MuowIOuZqOpKTPVQOfrDZEmpepw%3D"))
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", "application/json")
- .build())
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/listpodsresponse.json"))
- .build());
-
- Pod pod1 = Pod.builder()
- .id("1")
- .name("Dev Pod 1")
- .zoneId("1")
- .zoneName("Dev Zone 1")
- .gateway("10.26.26.254")
- .netmask("255.255.255.0")
- .startIp("10.26.26.50")
- .endIp("10.26.26.100")
- .allocationState(AllocationState.ENABLED)
- .build();
- Pod pod2 = Pod.builder()
- .id("2")
- .name("Dev Pod 2")
- .zoneId("2")
- .zoneName("Dev Zone 2")
- .gateway("10.22.22.254")
- .netmask("255.255.255.0")
- .startIp("10.22.22.25")
- .endIp("10.22.22.50")
- .allocationState(AllocationState.ENABLED)
- .build();
-
- assertEquals(client.listPods(), ImmutableSet.of(pod1, pod2));
- }
-
- public void testListPodsWhenResponseIs404() {
- GlobalPodApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&" +
- "command=listPods&listAll=true&apiKey=identity&signature=MuowIOuZqOpKTPVQOfrDZEmpepw%3D"))
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", "application/json")
- .build())
- .build(),
- HttpResponse.builder()
- .statusCode(404)
- .build());
-
- assertEquals(client.listPods(), ImmutableSet.of());
- }
-
- HttpRequest createPod = HttpRequest.builder().method("GET")
- .endpoint("http://localhost:8080/client/api")
- .addQueryParam("response", "json")
- .addQueryParam("command", "createPod")
- .addQueryParam("name", "richard-pod")
- .addQueryParam("zoneid", "10")
- .addQueryParam("startip", "172.20.0.1")
- .addQueryParam("endip", "172.20.0.250")
- .addQueryParam("gateway", "172.20.0.254")
- .addQueryParam("netmask", "255.255.255.0")
- .addQueryParam("allocationstate", "Enabled")
- .addQueryParam("apiKey", "identity")
- .addQueryParam("signature", "fwsoQ77BmNQWfuqv4nVlPcKvKbU=")
- .addHeader("Accept", "application/json").build();
-
- public void testCreatePodWhenResponseIs2xx() {
- GlobalPodApi client = requestSendsResponse(createPod,
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/createpodresponse.json"))
- .build());
-
- Pod expected = Pod.builder()
- .id("6")
- .name("richard-pod")
- .zoneId("10")
- .zoneName("richard-zone")
- .gateway("172.20.0.254")
- .netmask("255.255.255.0")
- .startIp("172.20.0.1")
- .endIp("172.20.0.250")
- .allocationState(AllocationState.ENABLED)
- .build();
-
- Pod actual = client.createPod("richard-pod", "10", "172.20.0.1", "172.20.0.250", "172.20.0.254", "255.255.255.0",
- CreatePodOptions.Builder.allocationState(AllocationState.ENABLED));
-
- assertEquals(actual, expected);
- }
-
- public void testUpdatePodWhenResponseIs2xx() {
- GlobalPodApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=updatePod&id=7&netmask=255.255.255.128&name=richard-updatepod&startip=172.21.0.129&endip=172.21.0.250&gateway=172.21.0.254&allocationstate=Disabled&apiKey=identity&signature=QpdbRyyF/xJ78ioJWhPKXEWhthY%3D"))
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", "application/json")
- .build())
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .payload(payloadFromResource("/updatepodresponse.json"))
- .build());
-
- Pod expected = Pod.builder()
- .id("7")
- .name("richard-updatedpod")
- .zoneId("11")
- .zoneName("richard-zone")
- .gateway("172.21.0.254")
- .netmask("255.255.255.128")
- .startIp("172.21.0.129")
- .endIp("172.21.0.250")
- .allocationState(AllocationState.DISABLED)
- .build();
-
- Pod actual = client.updatePod("7", UpdatePodOptions.Builder
- .netmask("255.255.255.128")
- .name("richard-updatepod")
- .startIp("172.21.0.129")
- .endIp("172.21.0.250")
- .gateway("172.21.0.254")
- .allocationState(AllocationState.DISABLED)
- );
-
- assertEquals(actual, expected);
- }
-
- public void testDeletePodWhenResponseIs2xx() {
- GlobalPodApi client = requestSendsResponse(
- HttpRequest.builder()
- .method("GET")
- .endpoint(
- URI.create("http://localhost:8080/client/api?response=json&command=deletePod&id=3&apiKey=identity&signature=rm4ItuAL1Ztnj%2BHFFvBFzvHAIog%3D"))
- .headers(
- ImmutableMultimap.<String, String>builder()
- .put("Accept", "application/json")
- .build())
- .build(),
- HttpResponse.builder()
- .statusCode(200)
- .build());
-
- client.deletePod("3");
- }
-
- @Override
- protected GlobalPodApi clientFrom(CloudStackContext context) {
- return context.getGlobalApi().getPodClient();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiLiveTest.java
deleted file mode 100644
index 7749c26..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalPodApiLiveTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AllocationState;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Pod;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.CreatePodOptions;
-import org.jclouds.cloudstack.options.ListPodsOptions;
-import org.jclouds.cloudstack.options.UpdatePodOptions;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code GlobalPodApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalPodApiLiveTest")
-public class GlobalPodApiLiveTest extends BaseCloudStackApiLiveTest {
-
- private Zone zone;
- private Pod pod;
-
- public void testListPods() throws Exception {
- skipIfNotGlobalAdmin();
-
- Set<Pod> response = globalAdminClient.getPodClient().listPods();
- assert null != response;
- long podCount = response.size();
- assertTrue(podCount >= 0);
-
- for (Pod pod : response) {
- Pod newDetails = Iterables.getOnlyElement(globalAdminClient.getPodClient().listPods(
- ListPodsOptions.Builder.id(pod.getId())));
- assertEquals(pod, newDetails);
- assertEquals(pod, globalAdminClient.getPodClient().getPod(pod.getId()));
- assertNotNull(pod.getId());
- assertFalse(Strings.isNullOrEmpty(pod.getName()));
- assertNotNull(pod.getZoneId());
- assertFalse(Strings.isNullOrEmpty(pod.getZoneName()));
- assertFalse(Strings.isNullOrEmpty(pod.getGateway()));
- assertFalse(Strings.isNullOrEmpty(pod.getNetmask()));
- assertFalse(Strings.isNullOrEmpty(pod.getStartIp()));
- assertFalse(Strings.isNullOrEmpty(pod.getEndIp()));
- assertNotEquals(pod.getAllocationState(), AllocationState.UNKNOWN);
- }
- }
-
- @Test
- public void testCreatePod() {
- skipIfNotGlobalAdmin();
-
- zone = globalAdminClient.getZoneApi().createZone(prefix + "-zone-for-pod", NetworkType.BASIC, "8.8.8.8", "10.10.10.10");
- pod = globalAdminClient.getPodClient().createPod(prefix + "-pod", zone.getId(), "172.20.0.1", "172.20.0.250", "172.20.0.254", "255.255.255.0",
- CreatePodOptions.Builder.allocationState(AllocationState.ENABLED));
-
- assertNotNull(pod);
- assertEquals(pod.getName(), prefix + "-pod");
- assertEquals(pod.getZoneId(), zone.getId());
- assertEquals(pod.getZoneName(), prefix + "-zone-for-pod");
- assertEquals(pod.getStartIp(), "172.20.0.1");
- assertEquals(pod.getEndIp(), "172.20.0.250");
- assertEquals(pod.getGateway(), "172.20.0.254");
- assertEquals(pod.getNetmask(), "255.255.255.0");
- assertEquals(pod.getAllocationState(), AllocationState.ENABLED);
- }
-
- @Test(dependsOnMethods = "testCreatePod")
- public void testUpdatePod() {
- Pod updated = globalAdminClient.getPodClient().updatePod(pod.getId(), UpdatePodOptions.Builder
- .name(prefix + "-updatedpod")
- .startIp("172.21.0.129")
- .endIp("172.21.0.250")
- .gateway("172.21.0.254")
- .netmask("255.255.255.128")
- .allocationState(AllocationState.DISABLED)
- );
-
- assertNotNull(updated);
- assertEquals(updated.getName(), prefix + "-updatedpod");
- assertEquals(updated.getZoneId(), zone.getId());
- assertEquals(updated.getZoneName(), prefix + "-zone-for-pod");
- assertEquals(updated.getStartIp(), "172.21.0.129");
- assertEquals(updated.getEndIp(), "172.21.0.250");
- assertEquals(updated.getGateway(), "172.21.0.254");
- assertEquals(updated.getNetmask(), "255.255.255.128");
- assertEquals(updated.getAllocationState(), AllocationState.DISABLED);
- }
-
- @AfterGroups(groups = "live")
- @Override
- protected void tearDownContext() {
- if (pod != null) {
- globalAdminClient.getPodClient().deletePod(pod.getId());
- pod = null;
- }
- if (zone != null) {
- globalAdminClient.getZoneApi().deleteZone(zone.getId());
- zone = null;
- }
- super.tearDownContext();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiLiveTest.java
deleted file mode 100644
index 9d0bdfa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiLiveTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.StoragePool;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Strings;
-
-/**
- * Tests behavior of {@code GlobalStoragePoolApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalStoragePoolApiLiveTest")
-public class GlobalStoragePoolApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(groups = "live", enabled = true)
- public void testListStoragePools() throws Exception {
- skipIfNotGlobalAdmin();
-
- Set<StoragePool> result = globalAdminClient.getStoragePoolClient().listStoragePools();
- assertNotNull(result);
- assertTrue(!result.isEmpty());
- for (StoragePool pool : result) {
- assertNotNull(pool.getId());
- assertFalse(Strings.isNullOrEmpty(pool.getName()));
- assertFalse(Strings.isNullOrEmpty(pool.getPath()));
- assertNotNull(pool.getTags());
- assertNotEquals(StoragePool.State.UNRECOGNIZED, pool.getState());
- assertNotEquals(StoragePool.Type.UNRECOGNIZED, pool.getType());
- assertNotNull(pool.getZoneId());
- assertFalse(Strings.isNullOrEmpty(pool.getZoneName()));
- assertNotNull(pool.getPodId());
- assertFalse(Strings.isNullOrEmpty(pool.getPodName()));
- assertNotNull(pool.getClusterId());
- assertFalse(Strings.isNullOrEmpty(pool.getClusterName()));
- assertNotNull(pool.getCreated());
- assertTrue(pool.getDiskSizeTotal() > 0);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiTest.java
deleted file mode 100644
index bf278ed..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolApiTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.ListStoragePoolsOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GlobalStoragePoolApi}
- */
-@Test(groups = "unit", testName = "GlobalStoragePoolApiTest")
-public class GlobalStoragePoolApiTest extends BaseCloudStackApiTest<GlobalStoragePoolApi> {
-
- public void testListStoragePools() throws NoSuchMethodException {
- Invokable<?, ?> method = method(GlobalStoragePoolApi.class, "listStoragePools", ListStoragePoolsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listStoragePools&listAll=true HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListStoragePoolsOptions() throws NoSuchMethodException {
- Invokable<?, ?> method = method(GlobalStoragePoolApi.class, "listStoragePools", ListStoragePoolsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListStoragePoolsOptions.Builder.clusterId("3").id("4").ipAddress("192.168.42.42").keyword("fred").name("bob").path("/mnt/store42").podId("4").zoneId("5")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listStoragePools&listAll=true&clusterid=3&id=4&ipaddress=192.168.42.42&keyword=fred&name=bob&path=/mnt/store42&podid=4&zoneid=5 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiLiveTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiLiveTest.java
deleted file mode 100644
index 14e48e7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiLiveTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.jclouds.cloudstack.domain.JobResult;
-import org.jclouds.cloudstack.domain.UsageRecord;
-import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.GenerateUsageRecordsOptions;
-import org.jclouds.cloudstack.options.ListUsageRecordsOptions;
-import org.testng.annotations.Test;
-
-/**
- * Tests behavior of {@code GlobalUsageApi}
- */
-@Test(groups = "live", singleThreaded = true, testName = "GlobalUsageApiLiveTest")
-public class GlobalUsageApiLiveTest extends BaseCloudStackApiLiveTest {
-
- @Test(groups = "live", enabled = true)
- public void testListUsage() {
- skipIfNotGlobalAdmin();
-
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
- Date end = c.getTime();
- c.add(Calendar.MONTH, -1);
- Date start = c.getTime();
-
- JobResult result = globalAdminClient.getUsageClient().generateUsageRecords(start, end, GenerateUsageRecordsOptions.NONE);
- assertNotNull(result);
- assertTrue(result.isSuccess(), result.getDisplayText());
-
- Set<UsageRecord> records = globalAdminClient.getUsageClient().listUsageRecords(start, end, ListUsageRecordsOptions.NONE);
- assertNotNull(records);
- assertTrue(records.size() >= 0);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiTest.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiTest.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiTest.java
deleted file mode 100644
index 2adf3e1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/test/java/org/jclouds/cloudstack/features/GlobalUsageApiTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
-import org.jclouds.cloudstack.options.GenerateUsageRecordsOptions;
-import org.jclouds.cloudstack.options.ListUsageRecordsOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code GlobalUsageApi}
- */
-@Test(groups = "unit", testName = "GlobalUsageApiTest")
-public class GlobalUsageApiTest extends BaseCloudStackApiTest<GlobalUsageApi> {
-
- public void testGenerateUsageRecords() throws Exception {
- Calendar c = Calendar.getInstance();
- c.set(Calendar.YEAR, 2012);
- c.set(Calendar.MONTH, Calendar.JANUARY);
- c.set(Calendar.DAY_OF_MONTH, 1);
- Date start = c.getTime();
- c.set(Calendar.DAY_OF_MONTH, 31);
- Date end = c.getTime();
-
- Invokable<?, ?> method = method(GlobalUsageApi.class, "generateUsageRecords",
- Date.class, Date.class, GenerateUsageRecordsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(start, end));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=generateUsageRecords&startdate=2012-01-01&enddate=2012-01-31 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testGenerateUsageRecordsOptions() throws Exception {
- Calendar c = Calendar.getInstance();
- c.set(Calendar.YEAR, 2012);
- c.set(Calendar.MONTH, Calendar.JANUARY);
- c.set(Calendar.DAY_OF_MONTH, 1);
- Date start = c.getTime();
- c.set(Calendar.DAY_OF_MONTH, 31);
- Date end = c.getTime();
-
- Invokable<?, ?> method = method(GlobalUsageApi.class, "generateUsageRecords",
- Date.class, Date.class, GenerateUsageRecordsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(start, end, GenerateUsageRecordsOptions.Builder.domainId("42")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=generateUsageRecords&startdate=2012-01-01&enddate=2012-01-31&domainid=42 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListUsageRecords() throws Exception {
- Calendar c = Calendar.getInstance();
- c.set(Calendar.YEAR, 2012);
- c.set(Calendar.MONTH, Calendar.JANUARY);
- c.set(Calendar.DAY_OF_MONTH, 1);
- Date start = c.getTime();
- c.set(Calendar.DAY_OF_MONTH, 31);
- Date end = c.getTime();
-
- Invokable<?, ?> method = method(GlobalUsageApi.class, "listUsageRecords",
- Date.class, Date.class, ListUsageRecordsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(start, end));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listUsageRecords&listAll=true&startdate=2012-01-01&enddate=2012-01-31 HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-
- public void testListUsageRecordsOptions() throws Exception {
- Calendar c = Calendar.getInstance();
- c.set(Calendar.YEAR, 2012);
- c.set(Calendar.MONTH, Calendar.JANUARY);
- c.set(Calendar.DAY_OF_MONTH, 1);
- Date start = c.getTime();
- c.set(Calendar.DAY_OF_MONTH, 31);
- Date end = c.getTime();
-
- Invokable<?, ?> method = method(GlobalUsageApi.class, "listUsageRecords",
- Date.class, Date.class, ListUsageRecordsOptions[].class);
- GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(start, end, ListUsageRecordsOptions.Builder.accountInDomain("fred", "42").accountId("41").keyword("bob")));
-
- assertRequestLineEquals(httpRequest,
- "GET http://localhost:8080/client/api?response=json&command=listUsageRecords&listAll=true&startdate=2012-01-01&enddate=2012-01-31&account=fred&domainid=42&accountid=41&keyword=bob HTTP/1.1");
- assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, null, null, false);
-
- assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
- assertSaxResponseParserClassEquals(method, null);
- assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
- checkFilters(httpRequest);
- }
-}
[08/51] [abbrv] stratos git commit: reformated code
Posted by im...@apache.org.
reformated code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/38630df1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/38630df1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/38630df1
Branch: refs/heads/master
Commit: 38630df1d9a45645543c11d278a058da3839e5c5
Parents: 28d0bbd
Author: asankasa <as...@wso2.com>
Authored: Tue Oct 28 11:28:16 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:29 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/CloudstackIaas.java | 90 +++++++++++++++-----
1 file changed, 68 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/38630df1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index a86e1c8..3048f4d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -1,6 +1,7 @@
package org.apache.stratos.cloud.controller.iaases;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
@@ -15,9 +16,8 @@ import org.apache.stratos.cloud.controller.validate.CloudstackPartitionValidator
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
import org.jclouds.cloudstack.CloudStackApi;
import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.domain.Zone;
+import org.jclouds.cloudstack.domain.*;
+import org.jclouds.cloudstack.features.VolumeApi;
import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions;
import org.jclouds.cloudstack.options.ListZonesOptions;
import org.jclouds.compute.ComputeServiceContext;
@@ -66,7 +66,7 @@ public class CloudstackIaas extends Iaas {
TemplateBuilder templateBuilder = iaasInfo.getComputeService()
.templateBuilder();
- //*************************SET PROPERTIES TO templateBuilder OBJECT*******************************************//
+ //**SET PROPERTIES TO templateBuilder OBJECT**//
/**
* PROPERTY - 1
@@ -77,9 +77,8 @@ public class CloudstackIaas extends Iaas {
/**
* PROPERTY-2
* if user has specified a zone in cloud-controller.xml, set the zone into templateBuilder object
- * (user should provide the zone id for this)
+ * (user should provide the zone id for this, because zone name is not unique in cloudstack)
*/
-
if (iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
Set<? extends Location> locations = iaasInfo.getComputeService().listAssignableLocations();
for (Location location : locations) {
@@ -97,7 +96,7 @@ public class CloudstackIaas extends Iaas {
* PROPERTY-3
* if user has specified an instance type in cloud-controller.xml, set the instance type into templateBuilder
* object.
- *Important:Specify the Service Offering type ID. Not the name. Because the name is not unique.
+ *Important:Specify the Service Offering type ID. Not the name. Because the name is not unique in cloudstack.
*/
if (iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE) != null) {
templateBuilder.hardwareId(iaasInfo.getProperty(CloudControllerConstants.INSTANCE_TYPE));
@@ -122,9 +121,9 @@ public class CloudstackIaas extends Iaas {
.inboundPorts(new int[]{});
- //*******************SET CLOUDSTACK SPECIFIC PROPERTIES TO TEMPLATE OBJECT*********************************//
+ //**SET CLOUDSTACK SPECIFIC PROPERTIES TO TEMPLATE OBJECT**//
- //set security group. If you are using basic zone
+ //set security group- If you are using basic zone
if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS) != null) {
template.getOptions()
.as(CloudStackTemplateOptions.class)
@@ -132,7 +131,12 @@ public class CloudstackIaas extends Iaas {
.split(CloudControllerConstants.ENTRY_SEPARATOR)));
}
- //set network IDs. If you are using Advanced zone
+
+ /**
+ * set network ID - If you are using advanced zone
+ * in cloudstack sometimes we get unautorized exception if we didn't specify the
+ * domain ID and user name
+ */
if (iaasInfo.getProperty(CloudControllerConstants.NETWORK_IDS) != null) {
template.getOptions()
.as(CloudStackTemplateOptions.class)
@@ -152,12 +156,11 @@ public class CloudstackIaas extends Iaas {
}
/**
- * set key-pair (here we use already created key pair for the corresponding account)
- * in cloudstack we cannot access a key pair without specifying user name and domain ID
+ *Set key pair
+ * in cloudstack sometimes we get unauthorized exception if we didn't specify the
+ * domain ID and user name
*/
- if (iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR) != null &&
- iaasInfo.getProperty(CloudControllerConstants.USER_NAME) != null &&
- iaasInfo.getProperty(CloudControllerConstants.DOMAIN_ID) != null) {
+ if (iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR) != null) {
template.getOptions().as(CloudStackTemplateOptions.class)
.keyPair(iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR));
}
@@ -192,11 +195,11 @@ public class CloudstackIaas extends Iaas {
/**
* IMPORTANT
- * In cloudstack we can assign public IPs, if we are using an advances zone only. If we are using a basic zone
+ * In cloudstack we can assign public IPs, if we are using an advanced zone only. If we are using a basic zone
* we cannot assign public ips.
* <p/>
* When we use an advanced zone, a public IP address will get automatically assigned to the vm. So we don't need
- * to find an unallocated IP address and assign that address to the vm (not like in ec2 and openstack).
+ * to find an unallocated IP address and assign that address to the vm (Not like in ec2 and openstack).
* <p/>
* So this method will find the IP that has been assigned to the vm and return it.
*/
@@ -255,7 +258,21 @@ public class CloudstackIaas extends Iaas {
@Override
public boolean createKeyPairFromPublicKey(String region, String keyPairName, String publicKey) {
- //todo implement this method
+
+ IaasProvider iaasInfo = getIaasProvider();
+ ComputeServiceContext context = iaasInfo.getComputeService().getContext();
+ CloudStackApi cloudStackApi = context.unwrapApi(CloudStackApi.class);
+ SshKeyPair sshKeyPair = cloudStackApi.getSSHKeyPairApi().createSSHKeyPair(keyPairName);
+
+ if (sshKeyPair != null) {
+
+ iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class)
+ .keyPair(sshKeyPair.getName());
+
+ log.info("A key-pair is created successfully - Key Pair Name: " + sshKeyPair.getName());
+ return true;
+ }
+ log.error("Key-pair is unable to create");
return false;
}
@@ -307,14 +324,43 @@ public class CloudstackIaas extends Iaas {
@Override
public String createVolume(int sizeGB, String snapshotId) {
- //todo implement this method
+
+ //todo return volume ID if volume is created
+ IaasProvider iaasInfo = getIaasProvider();
+ ComputeServiceContext context = iaasInfo.getComputeService()
+ .getContext();
+
+ String zone = ComputeServiceBuilderUtil.extractZone(iaasInfo);
+ String diskOfferingID = iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class).getDiskOfferingId();
+ if (zone == null && diskOfferingID == null) {
+ log.fatal("Cannot create a new volume in the , [zone] : " + zone + " of Iaas : " + iaasInfo);
+ return null;
+ }
+
+ VolumeApi volumeApi = context.unwrapApi(CloudStackApi.class).getVolumeApi();
+
+ Volume volume;
+ if (StringUtils.isEmpty(snapshotId)) {
+ if (log.isDebugEnabled()) {
+ log.info("Creating a volume in the zone " + zone);
+ }
+
+ //cloudstack jcloud api does not return a volume object
+ volumeApi.createVolumeFromCustomDiskOfferingInZone(null, diskOfferingID, zone, sizeGB);
+
+ // volume = blockStoreApi.createVolumeInAvailabilityZone(zone, sizeGB);
+ } else {
+ if (log.isDebugEnabled()) {
+ log.info("Creating a volume in the zone " + zone + " from the shanpshot " + snapshotId);
+ }
+ volumeApi.createVolumeFromSnapshotInZone(null, diskOfferingID, zone);
+ }
+
return null;
}
@Override
public String attachVolume(String instanceId, String volumeId, String deviceName) {
-
-
IaasProvider iaasInfo = getIaasProvider();
ComputeServiceContext context = iaasInfo.getComputeService()
.getContext();
@@ -430,7 +476,7 @@ public class CloudstackIaas extends Iaas {
}
@Override
- public String getIaasDevice(String device) {//todo implement this method
+ public String getIaasDevice(String device) {//todo implement this method(auto generated method)
return null;
}
[49/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
removed cloudstack dependancy from dependancies folder
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/28833191
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/28833191
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/28833191
Branch: refs/heads/master
Commit: 2883319123c65580c6fb5ce8b1ac604f4239b17e
Parents: febc896
Author: asankasa <as...@wso2.com>
Authored: Wed Oct 29 14:52:40 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:30 2014 +0530
----------------------------------------------------------------------
.../apis/cloudstack/1.8.0-stratos/pom.xml | 149 -
.../jclouds/cloudstack/AsyncJobException.java | 35 -
.../org/jclouds/cloudstack/CloudStackApi.java | 198 --
.../cloudstack/CloudStackApiMetadata.java | 86 -
.../jclouds/cloudstack/CloudStackContext.java | 33 -
.../jclouds/cloudstack/CloudStackDomainApi.java | 60 -
.../jclouds/cloudstack/CloudStackGlobalApi.java | 127 -
...tSecurityGroupPairsToIndexedQueryParams.java | 55 -
.../BindCIDRsToCommaDelimitedQueryParam.java | 41 -
.../BindIdListToCommaDelimitedQueryParam.java | 41 -
.../BindSnapshotPolicyScheduleToQueryParam.java | 43 -
.../BindTemplateMetadataToQueryParams.java | 53 -
.../binders/ResourceLimitToQueryParams.java | 48 -
.../compute/CloudStackComputeService.java | 180 -
.../CloudStackComputeServiceContextModule.java | 291 --
.../extensions/CloudStackImageExtension.java | 160 -
.../CloudStackSecurityGroupExtension.java | 282 --
.../CloudStackSecurityGroupToSecurityGroup.java | 66 -
.../functions/IngressRuleToIpPermission.java | 58 -
.../functions/OrphanedGroupsByZoneId.java | 73 -
.../functions/ServiceOfferingToHardware.java | 50 -
.../compute/functions/TemplateToImage.java | 67 -
.../functions/TemplateToOperatingSystem.java | 88 -
.../functions/VirtualMachineToNodeMetadata.java | 179 -
.../compute/functions/ZoneToLocation.java | 52 -
.../compute/loaders/CreateUniqueKeyPair.java | 64 -
.../loaders/FindSecurityGroupOrCreate.java | 74 -
.../options/CloudStackTemplateOptions.java | 509 ---
.../predicates/AllNodesInGroupTerminated.java | 53 -
.../AdvancedNetworkOptionsConverter.java | 59 -
.../strategy/BasicNetworkOptionsConverter.java | 41 -
.../CloudStackComputeServiceAdapter.java | 476 ---
.../compute/strategy/OptionsConverter.java | 43 -
.../config/CloudStackHttpApiModule.java | 154 -
.../config/CloudStackParserModule.java | 105 -
.../cloudstack/config/CloudStackProperties.java | 52 -
.../cloudstack/config/CredentialType.java | 42 -
.../org/jclouds/cloudstack/domain/Account.java | 789 -----
.../org/jclouds/cloudstack/domain/Alert.java | 163 -
.../cloudstack/domain/AllocationState.java | 42 -
.../jclouds/cloudstack/domain/ApiKeyPair.java | 125 -
.../cloudstack/domain/AsyncCreateResponse.java | 132 -
.../org/jclouds/cloudstack/domain/AsyncJob.java | 456 ---
.../cloudstack/domain/AsyncJobError.java | 162 -
.../jclouds/cloudstack/domain/Capabilities.java | 188 --
.../org/jclouds/cloudstack/domain/Capacity.java | 287 --
.../org/jclouds/cloudstack/domain/Cluster.java | 302 --
.../cloudstack/domain/ConfigurationEntry.java | 166 -
.../jclouds/cloudstack/domain/DiskOffering.java | 295 --
.../org/jclouds/cloudstack/domain/Domain.java | 220 --
.../domain/EncryptedPasswordAndPrivateKey.java | 114 -
.../org/jclouds/cloudstack/domain/Event.java | 333 --
.../jclouds/cloudstack/domain/ExtractMode.java | 32 -
.../jclouds/cloudstack/domain/FirewallRule.java | 338 --
.../jclouds/cloudstack/domain/GuestIPType.java | 60 -
.../org/jclouds/cloudstack/domain/Host.java | 959 ------
.../cloudstack/domain/IPForwardingRule.java | 396 ---
.../java/org/jclouds/cloudstack/domain/ISO.java | 767 -----
.../cloudstack/domain/ISOExtraction.java | 368 ---
.../cloudstack/domain/ISOPermissions.java | 178 -
.../jclouds/cloudstack/domain/IngressRule.java | 278 --
.../jclouds/cloudstack/domain/JobResult.java | 126 -
.../cloudstack/domain/LoadBalancerRule.java | 444 ---
.../cloudstack/domain/LoginResponse.java | 339 --
.../java/org/jclouds/cloudstack/domain/NIC.java | 325 --
.../org/jclouds/cloudstack/domain/Network.java | 748 -----
.../cloudstack/domain/NetworkOffering.java | 356 --
.../domain/NetworkOfferingAvailabilityType.java | 45 -
.../cloudstack/domain/NetworkService.java | 242 --
.../jclouds/cloudstack/domain/NetworkType.java | 45 -
.../org/jclouds/cloudstack/domain/OSType.java | 156 -
.../cloudstack/domain/PermissionOperation.java | 32 -
.../java/org/jclouds/cloudstack/domain/Pod.java | 283 --
.../cloudstack/domain/PortForwardingRule.java | 432 ---
.../org/jclouds/cloudstack/domain/Project.java | 242 --
.../cloudstack/domain/PublicIPAddress.java | 568 ----
.../cloudstack/domain/ResourceLimit.java | 271 --
.../cloudstack/domain/SecurityGroup.java | 289 --
.../cloudstack/domain/ServiceOffering.java | 457 ---
.../org/jclouds/cloudstack/domain/Snapshot.java | 442 ---
.../cloudstack/domain/SnapshotPolicy.java | 217 --
.../domain/SnapshotPolicySchedule.java | 127 -
.../jclouds/cloudstack/domain/SshKeyPair.java | 144 -
.../jclouds/cloudstack/domain/StoragePool.java | 483 ---
.../jclouds/cloudstack/domain/StorageType.java | 45 -
.../jclouds/cloudstack/domain/SystemVmType.java | 44 -
.../org/jclouds/cloudstack/domain/Template.java | 869 -----
.../cloudstack/domain/TemplateExtraction.java | 368 ---
.../cloudstack/domain/TemplateFilter.java | 64 -
.../cloudstack/domain/TemplateMetadata.java | 236 --
.../cloudstack/domain/TemplatePermission.java | 178 -
.../jclouds/cloudstack/domain/TrafficType.java | 66 -
.../jclouds/cloudstack/domain/UsageRecord.java | 515 ---
.../org/jclouds/cloudstack/domain/User.java | 412 ---
.../org/jclouds/cloudstack/domain/VMGroup.java | 217 --
.../cloudstack/domain/VirtualMachine.java | 1049 ------
.../jclouds/cloudstack/domain/VlanIPRange.java | 372 ---
.../org/jclouds/cloudstack/domain/Volume.java | 739 -----
.../org/jclouds/cloudstack/domain/Zone.java | 435 ---
.../jclouds/cloudstack/domain/ZoneAndName.java | 93 -
.../domain/ZoneSecurityGroupNamePortsCidrs.java | 158 -
.../jclouds/cloudstack/features/AccountApi.java | 78 -
.../jclouds/cloudstack/features/AddressApi.java | 112 -
.../cloudstack/features/AsyncJobApi.java | 78 -
.../cloudstack/features/ConfigurationApi.java | 53 -
.../cloudstack/features/DomainAccountApi.java | 83 -
.../cloudstack/features/DomainDomainApi.java | 99 -
.../cloudstack/features/DomainLimitApi.java | 56 -
.../cloudstack/features/DomainUserApi.java | 91 -
.../jclouds/cloudstack/features/EventApi.java | 72 -
.../cloudstack/features/FirewallApi.java | 215 --
.../cloudstack/features/GlobalAccountApi.java | 103 -
.../cloudstack/features/GlobalAlertApi.java | 60 -
.../cloudstack/features/GlobalCapacityApi.java | 60 -
.../features/GlobalConfigurationApi.java | 83 -
.../cloudstack/features/GlobalDomainApi.java | 108 -
.../cloudstack/features/GlobalHostApi.java | 247 --
.../cloudstack/features/GlobalOfferingApi.java | 178 -
.../cloudstack/features/GlobalPodApi.java | 148 -
.../features/GlobalStoragePoolApi.java | 50 -
.../cloudstack/features/GlobalUsageApi.java | 63 -
.../cloudstack/features/GlobalUserApi.java | 114 -
.../cloudstack/features/GlobalVlanApi.java | 105 -
.../cloudstack/features/GlobalZoneApi.java | 103 -
.../jclouds/cloudstack/features/GuestOSApi.java | 110 -
.../cloudstack/features/HypervisorApi.java | 62 -
.../org/jclouds/cloudstack/features/ISOApi.java | 219 --
.../jclouds/cloudstack/features/LimitApi.java | 58 -
.../cloudstack/features/LoadBalancerApi.java | 247 --
.../org/jclouds/cloudstack/features/NATApi.java | 169 -
.../jclouds/cloudstack/features/NetworkApi.java | 119 -
.../cloudstack/features/OfferingApi.java | 148 -
.../jclouds/cloudstack/features/ProjectApi.java | 76 -
.../cloudstack/features/SSHKeyPairApi.java | 118 -
.../cloudstack/features/SecurityGroupApi.java | 245 --
.../jclouds/cloudstack/features/SessionApi.java | 78 -
.../cloudstack/features/SnapshotApi.java | 171 -
.../cloudstack/features/TemplateApi.java | 294 --
.../jclouds/cloudstack/features/VMGroupApi.java | 114 -
.../cloudstack/features/VirtualMachineApi.java | 258 --
.../jclouds/cloudstack/features/VolumeApi.java | 170 -
.../jclouds/cloudstack/features/ZoneApi.java | 79 -
.../AddSessionKeyAndJSessionIdToRequest.java | 55 -
.../filters/AuthenticationFilter.java | 30 -
.../jclouds/cloudstack/filters/QuerySigner.java | 141 -
.../functions/CloudStackFallbacks.java | 52 -
.../functions/CreateFirewallRulesForIP.java | 90 -
.../CreatePortForwardingRulesForIP.java | 88 -
.../functions/CreateSecurityGroupIfNeeded.java | 111 -
.../cloudstack/functions/DateToYyyyMmDd.java | 39 -
.../GetFirewallRulesByVirtualMachine.java | 49 -
.../GetIPForwardingRulesByVirtualMachine.java | 48 -
.../ParseAsyncJobFromHttpResponse.java | 51 -
.../ParseAsyncJobsFromHttpResponse.java | 58 -
.../ParseEventTypesFromHttpResponse.java | 79 -
.../ParseIdToNameEntryFromHttpResponse.java | 46 -
.../ParseIdToNameFromHttpResponse.java | 80 -
.../ParseLoginResponseFromHttpResponse.java | 55 -
.../functions/ParseNamesFromHttpResponse.java | 77 -
.../functions/ParseTypedAsyncJob.java | 129 -
.../ReuseOrAssociateNewPublicIPAddress.java | 101 -
.../StaticNATVirtualMachineInNetwork.java | 78 -
...indowsLoginCredentialsFromEncryptedData.java | 80 -
.../cloudstack/functions/ZoneIdToZone.java | 47 -
.../handlers/CloudStackErrorHandler.java | 104 -
...ateSessionAndRetryOn401AndLogoutOnClose.java | 77 -
.../internal/CloudStackContextImpl.java | 67 -
.../loaders/LoginWithPasswordCredentials.java | 60 -
.../options/AccountInDomainOptions.java | 72 -
.../cloudstack/options/AddClusterOptions.java | 109 -
.../cloudstack/options/AddHostOptions.java | 112 -
.../options/AddSecondaryStorageOptions.java | 50 -
.../options/AssignVirtualMachineOptions.java | 156 -
.../options/AssociateIPAddressOptions.java | 101 -
.../options/CreateAccountOptions.java | 85 -
.../options/CreateDiskOfferingOptions.java | 119 -
.../cloudstack/options/CreateDomainOptions.java | 70 -
.../options/CreateFirewallRuleOptions.java | 124 -
.../options/CreateIPForwardingRuleOptions.java | 54 -
.../options/CreateLoadBalancerRuleOptions.java | 135 -
.../options/CreateNetworkOptions.java | 236 --
.../cloudstack/options/CreatePodOptions.java | 44 -
.../options/CreateServiceOfferingOptions.java | 209 --
.../options/CreateSnapshotOptions.java | 64 -
.../options/CreateTemplateOptions.java | 127 -
.../cloudstack/options/CreateUserOptions.java | 70 -
.../options/CreateVMGroupOptions.java | 84 -
.../options/CreateVlanIPRangeOptions.java | 128 -
.../cloudstack/options/CreateZoneOptions.java | 174 -
.../cloudstack/options/DeleteHostOptions.java | 63 -
.../cloudstack/options/DeleteISOOptions.java | 51 -
.../options/DeleteTemplateOptions.java | 54 -
.../options/DeployVirtualMachineOptions.java | 378 ---
.../cloudstack/options/ExtractISOOptions.java | 51 -
.../options/ExtractTemplateOptions.java | 44 -
.../options/GenerateUsageRecordsOptions.java | 41 -
.../cloudstack/options/ListAccountsOptions.java | 153 -
.../cloudstack/options/ListAlertsOptions.java | 65 -
.../options/ListAsyncJobsOptions.java | 93 -
.../cloudstack/options/ListCapacityOptions.java | 86 -
.../cloudstack/options/ListClustersOptions.java | 121 -
.../ListConfigurationEntriesOptions.java | 113 -
.../options/ListDiskOfferingsOptions.java | 88 -
.../options/ListDomainChildrenOptions.java | 131 -
.../cloudstack/options/ListDomainsOptions.java | 130 -
.../options/ListEgressFirewallRulesOptions.java | 178 -
.../cloudstack/options/ListEventsOptions.java | 140 -
.../options/ListFirewallRulesOptions.java | 161 -
.../cloudstack/options/ListHostsOptions.java | 262 --
.../options/ListIPForwardingRulesOptions.java | 137 -
.../cloudstack/options/ListISOsOptions.java | 247 --
.../options/ListLoadBalancerRulesOptions.java | 198 --
.../options/ListNetworkOfferingsOptions.java | 191 --
.../cloudstack/options/ListNetworksOptions.java | 207 --
.../cloudstack/options/ListOSTypesOptions.java | 70 -
.../cloudstack/options/ListPodsOptions.java | 80 -
.../options/ListPortForwardingRulesOptions.java | 118 -
.../cloudstack/options/ListProjectsOptions.java | 170 -
.../options/ListPublicIPAddressesOptions.java | 207 --
.../options/ListResourceLimitsOptions.java | 151 -
.../options/ListSSHKeyPairsOptions.java | 63 -
.../options/ListSecurityGroupsOptions.java | 137 -
.../options/ListServiceOfferingsOptions.java | 108 -
.../options/ListSnapshotPoliciesOptions.java | 63 -
.../options/ListSnapshotsOptions.java | 171 -
.../options/ListStoragePoolsOptions.java | 116 -
.../options/ListTemplatesOptions.java | 175 -
.../options/ListUsageRecordsOptions.java | 111 -
.../cloudstack/options/ListUsersOptions.java | 188 --
.../cloudstack/options/ListVMGroupsOptions.java | 132 -
.../options/ListVirtualMachinesOptions.java | 243 --
.../options/ListVlanIPRangesOptions.java | 127 -
.../cloudstack/options/ListVolumesOptions.java | 233 --
.../cloudstack/options/ListZonesOptions.java | 91 -
.../cloudstack/options/RegisterISOOptions.java | 138 -
.../options/RegisterTemplateOptions.java | 155 -
.../options/StopVirtualMachineOptions.java | 54 -
.../options/UpdateAccountOptions.java | 54 -
.../options/UpdateClusterOptions.java | 111 -
.../options/UpdateDiskOfferingOptions.java | 100 -
.../cloudstack/options/UpdateDomainOptions.java | 70 -
.../cloudstack/options/UpdateHostOptions.java | 83 -
.../cloudstack/options/UpdateISOOptions.java | 126 -
.../options/UpdateISOPermissionsOptions.java | 113 -
.../options/UpdateLoadBalancerRuleOptions.java | 85 -
.../options/UpdateNetworkOfferingOptions.java | 120 -
.../cloudstack/options/UpdatePodOptions.java | 89 -
.../options/UpdateServiceOfferingOptions.java | 100 -
.../options/UpdateTemplateOptions.java | 114 -
.../UpdateTemplatePermissionsOptions.java | 118 -
.../cloudstack/options/UpdateUserOptions.java | 167 -
.../options/UpdateVMGroupOptions.java | 52 -
.../cloudstack/options/UpdateZoneOptions.java | 258 --
.../predicates/CorrectHypervisorForZone.java | 94 -
.../cloudstack/predicates/JobComplete.java | 67 -
.../predicates/LoadBalancerRuleActive.java | 61 -
.../predicates/NetworkOfferingPredicates.java | 55 -
.../predicates/NetworkPredicates.java | 265 --
.../cloudstack/predicates/OSCategoryIn.java | 86 -
.../predicates/PublicIPAddressPredicates.java | 85 -
.../predicates/SecurityGroupPredicates.java | 236 --
.../predicates/SshKeyPairPredicates.java | 75 -
.../predicates/TemplatePredicates.java | 62 -
.../cloudstack/predicates/UserPredicates.java | 103 -
.../predicates/VirtualMachineDestroyed.java | 62 -
.../predicates/VirtualMachineExpunged.java | 56 -
.../predicates/VirtualMachineRunning.java | 64 -
.../cloudstack/predicates/ZonePredicates.java | 73 -
.../BlockUntilJobCompletesAndReturnResult.java | 69 -
.../cloudstack/suppliers/GetCurrentUser.java | 65 -
.../suppliers/NetworksForCurrentUser.java | 60 -
.../suppliers/ProjectsForCurrentUser.java | 60 -
.../suppliers/ZoneIdToZoneSupplier.java | 48 -
.../jclouds/cloudstack/util/ApiKeyPairs.java | 85 -
.../util/SnapshotPolicySchedules.java | 41 -
.../services/org.jclouds.apis.ApiMetadata | 1 -
.../cloudstack/CloudStackApiMetadataTest.java | 28 -
.../CloudStackContextBuilderTest.java | 34 -
.../PasswordAuthenticationExpectTest.java | 72 -
...oudStackComputeServiceAdapterExpectTest.java | 455 ---
...CloudStackComputeServiceAdapterLiveTest.java | 138 -
.../CloudStackComputeServiceLiveTest.java | 54 -
.../compute/CloudStackExperimentLiveTest.java | 119 -
.../CloudStackImageExtensionExpectTest.java | 192 --
.../CloudStackImageExtensionLiveTest.java | 40 -
...udStackSecurityGroupExtensionExpectTest.java | 699 ----
...loudStackSecurityGroupExtensionLiveTest.java | 65 -
...udStackSecurityGroupToSecurityGroupTest.java | 72 -
.../IngressRuleToIpPermissionTest.java | 58 -
.../ServiceOfferingToHardwareTest.java | 58 -
.../compute/functions/TemplateToImageTest.java | 78 -
.../TemplateToOperatingSystemTest.java | 86 -
.../VirtualMachineToNodeMetadataTest.java | 187 --
.../compute/functions/ZoneToLocationTest.java | 61 -
.../loaders/CreateUniqueKeyPairTest.java | 69 -
.../loaders/FindSecurityGroupOrCreateTest.java | 257 --
.../options/CloudStackTemplateOptionsTest.java | 261 --
.../compute/strategy/OptionsConverterTest.java | 118 -
.../cloudstack/domain/VirtualMachineTest.java | 52 -
.../features/AccountApiExpectTest.java | 105 -
.../cloudstack/features/AccountApiLiveTest.java | 80 -
.../cloudstack/features/AccountApiTest.java | 96 -
.../cloudstack/features/AddressApiLiveTest.java | 94 -
.../cloudstack/features/AddressApiTest.java | 135 -
.../features/AsyncJobApiLiveTest.java | 72 -
.../cloudstack/features/AsyncJobApiTest.java | 94 -
.../features/ConfigurationApiLiveTest.java | 35 -
.../features/ConfigurationApiTest.java | 55 -
.../features/DomainAccountApiLiveTest.java | 64 -
.../features/DomainAccountApiTest.java | 67 -
.../features/DomainDomainApiExpectTest.java | 156 -
.../features/DomainDomainApiLiveTest.java | 97 -
.../features/DomainLimitApiLiveTest.java | 28 -
.../cloudstack/features/DomainLimitApiTest.java | 57 -
.../features/DomainUserApiLiveTest.java | 91 -
.../cloudstack/features/EventApiLiveTest.java | 67 -
.../cloudstack/features/EventApiTest.java | 90 -
.../features/FirewallApiExpectTest.java | 402 ---
.../features/FirewallApiLiveTest.java | 233 --
.../cloudstack/features/FirewallApiTest.java | 116 -
.../features/GlobalAccountApiLiveTest.java | 67 -
.../features/GlobalAccountApiTest.java | 109 -
.../features/GlobalAlertApiLiveTest.java | 53 -
.../cloudstack/features/GlobalAlertApiTest.java | 73 -
.../features/GlobalCapacityApiLiveTest.java | 54 -
.../features/GlobalCapacityApiTest.java | 72 -
.../GlobalConfigurationApiExpectTest.java | 125 -
.../GlobalConfigurationApiLiveTest.java | 99 -
.../features/GlobalDomainApiExpectTest.java | 144 -
.../features/GlobalDomainApiLiveTest.java | 78 -
.../features/GlobalHostApiExpectTest.java | 375 ---
.../features/GlobalHostApiLiveTest.java | 91 -
.../cloudstack/features/GlobalHostApiTest.java | 51 -
.../features/GlobalOfferingApiLiveTest.java | 152 -
.../features/GlobalOfferingApiTest.java | 167 -
.../features/GlobalPodApiExpectTest.java | 206 --
.../features/GlobalPodApiLiveTest.java | 129 -
.../features/GlobalStoragePoolApiLiveTest.java | 63 -
.../features/GlobalStoragePoolApiTest.java | 67 -
.../features/GlobalUsageApiLiveTest.java | 58 -
.../cloudstack/features/GlobalUsageApiTest.java | 139 -
.../features/GlobalUserApiLiveTest.java | 104 -
.../cloudstack/features/GlobalUserApiTest.java | 98 -
.../features/GlobalVlanApiExpectTest.java | 169 -
.../features/GlobalVlanApiLiveTest.java | 135 -
.../features/GlobalZoneApiExpectTest.java | 133 -
.../features/GlobalZoneApiLiveTest.java | 65 -
.../cloudstack/features/GuestOSApiLiveTest.java | 73 -
.../cloudstack/features/GuestOSApiTest.java | 130 -
.../features/HypervisorApiLiveTest.java | 43 -
.../cloudstack/features/HypervisorApiTest.java | 72 -
.../cloudstack/features/ISOApiExpectTest.java | 221 --
.../cloudstack/features/ISOApiLiveTest.java | 108 -
.../jclouds/cloudstack/features/ISOApiTest.java | 279 --
.../cloudstack/features/LimitApiLiveTest.java | 44 -
.../cloudstack/features/LimitApiTest.java | 71 -
.../features/LoadBalancerApiLiveTest.java | 226 --
.../features/LoadBalancerApiTest.java | 159 -
.../cloudstack/features/NATApiLiveTest.java | 63 -
.../jclouds/cloudstack/features/NATApiTest.java | 200 --
.../cloudstack/features/NetworkApiLiveTest.java | 186 --
.../cloudstack/features/NetworkApiTest.java | 171 -
.../features/OfferingApiLiveTest.java | 110 -
.../cloudstack/features/OfferingApiTest.java | 204 --
.../features/ProjectApiExpectTest.java | 77 -
.../cloudstack/features/ProjectApiLiveTest.java | 46 -
.../cloudstack/features/ProjectApiTest.java | 96 -
.../features/SSHKeyPairApiExpectTest.java | 182 -
.../features/SSHKeyPairApiLiveTest.java | 92 -
.../cloudstack/features/SSHKeyPairApiTest.java | 135 -
.../features/SecurityGroupApiLiveTest.java | 234 --
.../features/SecurityGroupApiTest.java | 297 --
.../features/SessionApiExpectTest.java | 95 -
.../cloudstack/features/SessionApiLiveTest.java | 91 -
.../features/SnapshotApiLiveTest.java | 141 -
.../cloudstack/features/SnapshotApiTest.java | 240 --
.../features/TemplateApiLiveTest.java | 217 --
.../cloudstack/features/TemplateApiTest.java | 400 ---
.../cloudstack/features/VMGroupApiLiveTest.java | 69 -
.../cloudstack/features/VMGroupApiTest.java | 169 -
.../features/VirtualMachineApiExpectTest.java | 119 -
.../features/VirtualMachineApiLiveTest.java | 397 ---
.../features/VirtualMachineApiTest.java | 259 --
.../features/VolumeApiExpectTest.java | 61 -
.../cloudstack/features/VolumeApiLiveTest.java | 264 --
.../cloudstack/features/VolumeApiTest.java | 162 -
.../cloudstack/features/ZoneApiExpectTest.java | 90 -
.../cloudstack/features/ZoneApiLiveTest.java | 72 -
.../cloudstack/features/ZoneApiTest.java | 105 -
.../cloudstack/filters/QuerySignerTest.java | 95 -
...ockUntilJobCompletesAndReturnResultTest.java | 116 -
.../CreateSecurityGroupIfNeededTest.java | 233 --
.../ParseAsyncJobFromHttpResponseTest.java | 217 --
.../ParseAsyncJobsFromHttpResponseTest.java | 54 -
.../ReuseOrAssociateNewPublicIPAddressTest.java | 103 -
...taticNATVirtualMachineInNetworkLiveTest.java | 121 -
...wsLoginCredentialsFromEncryptedDataTest.java | 68 -
.../handlers/CloudStackErrorHandlerTest.java | 159 -
...essionAndRetryOn401AndLogoutOnCloseTest.java | 86 -
.../internal/BaseCloudStackApiLiveTest.java | 274 --
.../internal/BaseCloudStackApiTest.java | 56 -
...oudStackComputeServiceContextExpectTest.java | 259 --
.../internal/BaseCloudStackExpectTest.java | 84 -
.../LoginWithPasswordCredentialsTest.java | 78 -
.../options/AddClusterOptionsTest.java | 87 -
.../cloudstack/options/AddHostOptionsTest.java | 88 -
.../options/AddSecondaryStorageOptionsTest.java | 42 -
.../options/AssociateIPAddressOptionsTest.java | 54 -
.../options/CreateAccountOptionsTest.java | 63 -
.../options/CreateDiskOfferingOptionsTest.java | 66 -
.../CreateIPForwardingRuleOptionsTest.java | 41 -
.../options/CreateNetworkOptionsTest.java | 132 -
.../options/CreatePodOptionsTest.java | 43 -
.../CreateServiceOfferingOptionsTest.java | 123 -
.../options/CreateUserOptionsTest.java | 52 -
.../options/CreateVlanIPRangeOptionsTest.java | 132 -
.../options/DeleteHostOptionsTest.java | 53 -
.../GenerateUsageRecordsOptionsTest.java | 41 -
.../options/ListAccountsOptionsTest.java | 108 -
.../options/ListAlertsOptionsTest.java | 63 -
.../options/ListAsyncJobsOptionsTest.java | 66 -
.../options/ListCapacityOptionsTest.java | 86 -
.../options/ListClustersOptionsTest.java | 132 -
.../options/ListDiskOfferingsOptionsTest.java | 64 -
.../options/ListHostsOptionsTest.java | 165 -
.../ListIPForwardingRulesOptionsTest.java | 87 -
.../cloudstack/options/ListISOsOptionsTest.java | 167 -
.../ListLoadBalancerRulesOptionsTest.java | 131 -
.../ListNetworkOfferingsOptionsTest.java | 132 -
.../options/ListNetworksOptionsTest.java | 142 -
.../options/ListOSTypesOptionsTest.java | 52 -
.../cloudstack/options/ListPodsOptionsTest.java | 87 -
.../ListPortForwardingRulesOptionsTest.java | 66 -
.../ListPublicIPAddressesOptionsTest.java | 131 -
.../options/ListSecurityGroupsOptionsTest.java | 85 -
.../ListServiceOfferingsOptionsTest.java | 74 -
.../options/ListStoragePoolsOptionsTest.java | 119 -
.../options/ListTemplatesOptionsTest.java | 114 -
.../options/ListUsageRecordsOptionsTest.java | 95 -
.../options/ListUsersOptionsTest.java | 129 -
.../options/ListVirtualMachesOptionsTest.java | 152 -
.../options/ListVlanIPRangesOptionsTest.java | 132 -
.../options/ListZonesOptionsTest.java | 63 -
.../options/UpdateAccountOptionsTest.java | 41 -
.../options/UpdateClusterOptionsTest.java | 65 -
.../options/UpdateDiskOfferingOptionsTest.java | 54 -
.../options/UpdateHostOptionsTest.java | 66 -
.../UpdateNetworkOfferingOptionsTest.java | 64 -
.../options/UpdatePodOptionsTest.java | 98 -
.../UpdateServiceOfferingOptionsTest.java | 54 -
.../options/UpdateUserOptionsTest.java | 107 -
.../DeleteIPForwardingRuleResponseTest.java | 37 -
.../parse/DeleteNetworkResponseTest.java | 37 -
.../DeployVirtualMachineResponse3xTest.java | 37 -
.../DeployVirtualMachineResponse4xTest.java | 38 -
.../parse/DisableStaticNATResponseTest.java | 37 -
...TResponseWhereResponseDoesntHaveJobTest.java | 42 -
.../cloudstack/parse/JobResultResponseTest.java | 38 -
.../parse/ListAccountsResponseTest.java | 96 -
.../parse/ListAlertsResponseTest.java | 69 -
.../parse/ListCapabilitiesResponseTest.java | 39 -
.../parse/ListCapacityResponseTest.java | 48 -
.../parse/ListClustersResponseTest.java | 65 -
.../ListConfigurationEntriesResponseTest.java | 63 -
.../parse/ListDiskOfferingsResponseTest.java | 54 -
.../parse/ListDomainsResponseTest.java | 60 -
.../parse/ListFirewallRulesResponseTest.java | 66 -
.../cloudstack/parse/ListHostsResponseTest.java | 153 -
.../parse/ListHypervisorsResponseTest.java | 47 -
.../ListIPForwardingRulesResponseTest.java | 45 -
.../ListLoadBalancerRulesResponseTest.java | 64 -
.../parse/ListNetworkOfferingsResponseTest.java | 50 -
.../parse/ListNetworksResponseTest.java | 87 -
.../parse/ListOSCategoriesResponseTest.java | 49 -
.../parse/ListOSTypesResponseTest.java | 192 --
.../cloudstack/parse/ListPodsResponseTest.java | 64 -
.../ListPortForwardingRulesResponseTest.java | 65 -
.../ListPublicIPAddressesResponseTest.java | 47 -
.../parse/ListSSHKeyPairsResponseTest.java | 60 -
.../parse/ListSecurityGroupsResponseTest.java | 89 -
.../parse/ListServiceOfferingsResponseTest.java | 54 -
.../parse/ListStoragePoolsResponseTest.java | 67 -
.../parse/ListTemplatesResponseTest.java | 77 -
.../parse/ListUsageRecordsResponseTest.java | 72 -
.../ListVirtualMachinesResponse3xTest.java | 76 -
.../parse/ListVirtualMachinesResponseTest.java | 75 -
.../parse/ListVlanIPRangesResponseTest.java | 71 -
.../cloudstack/parse/ListZonesResponseTest.java | 44 -
.../parse/RegisterUserKeysResponseTest.java | 40 -
.../cloudstack/predicates/JobCompleteTest.java | 79 -
.../predicates/NetworkPredicatesTest.java | 109 -
.../cloudstack/predicates/OSCategoryInTest.java | 85 -
.../PublicIPAddressPredicatesTest.java | 64 -
.../predicates/SecurityGroupPredicatesTest.java | 107 -
.../predicates/TemplatePredicatesTest.java | 49 -
.../predicates/UserPredicatesTest.java | 64 -
.../predicates/VirtualMachineDestroyedTest.java | 68 -
.../predicates/VirtualMachineExpungedTest.java | 64 -
.../predicates/VirtualMachineRunningTest.java | 82 -
.../predicates/ZonePredicatesTest.java | 51 -
.../src/test/resources/addclusterresponse.json | 1 -
.../src/test/resources/addhostresponse.json | 2 -
.../resources/addsecondarystorageresponse.json | 3 -
.../authorizesecuritygroupingressresponse.json | 2 -
.../cancelhostmaintenanceresponse.json | 1 -
.../test/resources/createdomainresponse.json | 2 -
.../createegressfirewallrulesresponse.json | 1 -
.../resources/createfirewallrulesresponse.json | 1 -
.../test/resources/createkeypairresponse.json | 1 -
.../src/test/resources/createpodresponse.json | 1 -
.../createportforwardingrulesresponse.json | 1 -
.../resources/createsecuritygroupresponse.json | 3 -
.../resources/createsshkeypairresponse-2.json | 4 -
.../resources/createsshkeypairresponse.json | 4 -
.../createtemplateresponse-imageextension.json | 1 -
.../test/resources/createtemplateresponse.json | 1 -
.../resources/createvlaniprangeresponse.json | 1 -
.../src/test/resources/createzoneresponse.json | 4 -
.../test/resources/deletedomainresponse.json | 1 -
.../deleteegressfirewallrulesresponse.json | 1 -
.../resources/deletefirewallrulesresponse.json | 1 -
.../deleteipforwardingruleresponse.json | 1 -
.../test/resources/deletenetworkresponse.json | 1 -
.../deleteportforwardingrulesresponse.json | 1 -
.../resources/deletesecuritygroupresponse.json | 1 -
.../test/resources/deletetemplateresponse.json | 1 -
.../src/test/resources/deletezoneresponse.json | 1 -
.../resources/deployvirtualmachineresponse.json | 1 -
.../deployvirtualmachineresponse4x.json | 1 -
.../resources/disablestaticnatresponse.json | 1 -
.../enablestaticnatresponse-withoutjob.json | 1 -
.../src/test/resources/getdomainresponse.json | 2 -
.../getegressfirewallrulesresponse.json | 2 -
.../resources/getfirewallrulesresponse.json | 2 -
.../src/test/resources/getisoresponse.json | 1 -
.../getportforwardingrulesresponse.json | 2 -
.../resources/getsecuritygroupresponse.json | 1 -
...getsecuritygroupresponse_extension_byid.json | 1 -
...uritygroupresponse_extension_byid_empty.json | 1 -
...ygroupresponse_extension_byid_with_cidr.json | 1 -
...groupresponse_extension_byid_with_group.json | 1 -
.../test/resources/getvmpasswordresponse.json | 2 -
.../src/test/resources/getzoneresponse-2.json | 1 -
.../src/test/resources/getzoneresponse.json | 1 -
.../test/resources/listaccountsresponse.json | 1 -
.../src/test/resources/listalertsresponse.json | 1 -
.../test/resources/listasyncjobsresponse.json | 3119 ------------------
.../resources/listcapabilitiesresponse.json | 1 -
.../test/resources/listcapacityresponse.json | 1 -
.../test/resources/listclustersresponse.json | 1 -
.../resources/listconfigurationsresponse.json | 4 -
.../resources/listdiskofferingsresponse.json | 1 -
.../resources/listdomainchildrenresponse.json | 3 -
.../src/test/resources/listdomainsresponse.json | 3 -
.../listegressfirewallrulesresponse.json | 4 -
.../test/resources/listeventtypesresponse.json | 1 -
.../resources/listfirewallrulesresponse.json | 4 -
.../src/test/resources/listhostsresponse.json | 5 -
.../test/resources/listhypervisorsresponse.json | 1 -
.../listipforwardingrulesresponse.json | 17 -
.../src/test/resources/listisosresponse.json | 1 -
.../listloadbalancerrulesresponse.json | 2 -
.../resources/listnetworkofferingsresponse.json | 1 -
.../test/resources/listnetworksresponse-2.json | 1 -
.../test/resources/listnetworksresponse.json | 1 -
.../resources/listoscategoriesresponse.json | 1 -
.../src/test/resources/listostypesresponse.json | 1 -
.../src/test/resources/listpodsresponse.json | 1 -
.../listportforwardingrulesresponse.json | 1 -
.../test/resources/listprojectsresponse.json | 1 -
.../listpublicipaddressesresponse.json | 1 -
.../resources/listresourcelimitsresponse.json | 9 -
.../resources/listsecuritygroupsresponse.json | 1 -
.../resources/listserviceofferingsresponse.json | 1 -
.../test/resources/listsshkeypairsresponse.json | 2 -
.../resources/liststoragepoolsresponse.json | 1 -
.../listtemplatesresponse-imageextension.json | 1 -
.../test/resources/listtemplatesresponse.json | 1 -
.../resources/listusagerecordsresponse.json | 1 -
...tvirtualmachinesresponse-imageextension.json | 2 -
.../resources/listvirtualmachinesresponse.json | 1 -
.../listvirtualmachinesresponse3x.json | 1 -
.../resources/listvlaniprangesresponse.json | 1 -
.../listvolumesreponse-imageextension.json | 2 -
.../listvolumesresponse-imageextension.json | 1 -
.../src/test/resources/listzonesresponse.json | 1 -
.../resources/listzonesresponse_single.json | 1 -
.../src/test/resources/loginresponse.json | 1 -
.../src/test/resources/logoutresponse.json | 1 -
.../preparehostformaintenanceresponse.json | 1 -
...asyncjobresultresponse-authorizeingress.json | 34 -
...tresponse-createtemplate-imageextension.json | 2 -
...ryasyncjobresultresponse-createtemplate.json | 1 -
...ueryasyncjobresultresponse-createvolume.json | 36 -
...yasyncjobresultresponse-extracttemplate.json | 1 -
.../queryasyncjobresultresponse-ipaddress.json | 1 -
...asyncjobresultresponse-ipforwardingrule.json | 1 -
...ponse-stopvirtualmachine-imageextension.json | 2 -
...ltresponse-virtualmachine-securitygroup.json | 73 -
...ryasyncjobresultresponse-virtualmachine.json | 53 -
.../test/resources/reconnecthostresponse.json | 1 -
.../src/test/resources/registerisoresponse.json | 3 -
.../resources/registersshkeypairresponse.json | 2 -
.../resources/registeruserkeysresponse.json | 1 -
.../revokesecuritygroupingressresponse.json | 2 -
...opvirtualmachineresponse-imageextension.json | 1 -
.../test/resources/updateclusterresponse.json | 1 -
.../resources/updateconfigurationsresponse.json | 2 -
.../test/resources/updatedomainresponse.json | 2 -
.../src/test/resources/updatehostresponse.json | 2 -
.../src/test/resources/updatepodresponse.json | 1 -
.../src/test/resources/updatezoneresponse.json | 4 -
612 files changed, 71416 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/pom.xml b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/pom.xml
deleted file mode 100644
index 4b9d332..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/pom.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>cloudstack</artifactId>
- <name>jclouds cloudstack core</name>
- <description>jclouds components to access cloudstack</description>
- <packaging>bundle</packaging>
-
- <!-- bootstrapping: need to fetch the project POM -->
- <repositories>
- <repository>
- <id>sonatype-nexus-snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <properties>
- <test.cloudstack.endpoint>http://localhost:8080/client/api</test.cloudstack.endpoint>
- <test.cloudstack.api-version>3.0.3</test.cloudstack.api-version>
- <test.cloudstack.build-version />
- <test.cloudstack.identity>FIXME_apiKey</test.cloudstack.identity>
- <test.cloudstack.credential>FIXME_secretKey</test.cloudstack.credential>
- <test.cloudstack.domainAdminIdentity />
- <test.cloudstack.domainAdminCredential />
- <test.cloudstack.globalAdminIdentity />
- <test.cloudstack.globalAdminCredential />
- <test.cloudstack.template>osFamily=CENTOS</test.cloudstack.template>
- <jclouds.osgi.export>org.jclouds.cloudstack*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <!-- too many tasks seem to overload the server and make the test take longer -->
- <threadCount>2</threadCount>
- <systemPropertyVariables>
- <test.cloudstack.endpoint>${test.cloudstack.endpoint}</test.cloudstack.endpoint>
- <test.cloudstack.api-version>${test.cloudstack.api-version}</test.cloudstack.api-version>
- <test.cloudstack.build-version>${test.cloudstack.build-version}</test.cloudstack.build-version>
- <test.cloudstack.identity>${test.cloudstack.identity}</test.cloudstack.identity>
- <test.cloudstack.credential>${test.cloudstack.credential}</test.cloudstack.credential>
- <test.cloudstack.template>${test.cloudstack.template}</test.cloudstack.template>
- <test.cloudstack.domainAdminIdentity>${test.cloudstack.domainAdminIdentity}</test.cloudstack.domainAdminIdentity>
- <test.cloudstack.domainAdminCredential>${test.cloudstack.domainAdminCredential}</test.cloudstack.domainAdminCredential>
- <test.cloudstack.globalAdminIdentity>${test.cloudstack.globalAdminIdentity}</test.cloudstack.globalAdminIdentity>
- <test.cloudstack.globalAdminCredential>${test.cloudstack.globalAdminCredential}</test.cloudstack.globalAdminCredential>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/AsyncJobException.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/AsyncJobException.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/AsyncJobException.java
deleted file mode 100644
index 014b7b1..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/AsyncJobException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-public class AsyncJobException extends RuntimeException {
-
- public AsyncJobException() {
- }
-
- public AsyncJobException(String s) {
- super(s);
- }
-
- public AsyncJobException(String s, Throwable throwable) {
- super(s, throwable);
- }
-
- public AsyncJobException(Throwable throwable) {
- super(throwable);
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApi.java
deleted file mode 100644
index a873643..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApi.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-import java.io.Closeable;
-
-import org.jclouds.cloudstack.features.AccountApi;
-import org.jclouds.cloudstack.features.AddressApi;
-import org.jclouds.cloudstack.features.AsyncJobApi;
-import org.jclouds.cloudstack.features.ConfigurationApi;
-import org.jclouds.cloudstack.features.EventApi;
-import org.jclouds.cloudstack.features.FirewallApi;
-import org.jclouds.cloudstack.features.GuestOSApi;
-import org.jclouds.cloudstack.features.HypervisorApi;
-import org.jclouds.cloudstack.features.ISOApi;
-import org.jclouds.cloudstack.features.LimitApi;
-import org.jclouds.cloudstack.features.LoadBalancerApi;
-import org.jclouds.cloudstack.features.NATApi;
-import org.jclouds.cloudstack.features.NetworkApi;
-import org.jclouds.cloudstack.features.OfferingApi;
-import org.jclouds.cloudstack.features.ProjectApi;
-import org.jclouds.cloudstack.features.SSHKeyPairApi;
-import org.jclouds.cloudstack.features.SecurityGroupApi;
-import org.jclouds.cloudstack.features.SessionApi;
-import org.jclouds.cloudstack.features.SnapshotApi;
-import org.jclouds.cloudstack.features.TemplateApi;
-import org.jclouds.cloudstack.features.VMGroupApi;
-import org.jclouds.cloudstack.features.VirtualMachineApi;
-import org.jclouds.cloudstack.features.VolumeApi;
-import org.jclouds.cloudstack.features.ZoneApi;
-import org.jclouds.rest.annotations.Delegate;
-
-/**
- * Provides synchronous access to CloudStack.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-public interface CloudStackApi extends Closeable {
- /**
- * Provides synchronous access to Zone features.
- */
- @Delegate
- ZoneApi getZoneApi();
-
- /**
- * Provides synchronous access to Template features.
- */
- @Delegate
- TemplateApi getTemplateApi();
-
- /**
- * Provides synchronous access to Service, Disk, and Network Offering
- * features.
- */
- @Delegate
- OfferingApi getOfferingApi();
-
- /**
- * Provides synchronous access to Network features.
- */
- @Delegate
- NetworkApi getNetworkApi();
-
- /**
- * Provides synchronous access to VirtualMachine features.
- */
- @Delegate
- VirtualMachineApi getVirtualMachineApi();
-
- /**
- * Provides synchronous access to SecurityGroup features.
- */
- @Delegate
- SecurityGroupApi getSecurityGroupApi();
-
- /**
- * Provides synchronous access to AsyncJob features.
- */
- @Delegate
- AsyncJobApi getAsyncJobApi();
-
- /**
- * Provides synchronous access to Address features.
- */
- @Delegate
- AddressApi getAddressApi();
-
- /**
- * Provides synchronous access to NAT features.
- */
- @Delegate
- NATApi getNATApi();
-
- /**
- * Provides synchronous access to Firewall features.
- */
- @Delegate
- FirewallApi getFirewallApi();
-
- /**
- * Provides synchronous access to LoadBalancer features.
- */
- @Delegate
- LoadBalancerApi getLoadBalancerApi();
-
- /**
- * Provides synchronous access to GuestOS features.
- */
- @Delegate
- GuestOSApi getGuestOSApi();
-
- /**
- * Provides synchronous access to Hypervisor features.
- */
- @Delegate
- HypervisorApi getHypervisorApi();
-
- /**
- * Provides synchronous access to Configuration features.
- */
- @Delegate
- ConfigurationApi getConfigurationApi();
-
- /**
- * Provides synchronous access to Account features.
- */
- @Delegate
- AccountApi getAccountApi();
-
- /**
- * Provides synchronous access to SSH Keypairs
- */
- @Delegate
- SSHKeyPairApi getSSHKeyPairApi();
-
- /**
- * Provides synchronous access to VM groups
- */
- @Delegate
- VMGroupApi getVMGroupApi();
-
- /**
- * Provides synchronous access to Events
- */
- @Delegate
- EventApi getEventApi();
-
- /**
- * Provides synchronous access to Resource Limits
- */
- @Delegate
- LimitApi getLimitApi();
-
- /**
- * Provides synchronous access to ISOs
- */
- @Delegate
- ISOApi getISOApi();
-
- /**
- * Provides synchronous access to Volumes
- */
- @Delegate
- VolumeApi getVolumeApi();
-
- /**
- * Provides synchronous access to Snapshots
- */
- @Delegate
- SnapshotApi getSnapshotApi();
-
- /**
- * Provides synchronous access to Sessions
- */
- @Delegate
- SessionApi getSessionApi();
-
- /**
- * Provides synchronous access to Projects
- */
- @Delegate
- ProjectApi getProjectApi();
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
deleted file mode 100644
index 56dc772..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-import static org.jclouds.cloudstack.config.CloudStackProperties.AUTO_GENERATE_KEYPAIRS;
-import static org.jclouds.reflect.Reflection2.typeToken;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.cloudstack.compute.config.CloudStackComputeServiceContextModule;
-import org.jclouds.cloudstack.config.CloudStackParserModule;
-import org.jclouds.cloudstack.config.CloudStackHttpApiModule;
-import org.jclouds.rest.internal.BaseHttpApiMetadata;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-/**
- * Implementation of {@link ApiMetadata} for Citrix/Apache CloudStack api.
- */
-public class CloudStackApiMetadata extends BaseHttpApiMetadata<CloudStackApi> {
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromApiMetadata(this);
- }
-
- public CloudStackApiMetadata() {
- this(new Builder());
- }
-
- protected CloudStackApiMetadata(Builder builder) {
- super(builder);
- }
-
- public static Properties defaultProperties() {
- Properties properties = BaseHttpApiMetadata.defaultProperties();
- properties.setProperty("jclouds.ssh.max-retries", "7");
- properties.setProperty("jclouds.ssh.retry-auth", "true");
- properties.setProperty(AUTO_GENERATE_KEYPAIRS, "false");
- return properties;
- }
-
- public static class Builder extends BaseHttpApiMetadata.Builder<CloudStackApi, Builder> {
-
- @SuppressWarnings("deprecation")
- protected Builder() {
- id("cloudstack")
- .name("Citrix CloudStack API")
- .identityName("API Key")
- .credentialName("Secret Key")
- .documentation(URI.create("http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"))
- .defaultEndpoint("http://localhost:8080/client/api")
- .version("2.2")
- .view(typeToken(CloudStackContext.class))
- .defaultProperties(CloudStackApiMetadata.defaultProperties())
- .defaultModules(ImmutableSet.<Class<? extends Module>> builder()
- .add(CloudStackParserModule.class)
- .add(CloudStackHttpApiModule.class)
- .add(CloudStackComputeServiceContextModule.class).build());
- }
-
- @Override
- public CloudStackApiMetadata build() {
- return new CloudStackApiMetadata(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackContext.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackContext.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackContext.java
deleted file mode 100644
index d1635f5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-import org.jclouds.cloudstack.internal.CloudStackContextImpl;
-import org.jclouds.compute.ComputeServiceContext;
-
-import com.google.inject.ImplementedBy;
-
-@ImplementedBy(CloudStackContextImpl.class)
-public interface CloudStackContext extends ComputeServiceContext {
-
- CloudStackApi getApi();
-
- CloudStackDomainApi getDomainApi();
-
- CloudStackGlobalApi getGlobalApi();
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackDomainApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackDomainApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackDomainApi.java
deleted file mode 100644
index 6eacd9f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackDomainApi.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-import org.jclouds.cloudstack.features.DomainAccountApi;
-import org.jclouds.cloudstack.features.DomainDomainApi;
-import org.jclouds.cloudstack.features.DomainLimitApi;
-import org.jclouds.cloudstack.features.DomainUserApi;
-import org.jclouds.rest.annotations.Delegate;
-
-/**
- * Provides synchronous access to CloudStack.
- * <p/>
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
- * />
- */
-public interface CloudStackDomainApi extends CloudStackApi {
-
- /**
- * Provides synchronous access to Resource Limits
- */
- @Delegate
- @Override
- DomainLimitApi getLimitApi();
-
- /**
- * Provides synchronous access to Accounts
- */
- @Delegate
- @Override
- DomainAccountApi getAccountApi();
-
- /**
- * Provides synchronous access to Users
- */
- @Delegate
- DomainUserApi getUserClient();
-
- /**
- * Provides synchronous access to Domains
- */
- @Delegate
- DomainDomainApi getDomainClient();
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackGlobalApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackGlobalApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackGlobalApi.java
deleted file mode 100644
index 0e77d84..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/CloudStackGlobalApi.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack;
-
-import org.jclouds.cloudstack.features.GlobalAccountApi;
-import org.jclouds.cloudstack.features.GlobalAlertApi;
-import org.jclouds.cloudstack.features.GlobalCapacityApi;
-import org.jclouds.cloudstack.features.GlobalConfigurationApi;
-import org.jclouds.cloudstack.features.GlobalDomainApi;
-import org.jclouds.cloudstack.features.GlobalHostApi;
-import org.jclouds.cloudstack.features.GlobalOfferingApi;
-import org.jclouds.cloudstack.features.GlobalPodApi;
-import org.jclouds.cloudstack.features.GlobalStoragePoolApi;
-import org.jclouds.cloudstack.features.GlobalUsageApi;
-import org.jclouds.cloudstack.features.GlobalUserApi;
-import org.jclouds.cloudstack.features.GlobalVlanApi;
-import org.jclouds.cloudstack.features.GlobalZoneApi;
-import org.jclouds.rest.annotations.Delegate;
-
-/**
- * Provides synchronous access to CloudStack.
- * <p/>
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-public interface CloudStackGlobalApi extends CloudStackDomainApi {
-
- /**
- * Provides synchronous access to Accounts
- */
- @Delegate
- @Override
- GlobalAccountApi getAccountApi();
-
- /**
- * Provides synchronous access to Users
- */
- @Delegate
- @Override
- GlobalUserApi getUserClient();
-
- /**
- * Provides synchronous access to Alerts
- */
- @Delegate
- GlobalAlertApi getAlertClient();
-
- /**
- * Provides synchronous access to Capacities
- */
- @Delegate
- GlobalCapacityApi getCapacityClient();
-
- /**
- * Provides synchronous access to Offerings
- */
- @Delegate
- @Override
- GlobalOfferingApi getOfferingApi();
-
- /**
- * Provides synchronous access to Hosts
- */
- @Delegate
- GlobalHostApi getHostClient();
-
- /**
- * Provides synchronous access to Storage Pools
- */
- @Delegate
- GlobalStoragePoolApi getStoragePoolClient();
-
- /**
- * Provides synchronous access to Usage
- */
- @Delegate
- GlobalUsageApi getUsageClient();
-
- /**
- * Provides synchronous access to Configuration
- */
- @Delegate
- @Override
- GlobalConfigurationApi getConfigurationApi();
-
- /**
- * Provides synchronous access to Domain
- */
- @Delegate
- @Override
- GlobalDomainApi getDomainClient();
-
- /**
- * Provides synchronous access to Zone
- */
- @Delegate
- @Override
- GlobalZoneApi getZoneApi();
-
- /**
- * Provides synchronous access to Pod
- */
- @Delegate
- GlobalPodApi getPodClient();
-
- /**
- * Provides synchronous access to Vlan
- */
- @Delegate
- GlobalVlanApi getVlanClient();
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java
deleted file mode 100644
index b99e644..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.http.Uris.uriBuilder;
-import static org.jclouds.http.utils.Queries.queryParser;
-
-import java.net.URI;
-import java.util.Map.Entry;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.Binder;
-
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableMultimap.Builder;
-import com.google.common.collect.Multimap;
-
-@Singleton
-public class BindAccountSecurityGroupPairsToIndexedQueryParams implements Binder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(input instanceof Multimap<?, ?>, "this binder is only valid for Multimaps!");
- Multimap<String, String> pairs = (Multimap<String, String>) checkNotNull(input, "account group pairs");
- checkArgument(!pairs.isEmpty(), "you must specify at least one account, group pair");
-
- Multimap<String, String> existingParams = queryParser().apply(request.getEndpoint().getQuery());
- Builder<String, String> map = ImmutableMultimap.<String, String> builder().putAll(existingParams);
- int i = 0;
- for (Entry<String, String> entry : pairs.entries())
- map.put(String.format("usersecuritygrouplist[%d].account", i), entry.getKey()).put(
- String.format("usersecuritygrouplist[%d].group", i++), entry.getValue());
- URI endpoint = uriBuilder(request.getEndpoint()).query(map.build()).build();
- return (R) request.toBuilder().endpoint(endpoint).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java
deleted file mode 100644
index 28adf91..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.Binder;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-
-@Singleton
-public class BindCIDRsToCommaDelimitedQueryParam implements Binder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(input instanceof Iterable<?>, "this binder is only valid for Iterables!");
- Iterable<String> cidrs = (Iterable<String>) checkNotNull(input, "cidr list");
- checkArgument(!Iterables.isEmpty(cidrs), "you must specify at least one cidr range");
- return (R) request.toBuilder().replaceQueryParam("cidrlist", Joiner.on(',').join(cidrs)).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java
deleted file mode 100644
index f4b3813..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Singleton;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.Binder;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-
-@Singleton
-public class BindIdListToCommaDelimitedQueryParam implements Binder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(input instanceof Iterable<?>, "this binder is only valid for Iterables!");
- Iterable<Long> numbers = (Iterable<Long>) checkNotNull(input, "list of Longs");
- checkArgument(!Iterables.isEmpty(numbers), "you must specify at least one element");
- return (R) request.toBuilder().replaceQueryParam("ids", Joiner.on(',').join(numbers)).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java
deleted file mode 100644
index d80f4ba..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.Binder;
-
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableMultimap.Builder;
-
-@Singleton
-public class BindSnapshotPolicyScheduleToQueryParam implements Binder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(input instanceof SnapshotPolicySchedule, "this binder is only valid for SnapshotPolicySchedule");
- SnapshotPolicySchedule schedule = SnapshotPolicySchedule.class.cast(input);
- Builder<String, String> builder = ImmutableMultimap.<String, String> builder();
- builder.put("intervaltype", schedule.getInterval().toString());
- builder.put("schedule", schedule.getTime().toString());
- return (R) request.toBuilder().replaceQueryParams(builder.build()).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java
deleted file mode 100644
index e61990c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.jclouds.cloudstack.domain.TemplateMetadata;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.Binder;
-
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableMultimap.Builder;
-
-public class BindTemplateMetadataToQueryParams implements Binder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(input instanceof TemplateMetadata, "this binder is only valid for TemplateMetadata");
- TemplateMetadata metadata = (TemplateMetadata) input;
- Builder<String, String> builder = ImmutableMultimap.<String, String>builder();
- builder.put("name", metadata.getName());
- builder.put("ostypeid", metadata.getOsTypeId());
- builder.put("displaytext", metadata.getDisplayText());
- if (metadata.getSnapshotId() != null) {
- builder.put("snapshotid", metadata.getSnapshotId());
- }
- if (metadata.getVolumeId() != null) {
- builder.put("volumeid", metadata.getVolumeId());
- }
- if (metadata.getVirtualMachineId() != null) {
- builder.put("virtualmachineid", metadata.getVirtualMachineId());
- }
- if (metadata.isPasswordEnabled() != null) {
- builder.put("passwordenabled", metadata.isPasswordEnabled().toString());
- }
- return (R) request.toBuilder().replaceQueryParams(builder.build()).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/ResourceLimitToQueryParams.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/ResourceLimitToQueryParams.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/ResourceLimitToQueryParams.java
deleted file mode 100644
index 847fea5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/binders/ResourceLimitToQueryParams.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.binders;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.jclouds.cloudstack.domain.ResourceLimit;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.Binder;
-
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableMultimap.Builder;
-
-/**
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/domain_admin/updateResourceLimit.html"
- * />
- */
-public class ResourceLimitToQueryParams implements Binder {
-
- @SuppressWarnings("unchecked")
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(input instanceof ResourceLimit, "this binder is only valid for ResourceLimit");
- ResourceLimit limit = (ResourceLimit) input;
- Builder<String, String> builder = ImmutableMultimap.<String, String> builder();
- builder.put("resourcetype", limit.getResourceType().getCode() + "");
- builder.put("account", limit.getAccount());
- builder.put("domainid", limit.getDomainId());
- builder.put("max", limit.getMax() + "");
- return (R) request.toBuilder().replaceQueryParams(builder.build()).build();
- }
-}
[44/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
deleted file mode 100644
index 6703c80..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class IPForwardingRule
- */
-public class IPForwardingRule implements Comparable<IPForwardingRule> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromIPForwardingRule(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String IPAddress;
- protected String IPAddressId;
- protected int startPort;
- protected String protocol;
- protected int endPort;
- protected String state;
- protected String virtualMachineDisplayName;
- protected String virtualMachineId;
- protected String virtualMachineName;
- protected int publicPort;
- protected Set<String> CIDRs = ImmutableSet.of();
- protected int privateEndPort;
- protected int publicEndPort;
-
- /**
- * @see IPForwardingRule#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getIPAddress()
- */
- public T IPAddress(String IPAddress) {
- this.IPAddress = IPAddress;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getIPAddressId()
- */
- public T IPAddressId(String IPAddressId) {
- this.IPAddressId = IPAddressId;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getStartPort()
- */
- public T startPort(int startPort) {
- this.startPort = startPort;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getProtocol()
- */
- public T protocol(String protocol) {
- this.protocol = protocol;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getEndPort()
- */
- public T endPort(int endPort) {
- this.endPort = endPort;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getState()
- */
- public T state(String state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getVirtualMachineDisplayName()
- */
- public T virtualMachineDisplayName(String virtualMachineDisplayName) {
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getVirtualMachineId()
- */
- public T virtualMachineId(String virtualMachineId) {
- this.virtualMachineId = virtualMachineId;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getVirtualMachineName()
- */
- public T virtualMachineName(String virtualMachineName) {
- this.virtualMachineName = virtualMachineName;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getPublicPort()
- */
- public T publicPort(int publicPort) {
- this.publicPort = publicPort;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getCIDRs()
- */
- public T CIDRs(Set<String> CIDRs) {
- this.CIDRs = ImmutableSet.copyOf(checkNotNull(CIDRs, "CIDRs"));
- return self();
- }
-
- public T CIDRs(String... in) {
- return CIDRs(ImmutableSet.copyOf(in));
- }
-
- /**
- * @see IPForwardingRule#getPrivateEndPort()
- */
- public T privateEndPort(int privateEndPort) {
- this.privateEndPort = privateEndPort;
- return self();
- }
-
- /**
- * @see IPForwardingRule#getPublicEndPort()
- */
- public T publicEndPort(int publicEndPort) {
- this.publicEndPort = publicEndPort;
- return self();
- }
-
- public IPForwardingRule build() {
- return new IPForwardingRule(id, IPAddress, IPAddressId, startPort, protocol, endPort, state, virtualMachineDisplayName,
- virtualMachineId, virtualMachineName, publicPort, CIDRs, privateEndPort, publicEndPort);
- }
-
- public T fromIPForwardingRule(IPForwardingRule in) {
- return this
- .id(in.getId())
- .IPAddress(in.getIPAddress())
- .IPAddressId(in.getIPAddressId())
- .startPort(in.getStartPort())
- .protocol(in.getProtocol())
- .endPort(in.getEndPort())
- .state(in.getState())
- .virtualMachineDisplayName(in.getVirtualMachineDisplayName())
- .virtualMachineId(in.getVirtualMachineId())
- .virtualMachineName(in.getVirtualMachineName())
- .publicPort(in.getPublicPort())
- .CIDRs(in.getCIDRs())
- .privateEndPort(in.getPrivateEndPort())
- .publicEndPort(in.getPublicEndPort());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String IPAddress;
- private final String IPAddressId;
- private final int startPort;
- private final String protocol;
- private final int endPort;
- private final String state;
- private final String virtualMachineDisplayName;
- private final String virtualMachineId;
- private final String virtualMachineName;
- private final int publicPort;
- private final Set<String> CIDRs;
- private final int privateEndPort;
- private final int publicEndPort;
-
- @ConstructorProperties({
- "id", "ipaddress", "ipaddressid", "startport", "protocol", "endport", "state", "virtualmachinedisplayname",
- "virtualmachineid", "virtualmachinename", "publicport", "cidrlist", "privateendport", "publicendport"
- })
- protected IPForwardingRule(String id, String IPAddress, String IPAddressId, int startPort, @Nullable String protocol,
- int endPort, @Nullable String state, @Nullable String virtualMachineDisplayName,
- @Nullable String virtualMachineId, @Nullable String virtualMachineName, int publicPort,
- @Nullable Set<String> CIDRs, int privateEndPort, int publicEndPort) {
- this.id = checkNotNull(id, "id");
- this.IPAddress = IPAddress;
- this.IPAddressId = IPAddressId;
- this.startPort = startPort;
- this.protocol = protocol;
- this.endPort = endPort;
- this.state = state;
- this.virtualMachineDisplayName = virtualMachineDisplayName;
- this.virtualMachineId = virtualMachineId;
- this.virtualMachineName = virtualMachineName;
- this.publicPort = publicPort;
- this.CIDRs = CIDRs == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(CIDRs);
- this.privateEndPort = privateEndPort;
- this.publicEndPort = publicEndPort;
- }
-
- /**
- * @return the ID of the ip forwarding rule
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the public ip address for the ip forwarding rule
- */
- @Nullable
- public String getIPAddress() {
- return this.IPAddress;
- }
-
- /**
- * @return the public ip address id for the ip forwarding rule
- */
- @Nullable
- public String getIPAddressId() {
- return this.IPAddressId;
- }
-
- /**
- * @return the private port for the ip forwarding rule
- */
- public int getStartPort() {
- return this.startPort;
- }
-
- /**
- * @return the protocol of the ip forwarding rule
- */
- @Nullable
- public String getProtocol() {
- return this.protocol;
- }
-
- /**
- * @return the public port for the ip forwarding rule
- */
- public int getEndPort() {
- return this.endPort;
- }
-
- /**
- * @return the state of the rule
- */
- @Nullable
- public String getState() {
- return this.state;
- }
-
- /**
- * @return the VM display name for the ip forwarding rule
- */
- @Nullable
- public String getVirtualMachineDisplayName() {
- return this.virtualMachineDisplayName;
- }
-
- /**
- * @return the VM ID for the ip forwarding rule
- */
- @Nullable
- public String getVirtualMachineId() {
- return this.virtualMachineId;
- }
-
- /**
- * @return the VM name for the ip forwarding rule
- */
- @Nullable
- public String getVirtualMachineName() {
- return this.virtualMachineName;
- }
-
- /**
- * @return the starting port of port forwarding rule's public port range
- */
- public int getPublicPort() {
- return this.publicPort;
- }
-
- /**
- * @return the cidr list to forward traffic from
- */
- public Set<String> getCIDRs() {
- return this.CIDRs;
- }
-
- /**
- * @return the ending port of port forwarding rule's private port range
- */
- public int getPrivateEndPort() {
- return this.privateEndPort;
- }
-
- /**
- * @return the ending port of port forwarding rule's private port range
- */
- public int getPublicEndPort() {
- return this.publicEndPort;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, IPAddress, IPAddressId, startPort, protocol, endPort, state, virtualMachineDisplayName, virtualMachineId, virtualMachineName, publicPort, CIDRs, privateEndPort, publicEndPort);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- IPForwardingRule that = IPForwardingRule.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.IPAddress, that.IPAddress)
- && Objects.equal(this.IPAddressId, that.IPAddressId)
- && Objects.equal(this.startPort, that.startPort)
- && Objects.equal(this.protocol, that.protocol)
- && Objects.equal(this.endPort, that.endPort)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.virtualMachineDisplayName, that.virtualMachineDisplayName)
- && Objects.equal(this.virtualMachineId, that.virtualMachineId)
- && Objects.equal(this.virtualMachineName, that.virtualMachineName)
- && Objects.equal(this.publicPort, that.publicPort)
- && Objects.equal(this.CIDRs, that.CIDRs)
- && Objects.equal(this.privateEndPort, that.privateEndPort)
- && Objects.equal(this.publicEndPort, that.publicEndPort);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("startPort", startPort)
- .add("protocol", protocol).add("endPort", endPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName)
- .add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("publicPort", publicPort)
- .add("CIDRs", CIDRs).add("privateEndPort", privateEndPort).add("publicEndPort", publicEndPort);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(IPForwardingRule o) {
- return id.compareTo(o.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISO.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISO.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISO.java
deleted file mode 100644
index 3e79b04..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISO.java
+++ /dev/null
@@ -1,767 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class ISO
- */
-public class ISO {
-
- /**
- */
- public static enum ISOFilter {
-
- featured, self, self_executable, executable, community, UNRECOGNIZED;
-
- public static ISOFilter fromValue(String format) {
- try {
- return valueOf(checkNotNull(format, "format"));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromISO(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected String accountId;
- protected boolean bootable;
- protected String checksum;
- protected Date created;
- protected boolean crossZones;
- protected String displayText;
- protected String domain;
- protected String domainid;
- protected String format;
- protected String hostId;
- protected String hostName;
- protected String hypervisor;
- protected boolean isExtractable;
- protected boolean isFeatured;
- protected boolean isPublic;
- protected boolean isReady;
- protected String jobId;
- protected String jobStatus;
- protected String name;
- protected String osTypeId;
- protected String osTypeName;
- protected boolean passwordEnabled;
- protected Date removed;
- protected long size;
- protected String sourceTemplateId;
- protected String status;
- protected String templateTag;
- protected String templateType;
- protected String zoneId;
- protected String zoneName;
-
- /**
- * @see ISO#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see ISO#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see ISO#getAccountId()
- */
- public T accountId(String accountId) {
- this.accountId = accountId;
- return self();
- }
-
- /**
- * @see ISO#isBootable()
- */
- public T bootable(boolean bootable) {
- this.bootable = bootable;
- return self();
- }
-
- /**
- * @see ISO#getChecksum()
- */
- public T checksum(String checksum) {
- this.checksum = checksum;
- return self();
- }
-
- /**
- * @see ISO#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see ISO#isCrossZones()
- */
- public T crossZones(boolean crossZones) {
- this.crossZones = crossZones;
- return self();
- }
-
- /**
- * @see ISO#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- /**
- * @see ISO#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see ISO#getDomainid()
- */
- public T domainid(String domainid) {
- this.domainid = domainid;
- return self();
- }
-
- /**
- * @see ISO#getFormat()
- */
- public T format(String format) {
- this.format = format;
- return self();
- }
-
- /**
- * @see ISO#getHostId()
- */
- public T hostId(String hostId) {
- this.hostId = hostId;
- return self();
- }
-
- /**
- * @see ISO#getHostName()
- */
- public T hostName(String hostName) {
- this.hostName = hostName;
- return self();
- }
-
- /**
- * @see ISO#getHypervisor()
- */
- public T hypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- return self();
- }
-
- /**
- * @see ISO#isExtractable()
- */
- public T isExtractable(boolean isExtractable) {
- this.isExtractable = isExtractable;
- return self();
- }
-
- /**
- * @see ISO#isFeatured()
- */
- public T isFeatured(boolean isFeatured) {
- this.isFeatured = isFeatured;
- return self();
- }
-
- /**
- * @see ISO#isPublic()
- */
- public T isPublic(boolean isPublic) {
- this.isPublic = isPublic;
- return self();
- }
-
- /**
- * @see ISO#isReady()
- */
- public T isReady(boolean isReady) {
- this.isReady = isReady;
- return self();
- }
-
- /**
- * @see ISO#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- /**
- * @see ISO#getJobStatus()
- */
- public T jobStatus(String jobStatus) {
- this.jobStatus = jobStatus;
- return self();
- }
-
- /**
- * @see ISO#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see ISO#getOsTypeId()
- */
- public T osTypeId(String osTypeId) {
- this.osTypeId = osTypeId;
- return self();
- }
-
- /**
- * @see ISO#getOsTypeName()
- */
- public T osTypeName(String osTypeName) {
- this.osTypeName = osTypeName;
- return self();
- }
-
- /**
- * @see ISO#isPasswordEnabled()
- */
- public T passwordEnabled(boolean passwordEnabled) {
- this.passwordEnabled = passwordEnabled;
- return self();
- }
-
- /**
- * @see ISO#getRemoved()
- */
- public T removed(Date removed) {
- this.removed = removed;
- return self();
- }
-
- /**
- * @see ISO#getSize()
- */
- public T size(long size) {
- this.size = size;
- return self();
- }
-
- /**
- * @see ISO#getSourceTemplateId()
- */
- public T sourceTemplateId(String sourceTemplateId) {
- this.sourceTemplateId = sourceTemplateId;
- return self();
- }
-
- /**
- * @see ISO#getStatus()
- */
- public T status(String status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see ISO#getTemplateTag()
- */
- public T templateTag(String templateTag) {
- this.templateTag = templateTag;
- return self();
- }
-
- /**
- * @see ISO#getTemplateType()
- */
- public T templateType(String templateType) {
- this.templateType = templateType;
- return self();
- }
-
- /**
- * @see ISO#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see ISO#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- public ISO build() {
- return new ISO(id, account, accountId, bootable, checksum, created, crossZones, displayText, domain, domainid,
- format, hostId, hostName, hypervisor, isExtractable, isFeatured, isPublic, isReady, jobId, jobStatus, name,
- osTypeId, osTypeName, passwordEnabled, removed, size, sourceTemplateId, status, templateTag, templateType,
- zoneId, zoneName);
- }
-
- public T fromISO(ISO in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .accountId(in.getAccountId())
- .bootable(in.isBootable())
- .checksum(in.getChecksum())
- .created(in.getCreated())
- .crossZones(in.isCrossZones())
- .displayText(in.getDisplayText())
- .domain(in.getDomain())
- .domainid(in.getDomainid())
- .format(in.getFormat())
- .hostId(in.getHostId())
- .hostName(in.getHostName())
- .hypervisor(in.getHypervisor())
- .isExtractable(in.isExtractable())
- .isFeatured(in.isFeatured())
- .isPublic(in.isPublic())
- .isReady(in.isReady())
- .jobId(in.getJobId())
- .jobStatus(in.getJobStatus())
- .name(in.getName())
- .osTypeId(in.getOsTypeId())
- .osTypeName(in.getOsTypeName())
- .passwordEnabled(in.isPasswordEnabled())
- .removed(in.getRemoved())
- .size(in.getSize())
- .sourceTemplateId(in.getSourceTemplateId())
- .status(in.getStatus())
- .templateTag(in.getTemplateTag())
- .templateType(in.getTemplateType())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final String accountId;
- private final boolean bootable;
- private final String checksum;
- private final Date created;
- private final boolean crossZones;
- private final String displayText;
- private final String domain;
- private final String domainid;
- private final String format;
- private final String hostId;
- private final String hostName;
- private final String hypervisor;
- private final boolean isExtractable;
- private final boolean isFeatured;
- private final boolean isPublic;
- private final boolean isReady;
- private final String jobId;
- private final String jobStatus;
- private final String name;
- private final String osTypeId;
- private final String osTypeName;
- private final boolean passwordEnabled;
- private final Date removed;
- private final long size;
- private final String sourceTemplateId;
- private final String status;
- private final String templateTag;
- private final String templateType;
- private final String zoneId;
- private final String zoneName;
-
- @ConstructorProperties({
- "id", "account", "accountid", "bootable", "checksum", "created", "crossZones", "displaytext", "domain", "domainid", "format", "hostid", "hostname", "hypervisor", "isextractable", "isfeatured", "ispublic", "isready", "jobid", "jobstatus", "name", "ostypeid", "ostypename", "passwordenabled", "removed", "size", "sourcetemplateid", "status", "templatetag", "templatetype", "zoneid", "zonename"
- })
- protected ISO(String id, @Nullable String account, @Nullable String accountId, boolean bootable, @Nullable String checksum,
- @Nullable Date created, boolean crossZones, @Nullable String displayText, @Nullable String domain,
- @Nullable String domainid, @Nullable String format, @Nullable String hostId, @Nullable String hostName,
- @Nullable String hypervisor, boolean isExtractable, boolean isFeatured, boolean isPublic, boolean isReady,
- @Nullable String jobId, @Nullable String jobStatus, @Nullable String name, @Nullable String osTypeId,
- @Nullable String osTypeName, boolean passwordEnabled, @Nullable Date removed, long size, @Nullable String sourceTemplateId,
- @Nullable String status, @Nullable String templateTag, @Nullable String templateType, @Nullable String zoneId, @Nullable String zoneName) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.accountId = accountId;
- this.bootable = bootable;
- this.checksum = checksum;
- this.created = created;
- this.crossZones = crossZones;
- this.displayText = displayText;
- this.domain = domain;
- this.domainid = domainid;
- this.format = format;
- this.hostId = hostId;
- this.hostName = hostName;
- this.hypervisor = hypervisor;
- this.isExtractable = isExtractable;
- this.isFeatured = isFeatured;
- this.isPublic = isPublic;
- this.isReady = isReady;
- this.jobId = jobId;
- this.jobStatus = jobStatus;
- this.name = name;
- this.osTypeId = osTypeId;
- this.osTypeName = osTypeName;
- this.passwordEnabled = passwordEnabled;
- this.removed = removed;
- this.size = size;
- this.sourceTemplateId = sourceTemplateId;
- this.status = status;
- this.templateTag = templateTag;
- this.templateType = templateType;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- }
-
- /**
- * @return the template ID
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account name to which the template belongs
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the account id to which the template belongs
- */
- @Nullable
- public String getAccountId() {
- return this.accountId;
- }
-
- public boolean isBootable() {
- return this.bootable;
- }
-
- /**
- * @return checksum of the template
- */
- @Nullable
- public String getChecksum() {
- return this.checksum;
- }
-
- /**
- * @return the date this template was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- public boolean isCrossZones() {
- return this.crossZones;
- }
-
- /**
- * @return the template display text
- */
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- /**
- * @return the name of the domain to which the template belongs
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the ID of the domain to which the template belongs
- */
- @Nullable
- public String getDomainid() {
- return this.domainid;
- }
-
- /**
- * @return the format of the template.
- */
- @Nullable
- public String getFormat() {
- return this.format;
- }
-
- /**
- * @return the ID of the secondary storage host for the template
- */
- @Nullable
- public String getHostId() {
- return this.hostId;
- }
-
- /**
- * @return the name of the secondary storage host for the template
- */
- @Nullable
- public String getHostName() {
- return this.hostName;
- }
-
- /**
- * @return the hypervisor on which the template runs
- */
- @Nullable
- public String getHypervisor() {
- return this.hypervisor;
- }
-
- public boolean isExtractable() {
- return this.isExtractable;
- }
-
- public boolean isFeatured() {
- return this.isFeatured;
- }
-
- public boolean isPublic() {
- return this.isPublic;
- }
-
- public boolean isReady() {
- return this.isReady;
- }
-
- /**
- * @return shows the current pending asynchronous job ID. This tag is not returned if no current pending jobs are acting on the template
- */
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- /**
- * @return shows the current pending asynchronous job status
- */
- @Nullable
- public String getJobStatus() {
- return this.jobStatus;
- }
-
- /**
- * @return the template name
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the ID of the OS type for this template.
- */
- @Nullable
- public String getOsTypeId() {
- return this.osTypeId;
- }
-
- /**
- * @return the name of the OS type for this template.
- */
- @Nullable
- public String getOsTypeName() {
- return this.osTypeName;
- }
-
- public boolean isPasswordEnabled() {
- return this.passwordEnabled;
- }
-
- /**
- * @return the date this template was removed
- */
- @Nullable
- public Date getRemoved() {
- return this.removed;
- }
-
- /**
- * @return the size of the template
- */
- public long getSize() {
- return this.size;
- }
-
- /**
- * @return the template ID of the parent template if present
- */
- @Nullable
- public String getSourceTemplateId() {
- return this.sourceTemplateId;
- }
-
- /**
- * @return the status of the template
- */
- @Nullable
- public String getStatus() {
- return this.status;
- }
-
- /**
- * @return the tag of this template
- */
- @Nullable
- public String getTemplateTag() {
- return this.templateTag;
- }
-
- /**
- * @return the type of the template
- */
- @Nullable
- public String getTemplateType() {
- return this.templateType;
- }
-
- /**
- * @return the ID of the zone for this template
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return the name of the zone for this template
- */
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, accountId, bootable, checksum, created, crossZones, displayText, domain,
- domainid, format, hostId, hostName, hypervisor, isExtractable, isFeatured, isPublic, isReady, jobId, jobStatus,
- name, osTypeId, osTypeName, passwordEnabled, removed, size, sourceTemplateId, status, templateTag, templateType, zoneId, zoneName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ISO that = ISO.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.accountId, that.accountId)
- && Objects.equal(this.bootable, that.bootable)
- && Objects.equal(this.checksum, that.checksum)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.crossZones, that.crossZones)
- && Objects.equal(this.displayText, that.displayText)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainid, that.domainid)
- && Objects.equal(this.format, that.format)
- && Objects.equal(this.hostId, that.hostId)
- && Objects.equal(this.hostName, that.hostName)
- && Objects.equal(this.hypervisor, that.hypervisor)
- && Objects.equal(this.isExtractable, that.isExtractable)
- && Objects.equal(this.isFeatured, that.isFeatured)
- && Objects.equal(this.isPublic, that.isPublic)
- && Objects.equal(this.isReady, that.isReady)
- && Objects.equal(this.jobId, that.jobId)
- && Objects.equal(this.jobStatus, that.jobStatus)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.osTypeId, that.osTypeId)
- && Objects.equal(this.osTypeName, that.osTypeName)
- && Objects.equal(this.passwordEnabled, that.passwordEnabled)
- && Objects.equal(this.removed, that.removed)
- && Objects.equal(this.size, that.size)
- && Objects.equal(this.sourceTemplateId, that.sourceTemplateId)
- && Objects.equal(this.status, that.status)
- && Objects.equal(this.templateTag, that.templateTag)
- && Objects.equal(this.templateType, that.templateType)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("accountId", accountId).add("bootable", bootable)
- .add("checksum", checksum).add("created", created).add("crossZones", crossZones).add("displayText", displayText)
- .add("domain", domain).add("domainid", domainid).add("format", format).add("hostId", hostId).add("hostName", hostName)
- .add("hypervisor", hypervisor).add("isExtractable", isExtractable).add("isFeatured", isFeatured).add("isPublic", isPublic)
- .add("isReady", isReady).add("jobId", jobId).add("jobStatus", jobStatus).add("name", name).add("osTypeId", osTypeId)
- .add("osTypeName", osTypeName).add("passwordEnabled", passwordEnabled).add("removed", removed).add("size", size)
- .add("sourceTemplateId", sourceTemplateId).add("status", status).add("templateTag", templateTag).add("templateType", templateType)
- .add("zoneId", zoneId).add("zoneName", zoneName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
deleted file mode 100644
index e6706e5..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class ISOExtraction
- */
-public class ISOExtraction {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromISOExtraction(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String accountId;
- protected Date created;
- protected String extractId;
- protected ExtractMode extractMode;
- protected String name;
- protected String state;
- protected String status;
- protected String storageType;
- protected int uploadPercentage;
- protected String url;
- protected String zoneId;
- protected String zoneName;
-
- /**
- * @see ISOExtraction#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see ISOExtraction#getAccountId()
- */
- public T accountId(String accountId) {
- this.accountId = accountId;
- return self();
- }
-
- /**
- * @see ISOExtraction#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see ISOExtraction#getExtractId()
- */
- public T extractId(String extractId) {
- this.extractId = extractId;
- return self();
- }
-
- /**
- * @see ISOExtraction#getExtractMode()
- */
- public T extractMode(ExtractMode extractMode) {
- this.extractMode = extractMode;
- return self();
- }
-
- /**
- * @see ISOExtraction#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see ISOExtraction#getState()
- */
- public T state(String state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see ISOExtraction#getStatus()
- */
- public T status(String status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see ISOExtraction#getStorageType()
- */
- public T storageType(String storageType) {
- this.storageType = storageType;
- return self();
- }
-
- /**
- * @see ISOExtraction#getUploadPercentage()
- */
- public T uploadPercentage(int uploadPercentage) {
- this.uploadPercentage = uploadPercentage;
- return self();
- }
-
- /**
- * @see ISOExtraction#getUrl()
- */
- public T url(String url) {
- this.url = url;
- return self();
- }
-
- /**
- * @see ISOExtraction#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see ISOExtraction#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- public ISOExtraction build() {
- return new ISOExtraction(id, accountId, created, extractId, extractMode, name, state, status, storageType, uploadPercentage, url, zoneId, zoneName);
- }
-
- public T fromISOExtraction(ISOExtraction in) {
- return this
- .id(in.getId())
- .accountId(in.getAccountId())
- .created(in.getCreated())
- .extractId(in.getExtractId())
- .extractMode(in.getExtractMode())
- .name(in.getName())
- .state(in.getState())
- .status(in.getStatus())
- .storageType(in.getStorageType())
- .uploadPercentage(in.getUploadPercentage())
- .url(in.getUrl())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String accountId;
- private final Date created;
- private final String extractId;
- private final ExtractMode extractMode;
- private final String name;
- private final String state;
- private final String status;
- private final String storageType;
- private final int uploadPercentage;
- private final String url;
- private final String zoneId;
- private final String zoneName;
-
- @ConstructorProperties({
- "id", "accountid", "created", "extractId", "extractMode", "name", "state", "status", "storagetype", "uploadpercentage", "url", "zoneid", "zonename"
- })
- protected ISOExtraction(String id, @Nullable String accountId, @Nullable Date created, @Nullable String extractId,
- @Nullable ExtractMode extractMode, @Nullable String name, @Nullable String state, @Nullable String status,
- @Nullable String storageType, int uploadPercentage, @Nullable String url, @Nullable String zoneId,
- @Nullable String zoneName) {
- this.id = checkNotNull(id, "id");
- this.accountId = accountId;
- this.created = created;
- this.extractId = extractId;
- this.extractMode = extractMode;
- this.name = name;
- this.state = state;
- this.status = status;
- this.storageType = storageType;
- this.uploadPercentage = uploadPercentage;
- this.url = url;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- }
-
- /**
- * @return the id of extracted object
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account id to which the extracted object belongs
- */
- @Nullable
- public String getAccountId() {
- return this.accountId;
- }
-
- /**
- * @return the time and date the object was created
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return the upload id of extracted object
- */
- @Nullable
- public String getExtractId() {
- return this.extractId;
- }
-
- /**
- * @return the mode of extraction - upload or download
- */
- @Nullable
- public ExtractMode getExtractMode() {
- return this.extractMode;
- }
-
- /**
- * @return the name of the extracted object
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the state of the extracted object
- */
- @Nullable
- public String getState() {
- return this.state;
- }
-
- /**
- * @return the status of the extraction
- */
- @Nullable
- public String getStatus() {
- return this.status;
- }
-
- /**
- * @return type of the storage
- */
- @Nullable
- public String getStorageType() {
- return this.storageType;
- }
-
- /**
- * @return the percentage of the entity uploaded to the specified location
- */
- public int getUploadPercentage() {
- return this.uploadPercentage;
- }
-
- /**
- * @return if mode = upload then url of the uploaded entity. if mode = download the url from which the entity can be downloaded
- */
- @Nullable
- public String getUrl() {
- return this.url;
- }
-
- /**
- * @return zone ID the object was extracted from
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- /**
- * @return zone name the object was extracted from
- */
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, accountId, created, extractId, extractMode, name, state, status, storageType, uploadPercentage, url, zoneId, zoneName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ISOExtraction that = ISOExtraction.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.accountId, that.accountId)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.extractId, that.extractId)
- && Objects.equal(this.extractMode, that.extractMode)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.status, that.status)
- && Objects.equal(this.storageType, that.storageType)
- && Objects.equal(this.uploadPercentage, that.uploadPercentage)
- && Objects.equal(this.url, that.url)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode)
- .add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage)
- .add("url", url).add("zoneId", zoneId).add("zoneName", zoneName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
deleted file mode 100644
index b85e741..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class ISOPermissions
- */
-public class ISOPermissions {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromISOPermissions(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected Set<String> accounts = ImmutableSet.of();
- protected String domainId;
- protected boolean isPublic;
-
- /**
- * @see ISOPermissions#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see ISOPermissions#getAccounts()
- */
- public T accounts(Set<String> accounts) {
- this.accounts = ImmutableSet.copyOf(checkNotNull(accounts, "accounts"));
- return self();
- }
-
- public T accounts(String... in) {
- return accounts(ImmutableSet.copyOf(in));
- }
-
- /**
- * @see ISOPermissions#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see ISOPermissions#isPublic()
- */
- public T isPublic(boolean isPublic) {
- this.isPublic = isPublic;
- return self();
- }
-
- public ISOPermissions build() {
- return new ISOPermissions(id, accounts, domainId, isPublic);
- }
-
- public T fromISOPermissions(ISOPermissions in) {
- return this
- .id(in.getId())
- .accounts(in.getAccounts())
- .domainId(in.getDomainId())
- .isPublic(in.isPublic());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final Set<String> accounts;
- private final String domainId;
- private final boolean isPublic;
-
- @ConstructorProperties({
- "id", "account", "domainid", "ispublic"
- })
- protected ISOPermissions(String id, @Nullable Set<String> accounts, @Nullable String domainId, boolean isPublic) {
- this.id = checkNotNull(id, "id");
- this.accounts = accounts == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(accounts);
- this.domainId = domainId;
- this.isPublic = isPublic;
- }
-
- /**
- * @return the template ID
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the list of accounts the template is available for
- */
- public Set<String> getAccounts() {
- return this.accounts;
- }
-
- /**
- * @return the ID of the domain to which the template belongs
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return true if this template is a public template, false otherwise
- */
- public boolean isPublic() {
- return this.isPublic;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, accounts, domainId, isPublic);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ISOPermissions that = ISOPermissions.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.accounts, that.accounts)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.isPublic, that.isPublic);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("accounts", accounts).add("domainId", domainId).add("isPublic", isPublic);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
deleted file mode 100644
index efb5ff9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-public class IngressRule implements Comparable<IngressRule> {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromIngressRule(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String account;
- protected String CIDR;
- protected int endPort;
- protected int ICMPCode;
- protected int ICMPType;
- protected String protocol;
- protected String id;
- protected String securityGroupName;
- protected int startPort;
-
- /**
- * @see IngressRule#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see IngressRule#getCIDR()
- */
- public T CIDR(String CIDR) {
- this.CIDR = CIDR;
- return self();
- }
-
- /**
- * @see IngressRule#getEndPort()
- */
- public T endPort(int endPort) {
- this.endPort = endPort;
- return self();
- }
-
- /**
- * @see IngressRule#getICMPCode()
- */
- public T ICMPCode(int ICMPCode) {
- this.ICMPCode = ICMPCode;
- return self();
- }
-
- /**
- * @see IngressRule#getICMPType()
- */
- public T ICMPType(int ICMPType) {
- this.ICMPType = ICMPType;
- return self();
- }
-
- /**
- * @see IngressRule#getProtocol()
- */
- public T protocol(String protocol) {
- this.protocol = protocol;
- return self();
- }
-
- /**
- * @see IngressRule#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see IngressRule#getSecurityGroupName()
- */
- public T securityGroupName(String securityGroupName) {
- this.securityGroupName = securityGroupName;
- return self();
- }
-
- /**
- * @see IngressRule#getStartPort()
- */
- public T startPort(int startPort) {
- this.startPort = startPort;
- return self();
- }
-
- public IngressRule build() {
- return new IngressRule(account, CIDR, endPort, ICMPCode, ICMPType, protocol, id, securityGroupName, startPort);
- }
-
- public T fromIngressRule(IngressRule in) {
- return this
- .account(in.getAccount())
- .CIDR(in.getCIDR())
- .endPort(in.getEndPort())
- .ICMPCode(in.getICMPCode())
- .ICMPType(in.getICMPType())
- .protocol(in.getProtocol())
- .id(in.getId())
- .securityGroupName(in.getSecurityGroupName())
- .startPort(in.getStartPort());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String account;
- private final String CIDR;
- private final int endPort;
- private final int ICMPCode;
- private final int ICMPType;
- private final String protocol;
- private final String id;
- private final String securityGroupName;
- private final int startPort;
-
- @ConstructorProperties({
- "account", "cidr", "endport", "icmpcode", "icmptype", "protocol", "ruleid", "securitygroupname", "startport"
- })
- protected IngressRule(@Nullable String account, @Nullable String CIDR, int endPort, int ICMPCode, int ICMPType,
- @Nullable String protocol, String id, @Nullable String securityGroupName, int startPort) {
- this.account = account;
- this.CIDR = CIDR;
- this.endPort = endPort;
- this.ICMPCode = ICMPCode;
- this.ICMPType = ICMPType;
- this.protocol = protocol;
- this.id = checkNotNull(id, "id");
- this.securityGroupName = securityGroupName;
- this.startPort = startPort;
- }
-
- /**
- * @return account owning the ingress rule
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the CIDR notation for the base IP address of the ingress rule
- */
- @Nullable
- public String getCIDR() {
- return this.CIDR;
- }
-
- /**
- * @return the ending IP of the ingress rule
- */
- public int getEndPort() {
- return this.endPort;
- }
-
- /**
- * @return the code for the ICMP message response
- */
- public int getICMPCode() {
- return this.ICMPCode;
- }
-
- /**
- * @return the type of the ICMP message response
- */
- public int getICMPType() {
- return this.ICMPType;
- }
-
- /**
- * @return the protocol of the ingress rule
- */
- @Nullable
- public String getProtocol() {
- return this.protocol;
- }
-
- /**
- * @return the id of the ingress rule
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return security group name
- */
- @Nullable
- public String getSecurityGroupName() {
- return this.securityGroupName;
- }
-
- /**
- * @return the starting IP of the ingress rule
- */
- public int getStartPort() {
- return this.startPort;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(account, CIDR, endPort, ICMPCode, ICMPType, protocol, id, securityGroupName, startPort);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- IngressRule that = IngressRule.class.cast(obj);
- return Objects.equal(this.account, that.account)
- && Objects.equal(this.CIDR, that.CIDR)
- && Objects.equal(this.endPort, that.endPort)
- && Objects.equal(this.ICMPCode, that.ICMPCode)
- && Objects.equal(this.ICMPType, that.ICMPType)
- && Objects.equal(this.protocol, that.protocol)
- && Objects.equal(this.id, that.id)
- && Objects.equal(this.securityGroupName, that.securityGroupName)
- && Objects.equal(this.startPort, that.startPort);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("account", account).add("CIDR", CIDR).add("endPort", endPort).add("ICMPCode", ICMPCode)
- .add("ICMPType", ICMPType).add("protocol", protocol).add("id", id).add("securityGroupName", securityGroupName).add("startPort", startPort);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(IngressRule o) {
- return id.compareTo(o.getId());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/JobResult.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
deleted file mode 100644
index 7df671e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * The result of an operation.
- * <p/>
- * A handful of Cloudstack API calls return this structure when there is no domain model data to return - for example,
- * when deleting an object.
- */
-public class JobResult {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromJobResult(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected boolean success;
- protected String displayText;
-
- /**
- * @see JobResult#isSuccess()
- */
- public T success(boolean success) {
- this.success = success;
- return self();
- }
-
- /**
- * @see JobResult#getDisplayText()
- */
- public T displayText(String displayText) {
- this.displayText = displayText;
- return self();
- }
-
- public JobResult build() {
- return new JobResult(success, displayText);
- }
-
- public T fromJobResult(JobResult in) {
- return this
- .success(in.isSuccess())
- .displayText(in.getDisplayText());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final boolean success;
- private final String displayText;
-
- @ConstructorProperties({
- "success", "displaytext"
- })
- protected JobResult(boolean success, @Nullable String displayText) {
- this.success = success;
- this.displayText = displayText;
- }
-
- public boolean isSuccess() {
- return this.success;
- }
-
- @Nullable
- public String getDisplayText() {
- return this.displayText;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(success, displayText);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- JobResult that = JobResult.class.cast(obj);
- return Objects.equal(this.success, that.success)
- && Objects.equal(this.displayText, that.displayText);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("success", success).add("displayText", displayText);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
deleted file mode 100644
index d0e9f10..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-
-/**
- * Class LoadBalancerRule
- */
-public class LoadBalancerRule {
-
- /**
- */
- public static enum State {
- ADD, ACTIVE, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name());
- }
-
- public static State fromValue(String state) {
- try {
- return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- public static enum Algorithm {
- SOURCE, ROUNDROBIN, LEASTCONN, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return name().toLowerCase();
- }
-
- public static Algorithm fromValue(String algorithm) {
- try {
- return Algorithm.valueOf(checkNotNull(algorithm, "algorithm").toUpperCase());
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromLoadBalancerRule(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String account;
- protected LoadBalancerRule.Algorithm algorithm;
- protected String description;
- protected String domain;
- protected String domainId;
- protected String name;
- protected int privatePort;
- protected String publicIP;
- protected String publicIPId;
- protected int publicPort;
- protected LoadBalancerRule.State state;
- protected Set<String> CIDRs = ImmutableSet.of();
- protected String zoneId;
-
- /**
- * @see LoadBalancerRule#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getAccount()
- */
- public T account(String account) {
- this.account = account;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getAlgorithm()
- */
- public T algorithm(LoadBalancerRule.Algorithm algorithm) {
- this.algorithm = algorithm;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getPrivatePort()
- */
- public T privatePort(int privatePort) {
- this.privatePort = privatePort;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getPublicIP()
- */
- public T publicIP(String publicIP) {
- this.publicIP = publicIP;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getPublicIPId()
- */
- public T publicIPId(String publicIPId) {
- this.publicIPId = publicIPId;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getPublicPort()
- */
- public T publicPort(int publicPort) {
- this.publicPort = publicPort;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getState()
- */
- public T state(LoadBalancerRule.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see LoadBalancerRule#getCIDRs()
- */
- public T CIDRs(Set<String> CIDRs) {
- this.CIDRs = ImmutableSet.copyOf(checkNotNull(CIDRs, "CIDRs"));
- return self();
- }
-
- public T CIDRs(String... in) {
- return CIDRs(ImmutableSet.copyOf(in));
- }
-
- /**
- * @see LoadBalancerRule#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- public LoadBalancerRule build() {
- return new LoadBalancerRule(id, account, algorithm, description, domain, domainId, name, privatePort, publicIP, publicIPId, publicPort, state, CIDRs, zoneId);
- }
-
- public T fromLoadBalancerRule(LoadBalancerRule in) {
- return this
- .id(in.getId())
- .account(in.getAccount())
- .algorithm(in.getAlgorithm())
- .description(in.getDescription())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .name(in.getName())
- .privatePort(in.getPrivatePort())
- .publicIP(in.getPublicIP())
- .publicIPId(in.getPublicIPId())
- .publicPort(in.getPublicPort())
- .state(in.getState())
- .CIDRs(in.getCIDRs())
- .zoneId(in.getZoneId());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String account;
- private final LoadBalancerRule.Algorithm algorithm;
- private final String description;
- private final String domain;
- private final String domainId;
- private final String name;
- private final int privatePort;
- private final String publicIP;
- private final String publicIPId;
- private final int publicPort;
- private final LoadBalancerRule.State state;
- private final Set<String> CIDRs;
- private final String zoneId;
-
-
- @ConstructorProperties({
- "id", "account", "algorithm", "description", "domain", "domainid", "name", "privateport", "publicip",
- "publicipid", "publicport", "state", "cidrlist", "zoneId"
- })
- private LoadBalancerRule(String id, @Nullable String account, @Nullable Algorithm algorithm,
- @Nullable String description, @Nullable String domain, @Nullable String domainId,
- @Nullable String name, int privatePort, @Nullable String publicIP,
- @Nullable String publicIPId, int publicPort, @Nullable State state,
- @Nullable String CIDRs, @Nullable String zoneId) {
- this(id, account, algorithm, description, domain, domainId, name, privatePort, publicIP, publicIPId, publicPort, state,
- splitStringOnCommas(CIDRs), zoneId);
- }
-
- private static Set<String> splitStringOnCommas(String in) {
- return in == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(in.split(","));
- }
-
- protected LoadBalancerRule(String id, @Nullable String account, @Nullable LoadBalancerRule.Algorithm algorithm,
- @Nullable String description, @Nullable String domain, @Nullable String domainId, @Nullable String name,
- int privatePort, @Nullable String publicIP, @Nullable String publicIPId, int publicPort,
- @Nullable LoadBalancerRule.State state, @Nullable Iterable<String> CIDRs, @Nullable String zoneId) {
- this.id = checkNotNull(id, "id");
- this.account = account;
- this.algorithm = algorithm;
- this.description = description;
- this.domain = domain;
- this.domainId = domainId;
- this.name = name;
- this.privatePort = privatePort;
- this.publicIP = publicIP;
- this.publicIPId = publicIPId;
- this.publicPort = publicPort;
- this.state = state;
- this.CIDRs = CIDRs == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(CIDRs);
- this.zoneId = zoneId;
- }
-
- /**
- * @return the load balancer rule ID
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the account of the load balancer rule
- */
- @Nullable
- public String getAccount() {
- return this.account;
- }
-
- /**
- * @return the load balancer algorithm (source, roundrobin, leastconn)
- */
- @Nullable
- public LoadBalancerRule.Algorithm getAlgorithm() {
- return this.algorithm;
- }
-
- /**
- * @return the description of the load balancer
- */
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- /**
- * @return the domain of the load balancer rule
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return the domain ID of the load balancer rule
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the name of the load balancer
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the private port
- */
- public int getPrivatePort() {
- return this.privatePort;
- }
-
- /**
- * @return the public ip address
- */
- @Nullable
- public String getPublicIP() {
- return this.publicIP;
- }
-
- /**
- * @return the public ip address id
- */
- @Nullable
- public String getPublicIPId() {
- return this.publicIPId;
- }
-
- /**
- * @return the public port
- */
- public int getPublicPort() {
- return this.publicPort;
- }
-
- /**
- * @return the state of the rule
- */
- @Nullable
- public LoadBalancerRule.State getState() {
- return this.state;
- }
-
- /**
- * @return the cidr list to forward traffic from
- */
- public Set<String> getCIDRs() {
- return this.CIDRs;
- }
-
- /**
- * @return the id of the zone the rule beStrings to
- */
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, account, algorithm, description, domain, domainId, name, privatePort, publicIP, publicIPId, publicPort, state, CIDRs, zoneId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- LoadBalancerRule that = LoadBalancerRule.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.account, that.account)
- && Objects.equal(this.algorithm, that.algorithm)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.privatePort, that.privatePort)
- && Objects.equal(this.publicIP, that.publicIP)
- && Objects.equal(this.publicIPId, that.publicIPId)
- && Objects.equal(this.publicPort, that.publicPort)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.CIDRs, that.CIDRs)
- && Objects.equal(this.zoneId, that.zoneId);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("account", account).add("algorithm", algorithm).add("description", description).add("domain", domain).add("domainId", domainId).add("name", name).add("privatePort", privatePort).add("publicIP", publicIP).add("publicIPId", publicIPId).add("publicPort", publicPort).add("state", state).add("CIDRs", CIDRs).add("zoneId", zoneId);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
[38/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java
deleted file mode 100644
index 7612b73..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAccountApi.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Account;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateAccountOptions;
-import org.jclouds.cloudstack.options.UpdateAccountOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Account features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalAccountApi extends DomainAccountApi {
-
- /**
- * Create a new Cloudstack account
- *
- * @param userName unique username.
- * @param accountType type of account
- * @param email
- * @param firstName
- * @param lastName
- * @param hashedPassword
- * Hashed password (Default is MD5). If you wish to use any other
- * hashing algorithm, you would need to write a custom authentication adapter See Docs section.
- * @param options
- * optional parameters
- * @return
- */
- @Named("createAccount")
- @GET
- @QueryParams(keys = "command", values = "createAccount")
- @SelectJson("account")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Account createAccount(@QueryParam("username") String userName,
- @QueryParam("accounttype") Account.Type accountType, @QueryParam("email") String email,
- @QueryParam("firstname") String firstName, @QueryParam("lastname") String lastName,
- @QueryParam("password") String hashedPassword, CreateAccountOptions... options);
-
- /**
- * Update an existing account
- *
- * @param accountName the current account name
- * @param domainId the ID of the domain were the account exists
- * @param newName new name for the account
- * @param options optional arguments
- * @return
- */
- @Named("updateAccount")
- @GET
- @QueryParams(keys = "command", values = "updateAccount")
- @SelectJson("account")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Account updateAccount(@QueryParam("account") String accountName,
- @QueryParam("domainid") String domainId, @QueryParam("newname") String newName, UpdateAccountOptions... options);
-
- /**
- * Delete an account with the specified ID
- *
- * @param accountId
- * @return
- */
- @Named("deleteAccount")
- @GET
- @QueryParams(keys = "command", values = "deleteAccount")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- void deleteAccount(@QueryParam("id") String id);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java
deleted file mode 100644
index c71ef17..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalAlertApi.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Alert;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListAlertsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Account features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalAlertApi {
-
- /**
- * List Alerts
- *
- * @return alert list or null if not found
- */
- @Named("listAlerts")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listAlerts", "true" })
- @SelectJson("alert")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Alert> listAlerts(ListAlertsOptions...options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java
deleted file mode 100644
index eb0d0fa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityApi.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Capacity;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListCapacityOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Account features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalCapacityApi {
-
- /**
- * List Capacities
- *
- * @return alert list or null if not found
- */
- @Named("listCapacity")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listCapacity", "true" })
- @SelectJson("capacity")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Capacity> listCapacity(ListCapacityOptions...options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java
deleted file mode 100644
index 1d9b5b8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationApi.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.ConfigurationEntry;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListConfigurationEntriesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Configuration features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalConfigurationApi extends ConfigurationApi {
-
- /**
- * List all configuration entries
- *
- * @param options
- * result set filtering options
- * @return
- * a set of entries or empty
- */
- @Named("listConfigurations")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listConfigurations", "true" })
- @SelectJson("configuration")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<ConfigurationEntry> listConfigurationEntries(ListConfigurationEntriesOptions... options);
-
- /**
- * Update a configuration entry
- *
- * @param name
- * the name of the configuration
- * @param value
- * the value of the configuration
- * @return
- * the updated configuration value
- */
- @Named("updateConfiguration")
- @GET
- @QueryParams(keys = "command", values = "updateConfiguration")
- @SelectJson("configuration")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- ConfigurationEntry updateConfigurationEntry(
- @QueryParam("name") String name, @QueryParam("value") String value);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java
deleted file mode 100644
index fabfc41..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalDomainApi.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Domain;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateDomainOptions;
-import org.jclouds.cloudstack.options.UpdateDomainOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Domain features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalDomainApi extends DomainDomainApi {
-
- /**
- * Create new Domain
- *
- * @param name
- * domain name
- * @param options
- * optional arguments
- * @return
- * domain instance
- */
- @Named("createDomain")
- @GET
- @QueryParams(keys = "command", values = "createDomain")
- @SelectJson("domain")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Domain createDomain(@QueryParam("name") String name, CreateDomainOptions... options);
-
- /**
- * Update a domain
- *
- * @param domainId
- * the ID of the domain
- * @param options
- * optional arguments
- * @return
- * domain instance
- */
- @Named("updateDomain")
- @GET
- @QueryParams(keys = "command", values = "updateDomain")
- @SelectJson("domain")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Domain updateDomain(@QueryParam("id") String domainId, UpdateDomainOptions... options);
-
- /**
- * Delete domain (without deleting attached resources)
- *
- * @param id
- * the domain ID
- */
- @Named("deleteDomain")
- @GET
- @QueryParams(keys = {"command", "cleanup"}, values = {"deleteDomain", "false"})
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteOnlyDomain(@QueryParam("id") String id);
-
- /**
- * Delete domain and cleanup all attached resources
- *
- * @param id
- * the domain ID
- */
- @Named("deleteDomain")
- @GET
- @QueryParams(keys = {"command", "cleanup"}, values = {"deleteDomain", "true"})
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteDomainAndAttachedResources(@QueryParam("id") String id);
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java
deleted file mode 100644
index 2255d71..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalHostApi.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Cluster;
-import org.jclouds.cloudstack.domain.Host;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.AddClusterOptions;
-import org.jclouds.cloudstack.options.AddHostOptions;
-import org.jclouds.cloudstack.options.AddSecondaryStorageOptions;
-import org.jclouds.cloudstack.options.DeleteHostOptions;
-import org.jclouds.cloudstack.options.ListClustersOptions;
-import org.jclouds.cloudstack.options.ListHostsOptions;
-import org.jclouds.cloudstack.options.UpdateClusterOptions;
-import org.jclouds.cloudstack.options.UpdateHostOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalHostApi {
-
- /**
- * Lists hosts
- *
- * @param options
- * if present, how to constrain the list.
- * @return hosts matching query, or empty set, if no service
- * offerings are found
- */
- @Named("listHosts")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listHosts", "true" })
- @SelectJson("host")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Host> listHosts(ListHostsOptions... options);
-
- /**
- * Adds a new host.
- *
- * @param zoneId the Zone ID for the host
- * @param url the host URL
- * @param hypervisor hypervisor type of the host
- * @param username the username for the host
- * @param password the password for the host
- * @param options optional arguments
- * @return the new host.
- */
- @Named("addHost")
- @GET
- @QueryParams(keys = "command", values = "addHost")
- @SelectJson("host")
- @Consumes(MediaType.APPLICATION_JSON)
- Host addHost(@QueryParam("zoneid") String zoneId, @QueryParam("url") String url, @QueryParam("hypervisor") String hypervisor, @QueryParam("username") String username, @QueryParam("password") String password, AddHostOptions... options);
-
- /**
- * Updates a host.
- *
- * @param hostId the ID of the host to update
- * @param options optional arguments
- * @return the modified host.
- */
- @Named("updateHost")
- @GET
- @QueryParams(keys = "command", values = "updateHost")
- @SelectJson("host")
- @Consumes(MediaType.APPLICATION_JSON)
- Host updateHost(@QueryParam("id") String hostId, UpdateHostOptions... options);
-
- /**
- * Update password of a host on management server.
- *
- * @param hostId the host ID
- * @param username the username for the host
- * @param password the password for the host
- */
- @Named("updateHostPassword")
- @GET
- @QueryParams(keys = "command", values = "updateHostPassword")
- @Consumes(MediaType.APPLICATION_JSON)
- void updateHostPassword(@QueryParam("hostid") String hostId, @QueryParam("username") String username, @QueryParam("password") String password);
-
- /**
- * Deletes a host.
- *
- * @param hostId the host ID
- * @param options optional arguments
- */
- @Named("deleteHost")
- @GET
- @QueryParams(keys = "command", values = "deleteHost")
- @Consumes(MediaType.APPLICATION_JSON)
- void deleteHost(@QueryParam("id") String hostId, DeleteHostOptions... options);
-
- /**
- * Prepares a host for maintenance.
- *
- * @param hostId the host ID
- * @return a job reference number for tracking this asynchronous job.
- */
- @Named("prepareHostForMaintenance")
- @GET
- @QueryParams(keys = "command", values = "prepareHostForMaintenance")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String prepareHostForMaintenance(@QueryParam("id") String hostId);
-
- /**
- * Cancels host maintenance.
- *
- * @param hostId the host ID
- * @return a job reference number for tracking this asynchronous job.
- */
- @Named("cancelHostMaintenance")
- @GET
- @QueryParams(keys = "command", values = "cancelHostMaintenance")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String cancelHostMaintenance(@QueryParam("id") String hostId);
-
- /**
- * Reconnects a host.
- *
- * @param hostId
- * @return a job reference number for tracking this asynchronous job.
- */
- @Named("reconnectHost")
- @GET
- @QueryParams(keys = "command", values = "reconnectHost")
- @SelectJson("jobid")
- @Consumes(MediaType.APPLICATION_JSON)
- String reconnectHost(@QueryParam("id") String hostId);
-
- /**
- * Adds secondary storage.
- *
- * @param url the URL for the secondary storage
- * @param options optional arguments
- * @return the host of the storage.
- */
- @Named("addSecondaryStorage")
- @GET
- @QueryParams(keys = "command", values = "addSecondaryStorage")
- @SelectJson("host")
- @Consumes(MediaType.APPLICATION_JSON)
- Host addSecondaryStorage(@QueryParam("url") String url, AddSecondaryStorageOptions... options);
-
- /**
- * @see GlobalHostApi#listClusters
- */
- @Named("listClusters")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listClusters", "true" })
- @SelectJson("cluster")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Cluster> listClusters(ListClustersOptions... options);
-
- /**
- * Adds a new cluster.
- *
- * @param zoneId the Zone ID for the cluster
- * @param clusterName the cluster name
- * @param clusterType type of the cluster
- * @param hypervisor hypervisor type of the cluster
- * @param options optional arguments
- * @return the new cluster.
- */
- @Named("addCluster")
- @GET
- @QueryParams(keys = "command", values = "addCluster")
- @SelectJson("cluster")
- @Consumes(MediaType.APPLICATION_JSON)
- Cluster addCluster(@QueryParam("zoneid") String zoneId, @QueryParam("clustername") String clusterName, @QueryParam("clustertype") Host.ClusterType clusterType, @QueryParam("hypervisor") String hypervisor, AddClusterOptions... options);
-
- /**
- * Updates an existing cluster.
- *
- * @param clusterId the ID of the cluster
- * @param options optional arguments
- * @return the modified cluster
- */
- @Named("updateCluster")
- @GET
- @QueryParams(keys = "command", values = "updateCluster")
- @SelectJson("cluster")
- @Consumes(MediaType.APPLICATION_JSON)
- Cluster updateCluster(@QueryParam("id") String clusterId, UpdateClusterOptions... options);
-
- /**
- * Update password of a cluster on management server.
- *
- * @param clusterId the cluster ID
- * @param username the username for the cluster
- * @param password the password for the cluster
- */
- @Named("updateHostPassword")
- @GET
- @QueryParams(keys = "command", values = "updateHostPassword")
- @SelectJson("cluster")
- @Consumes(MediaType.APPLICATION_JSON)
- void updateClusterPassword(@QueryParam("clusterid") String clusterId, @QueryParam("username") String username, @QueryParam("password") String password);
-
- /**
- * Deletes a cluster.
- *
- * @param clusterId the cluster ID
- */
- @Named("deleteCluster")
- @GET
- @QueryParams(keys = "command", values = "deleteCluster")
- @Consumes(MediaType.APPLICATION_JSON)
- void deleteCluster(@QueryParam("id") String clusterId);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java
deleted file mode 100644
index 793f277..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingApi.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.DiskOffering;
-import org.jclouds.cloudstack.domain.NetworkOffering;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateDiskOfferingOptions;
-import org.jclouds.cloudstack.options.CreateServiceOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateDiskOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions;
-import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalOfferingApi extends OfferingApi {
-
- /**
- * Create a new service offering
- *
- * @param name
- * name of the service offering
- * @param displayText
- * display name
- * @param cpuNumber
- * number of CPUs
- * @param cpuSpeedInMHz
- * CPU speed in MHz
- * @param memoryInMB
- * the total memory of the service offering in MB
- * @param options
- * optional arguments
- * @return
- * service offering instance
- */
- @Named("createServiceOffering")
- @GET
- @QueryParams(keys = "command", values = "createServiceOffering")
- @SelectJson("serviceoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- ServiceOffering createServiceOffering(@QueryParam("name") String name, @QueryParam("displaytext") String displayText,
- @QueryParam("cpunumber") int cpuNumber, @QueryParam("cpuspeed") int cpuSpeedInMHz, @QueryParam("memory") int memoryInMB, CreateServiceOfferingOptions... options);
-
-
- /**
- * Update an existing service offering
- *
- * @param id
- * service offering ID
- * @param options
- * optional arguments
- * @return
- * service offering instance
- */
- @Named("updateServiceOffering")
- @GET
- @QueryParams(keys = "command", values = "updateServiceOffering")
- @SelectJson("serviceoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- ServiceOffering updateServiceOffering(@QueryParam("id") String id, UpdateServiceOfferingOptions... options);
-
- /**
- * Delete service offering
- *
- * @param id
- * the ID of the service offering
- */
- @Named("deleteServiceOffering")
- @GET
- @QueryParams(keys = "command", values = "deleteServiceOffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- void deleteServiceOffering(@QueryParam("id") String id);
-
- /**
- * Create a new disk offering
- *
- * @param name
- * name of the disk offering
- * @param displayText
- * display text for disk offering
- * @param options
- * optional arguments
- * @return
- * disk offering instance
- */
- @Named("createDiskOffering")
- @GET
- @QueryParams(keys = "command", values = "createDiskOffering")
- @SelectJson("diskoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- DiskOffering createDiskOffering(@QueryParam("name") String name,
- @QueryParam("displaytext") String displayText, CreateDiskOfferingOptions... options);
-
- /**
- * Update a disk offering
- *
- * @param id
- * disk offering ID
- * @param options
- * optional arguments
- * @return
- * disk offering instance
- */
- @Named("updateDiskOffering")
- @GET
- @QueryParams(keys = "command", values = "updateDiskOffering")
- @SelectJson("diskoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- DiskOffering updateDiskOffering(@QueryParam("id") String id, UpdateDiskOfferingOptions... options);
-
- /**
- * Delete disk offering
- *
- * @param id
- * the ID of the disk offering
- */
- @Named("deleteDiskOffering")
- @GET
- @QueryParams(keys = "command", values = "deleteDiskOffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- void deleteDiskOffering(@QueryParam("id") String id);
-
- /**
- * Update network offering
- *
- * @param id
- * the id of the network offering
- * @param options
- * optional arguments
- * @return
- * network offering instance
- */
- @Named("updateNetworkOffering")
- @GET
- @QueryParams(keys = "command", values = "updateNetworkOffering")
- @SelectJson("networkoffering")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- NetworkOffering updateNetworkOffering(@QueryParam("id") String id, UpdateNetworkOfferingOptions... options);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java
deleted file mode 100644
index d76abaa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalPodApi.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.Pod;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreatePodOptions;
-import org.jclouds.cloudstack.options.ListPodsOptions;
-import org.jclouds.cloudstack.options.UpdatePodOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Pod features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalPodApi {
-
- /**
- * Lists pods
- *
- * @param options
- * if present, how to constrain the list.
- * @return pods matching query, or empty set, if no pods are found
- */
- @Named("listPods")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listPods", "true" })
- @SelectJson("pod")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<Pod> listPods(ListPodsOptions... options);
-
- /**
- * get a specific pod by id
- *
- * @param id
- * pod to get
- * @return pod or null if not found
- */
- @Named("listPods")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listPods", "true" })
- @SelectJson("pod")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Pod getPod(@QueryParam("id") String id);
-
- /**
- * Creates a new Pod.
- *
- * @param name the name of the Pod
- * @param zoneId the Zone ID in which the Pod will be created
- * @param startIp the starting IP address for the Pod
- * @param endIp the ending IP address for the Pod
- * @param gateway the gateway for the Pod
- * @param netmask the netmask for the Pod
- * @param createPodOptions optional arguments
- * @return the new Pod
- */
- @Named("createPod")
- @GET
- @QueryParams(keys = "command", values = "createPod")
- @SelectJson("pod")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Pod createPod(@QueryParam("name") String name, @QueryParam("zoneid") String zoneId, @QueryParam("startip") String startIp, @QueryParam("endip") String endIp, @QueryParam("gateway") String gateway, @QueryParam("netmask") String netmask, CreatePodOptions... createPodOptions);
-
- /**
- * Creates a new Pod.
- *
- * @param name the name of the Pod
- * @param zoneId the Zone ID in which the Pod will be created
- * @param startIp the starting IP address for the Pod
- * @param gateway the gateway for the Pod
- * @param netmask the netmask for the Pod
- * @param createPodOptions optional arguments
- * @return the new Pod
- */
- @Named("createPod")
- @GET
- @QueryParams(keys = "command", values = "createPod")
- @SelectJson("pod")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Pod createPod(@QueryParam("name") String name, @QueryParam("zoneid") String zoneId, @QueryParam("startip") String startIp, @QueryParam("gateway") String gateway, @QueryParam("netmask") String netmask, CreatePodOptions... createPodOptions);
-
- /**
- * Deletes a Pod.
- * @param id the ID of the Pod
- */
- @Named("deletePod")
- @GET
- @QueryParams(keys = "command", values = "deletePod")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(VoidOnNotFoundOr404.class)
- void deletePod(@QueryParam("id") String id);
-
- /**
- * Updates a Pod.
- * @param id the ID of the Pod
- * @param updatePodOptions optional arguments
- * @return the updated pod
- */
- @Named("updatePod")
- @GET
- @QueryParams(keys = "command", values = "updatePod")
- @SelectJson("pod")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Pod updatePod(@QueryParam("id") String id, UpdatePodOptions... updatePodOptions);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java
deleted file mode 100644
index 6fa00ea..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolApi.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.cloudstack.domain.StoragePool;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListStoragePoolsOptions;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack storage pool features.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalStoragePoolApi {
-
- @Named("listStoragePools")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listStoragePools", "true" })
- @SelectJson("storagepool")
- @Consumes(MediaType.APPLICATION_JSON)
- Set<StoragePool> listStoragePools(ListStoragePoolsOptions... options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java
deleted file mode 100644
index acc8d91..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUsageApi.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Date;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.cloudstack.domain.JobResult;
-import org.jclouds.cloudstack.domain.UsageRecord;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.functions.DateToYyyyMmDd;
-import org.jclouds.cloudstack.options.GenerateUsageRecordsOptions;
-import org.jclouds.cloudstack.options.ListUsageRecordsOptions;
-import org.jclouds.rest.annotations.ParamParser;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack usage features.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalUsageApi {
-
- @Named("generateUsageRecords")
- @GET
- @QueryParams(keys = "command", values = "generateUsageRecords")
- @SelectJson("generateusagerecordsresponse")
- @Consumes(MediaType.APPLICATION_JSON)
- JobResult generateUsageRecords(@QueryParam("startdate") @ParamParser(DateToYyyyMmDd.class) Date start, @QueryParam("enddate") @ParamParser(DateToYyyyMmDd.class) Date end, GenerateUsageRecordsOptions... options);
-
- @Named("listUsageRecords")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listUsageRecords", "true" })
- @SelectJson("usagerecord")
- @Consumes(MediaType.APPLICATION_JSON)
- Set<UsageRecord> listUsageRecords(@QueryParam("startdate") @ParamParser(DateToYyyyMmDd.class) Date start, @QueryParam("enddate") @ParamParser(DateToYyyyMmDd.class) Date end, ListUsageRecordsOptions... options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java
deleted file mode 100644
index 430b292..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalUserApi.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.ApiKeyPair;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateUserOptions;
-import org.jclouds.cloudstack.options.UpdateUserOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack User features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalUserApi extends DomainUserApi {
-
- /**
- * Create an user for an account that already exists
- *
- * @param userName unique user name
- * @param accountName Creates the user under the specified account. If no
- * account is specified, the username will be used as the account name.
- * @param email
- * @param hashedPassword Hashed password (Default is MD5). If you wish to use
- * any other hashing algorithm, you would need to write a custom authentication
- * adapter See Docs section.
- * @param firstName
- * @param lastName
- * @param options optional arguments
- * @return
- */
- @Named("createUser")
- @GET
- @QueryParams(keys = "command", values = "createUser")
- @SelectJson("user")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- User createUser(@QueryParam("username") String userName, @QueryParam("account") String accountName,
- @QueryParam("email") String email, @QueryParam("password") String hashedPassword,
- @QueryParam("firstname") String firstName, @QueryParam("lastname") String lastName, CreateUserOptions... options);
-
- /**
- * This command allows a user to register for the developer API, returning a
- * secret key and an API key
- *
- * @param userId the ID of the user
- * @return
- */
- @Named("registerUserKeys")
- @GET
- @QueryParams(keys = "command", values = "registerUserKeys")
- @SelectJson("userkeys")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- ApiKeyPair registerUserKeys(@QueryParam("id") String userId);
-
- /**
- * Update an user
- *
- * @param id the user ID
- * @param options optional arguments
- * @return
- */
- @Named("updateUser")
- @GET
- @QueryParams(keys = "command", values = "updateUser")
- @SelectJson("user")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- User updateUser(@QueryParam("id") String id, UpdateUserOptions... options);
-
- /**
- * Delete an user with the specified ID
- *
- * @param id user ID
- */
- @Named("deleteUser")
- @GET
- @QueryParams(keys = "command", values = "deleteUser")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- void deleteUser(@QueryParam("id") String id);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java
deleted file mode 100644
index f5b0b87..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalVlanApi.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.VlanIPRange;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions;
-import org.jclouds.cloudstack.options.ListVlanIPRangesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalVlanApi {
-
- /**
- * Get the details of an IP range by its id.
- * @param id the required IP range.
- * @return the requested IP range.
- */
- @Named("listVlanIpRanges")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listVlanIpRanges", "true" })
- @SelectJson("vlaniprange")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- VlanIPRange getVlanIPRange(@QueryParam("id") String id);
-
- /**
- * Lists all VLAN IP ranges.
- *
- * @param options optional arguments.
- * @return the list of IP ranges that match the criteria.
- */
- @Named("listVlanIpRanges")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listVlanIpRanges", "true" })
- @SelectJson("vlaniprange")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<VlanIPRange> listVlanIPRanges(ListVlanIPRangesOptions... options);
-
- /**
- * Creates a VLAN IP range.
- *
- * @param startIP the beginning IP address in the VLAN IP range
- * @param endIP the ending IP address in the VLAN IP range
- * @param options optional arguments
- * @return the newly-create IP range.
- */
- @Named("createVlanIpRange")
- @GET
- @QueryParams(keys = "command", values = "createVlanIpRange")
- @SelectJson("vlaniprange")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- VlanIPRange createVlanIPRange(@QueryParam("startip") String startIP, @QueryParam("endip") String endIP, CreateVlanIPRangeOptions... options);
-
- /**
- * Deletes a VLAN IP range.
- * @param rangeId the id of the VLAN IP range
- * @return void
- */
- @Named("deleteVlanIpRange")
- @GET
- @QueryParams(keys = "command", values = "deleteVlanIpRange")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteVlanIPRange(@QueryParam("id") String rangeId);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java
deleted file mode 100644
index 37f1805..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GlobalZoneApi.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateZoneOptions;
-import org.jclouds.cloudstack.options.UpdateZoneOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack Account features available to Global
- * Admin users.
- *
- * @see <a href=
- * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GlobalZoneApi extends ZoneApi {
-
- /**
- * Create a new Zone
- *
- * @param name
- * the name of the Zone
- * @param networkType
- * network type of the zone, can be Basic or Advanced
- * @param dns1
- * the first DNS for the Zone
- * @param internalDns1
- * the first internal DNS for the Zone
- * @param options
- * optional arguments
- * @return
- * zone instance or null
- */
- @Named("createZone")
- @GET
- @QueryParams(keys = "command", values = "createZone")
- @SelectJson("zone")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Zone createZone(@QueryParam("name") String name, @QueryParam("networktype") NetworkType networkType,
- @QueryParam("dns1") String externalDns1, @QueryParam("internaldns1") String internalDns1, CreateZoneOptions... options);
-
- /**
- * Update a zone
- *
- * @param id
- * the ID of the Zone
- * @param options
- * optional arguments
- * @return
- */
- @Named("updateZone")
- @GET
- @QueryParams(keys = "command", values = "updateZone")
- @SelectJson("zone")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- Zone updateZone(@QueryParam("id") String id, UpdateZoneOptions... options);
-
- /**
- * Delete a zone with a specific ID
- *
- * @param zoneId
- * the ID of the Zone
- */
- @Named("deleteZone")
- @GET
- @QueryParams(keys = "command", values = "deleteZone")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(VoidOnNotFoundOr404.class)
- void deleteZone(@QueryParam("id") String id);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java
deleted file mode 100644
index 9d43b01..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/GuestOSApi.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.functions.ParseIdToNameEntryFromHttpResponse;
-import org.jclouds.cloudstack.functions.ParseIdToNameFromHttpResponse;
-import org.jclouds.cloudstack.options.ListOSTypesOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface GuestOSApi {
-
- /**
- * Lists all supported OS types for this cloud.
- *
- * @param options
- * if present, how to constrain the list
- * @return os types matching query, or empty set, if no types are found
- */
- @Named("listOsTypes")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listOsTypes", "true" })
- @SelectJson("ostype")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<OSType> listOSTypes(ListOSTypesOptions... options);
-
- /**
- * get a specific os type by id
- *
- * @param id
- * os type to get
- * @return os type or null if not found
- */
- @Named("listOsTypes")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listOsTypes", "true" })
- @SelectJson("ostype")
- @OnlyElement
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(NullOnNotFoundOr404.class)
- OSType getOSType(@QueryParam("id") String id);
-
- /**
- * Lists all supported OS categories for this cloud.
- *
- * @return os categories matching query, or empty set, if no categories are
- * found
- */
- @Named("listOsCategories")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listOsCategories", "true" })
- @ResponseParser(ParseIdToNameFromHttpResponse.class)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Map<String, String> listOSCategories();
-
- /**
- * get a specific os category by id
- *
- * @param id
- * os category to get
- * @return os category or null if not found
- */
- @Named("listOsCategories")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listOsCategories", "true" })
- @ResponseParser(ParseIdToNameEntryFromHttpResponse.class)
- @Fallback(NullOnNotFoundOr404.class)
- Map.Entry<String, String> getOSCategory(@QueryParam("id") String id);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java
deleted file mode 100644
index 1b132fe..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/HypervisorApi.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.functions.ParseNamesFromHttpResponse;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-
-/**
- * Provides synchronous access to cloudstack via their REST API.
- * <p/>
- *
- * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface HypervisorApi {
-
- /**
- * @see HypervisorApi#listHypervisors
- */
- @Named("listHypervisors")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listHypervisors", "true" })
- @ResponseParser(ParseNamesFromHttpResponse.class)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<String> listHypervisors();
-
- /**
- * @see HypervisorApi#listHypervisorsInZone
- */
- @Named("listHypervisors")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listHypervisors", "true" })
- @ResponseParser(ParseNamesFromHttpResponse.class)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<String> listHypervisorsInZone(@QueryParam("zoneid") String zoneId);
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ISOApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ISOApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ISOApi.java
deleted file mode 100644
index 241e286..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/ISOApi.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.ExtractMode;
-import org.jclouds.cloudstack.domain.ISO;
-import org.jclouds.cloudstack.domain.ISOPermissions;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.DeleteISOOptions;
-import org.jclouds.cloudstack.options.ExtractISOOptions;
-import org.jclouds.cloudstack.options.ListISOsOptions;
-import org.jclouds.cloudstack.options.RegisterISOOptions;
-import org.jclouds.cloudstack.options.UpdateISOOptions;
-import org.jclouds.cloudstack.options.UpdateISOPermissionsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.OnlyElement;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-import org.jclouds.rest.annotations.Unwrap;
-
-/**
- *
- * <p/>
- *
- * @see http://download.cloud.com/releases/2.2.12/api/TOC_User.html
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface ISOApi {
-
- /**
- * Attaches an ISO to a virtual machine.
- *
- * @param isoId the ID of the ISO file
- * @param vmId the ID of the virtual machine
- * @return an asynchronous job response.
- */
- @Named("attachIso")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "attachIso")
- @Unwrap
- AsyncCreateResponse attachISO(@QueryParam("id") String isoId, @QueryParam("virtualmachineid") String vmId);
-
- /**
- * Detaches any ISO file (if any) currently attached to a virtual machine.
- *
- * @param vmId The ID of the virtual machine
- * @return an asynchronous job response.
- */
- @Named("detachIso")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "detachIso")
- @Unwrap
- AsyncCreateResponse detachISO(@QueryParam("virtualmachineid") String vmId);
-
- /**
- * Gets information about an ISO by its ID.
- *
- * @param id the ID of the ISO file
- * @return the ISO object matching the ID
- */
- @Named("listIsos")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = { "command", "listAll" }, values = { "listIsos", "true" })
- @SelectJson("iso")
- @OnlyElement
- @Fallback(NullOnNotFoundOr404.class)
- ISO getISO(@QueryParam("id") String id);
-
- /**
- * Lists all available ISO files.
- *
- * @param options optional arguments
- * @return a set of ISO objects the match the filter
- */
- @Named("listIsos")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = { "command", "listAll" }, values = { "listIsos", "true" })
- @SelectJson("iso")
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<ISO> listISOs(ListISOsOptions... options);
-
- /**
- * Registers an existing ISO into the Cloud.com Cloud.
- *
- * @param name the name of the ISO
- * @param displayText the display text of the ISO. This is usually used for display purposes.
- * @param url the URL to where the ISO is currently being hosted
- * @param zoneId the ID of the zone you wish to register the ISO to.
- * @param options optional arguments
- * @return the newly-added ISO
- */
- @Named("registerIso")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "registerIso")
- @SelectJson("iso")
- @OnlyElement
- ISO registerISO(@QueryParam("name") String name, @QueryParam("displaytext") String displayText, @QueryParam("url") String url, @QueryParam("zoneid") String zoneId, RegisterISOOptions... options);
-
- /**
- *
- *
- * @param id the ID of the ISO file
- * @param options optional arguments
- * @return the ISO object matching the ID
- */
- @Named("updateIso")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "updateIso")
- @Unwrap
- ISO updateISO(@QueryParam("id") String id, UpdateISOOptions... options);
-
- /**
- * Deletes an ISO file.
- *
- * @param id the ID of the ISO file
- * @param options optional arguments
- * @return an asynchronous job response.
- */
- @Named("deleteIso")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "deleteIso")
- @Unwrap
- AsyncCreateResponse deleteISO(@QueryParam("id") String id, DeleteISOOptions... options);
-
- /**
- * Copies a template from one zone to another.
- *
- * @param isoId Template ID.
- * @param sourceZoneId ID of the zone the template is currently hosted on.
- * @param destZoneId ID of the zone the template is being copied to.
- * @return an asynchronous job response.
- */
- @Named("copyIso")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "copyIso")
- @Unwrap
- AsyncCreateResponse copyISO(@QueryParam("id") String isoId, @QueryParam("sourcezoneid") String sourceZoneId, @QueryParam("destzoneid") String destZoneId);
-
- /**
- * Updates iso permissions
- *
- * @param id the template ID
- * @param options optional arguments
- * @return
- */
- @Named("updateIsoPermissions")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "updateIsoPermissions")
- @Unwrap
- void updateISOPermissions(@QueryParam("id") String id, UpdateISOPermissionsOptions... options);
-
- /**
- * List template visibility and all accounts that have permissions to view this template.
- *
- * @param id the template ID
- * @param options optional arguments
- * @return A set of the permissions on this ISO
- */
- @Named("listIsoPermissions")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = { "command", "listAll" }, values = { "listIsoPermissions", "true" })
- @SelectJson("templatepermission")
- ISOPermissions listISOPermissions(@QueryParam("id") String id, AccountInDomainOptions... options);
-
- /**
- * Extracts an ISO
- *
- * @param id the ID of the ISO file
- * @param mode the mode of extraction - HTTP_DOWNLOAD or FTP_UPLOAD
- * @param zoneId the ID of the zone where the ISO is originally located
- * @param options optional arguments
- * @return an asynchronous job response.
- */
- @Named("extractIso")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @QueryParams(keys = "command", values = "extractIso")
- @Unwrap
- AsyncCreateResponse extractISO(@QueryParam("id") String id, @QueryParam("mode") ExtractMode mode, @QueryParam("zoneid") String zoneId, ExtractISOOptions... options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LimitApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LimitApi.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LimitApi.java
deleted file mode 100644
index c07ccb2..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/features/LimitApi.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.features;
-
-import java.util.Set;
-
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.ResourceLimit;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.ListResourceLimitsOptions;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.SelectJson;
-
-/**
- * Provides synchronous access to CloudStack SSHKeyPair features.
- *
- * @see <a
- * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
- * />
- */
-@RequestFilters(AuthenticationFilter.class)
-@QueryParams(keys = "response", values = "json")
-public interface LimitApi {
- /**
- * List the resource limits.
- *
- * @param options if present, how to constrain the list
- */
- @Named("listResourceLimits")
- @GET
- @QueryParams(keys = { "command", "listAll" }, values = { "listResourceLimits", "true" })
- @SelectJson("resourcelimit")
- @Consumes(MediaType.APPLICATION_JSON)
- @Fallback(EmptySetOnNotFoundOr404.class)
- Set<ResourceLimit> listResourceLimits(ListResourceLimitsOptions... options);
-
-}
[47/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
deleted file mode 100644
index 1bcad0c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.options;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.compute.options.TemplateOptions;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * Contains options supported by the
- * {@link ComputeService#createNodesInGroup(String, int, TemplateOptions)} and
- * {@link ComputeService#createNodesInGroup(String, int, TemplateOptions)}
- * operations on the <em>gogrid</em> provider.
- *
- * <h2>Usage</h2> The recommended way to instantiate a
- * {@link CloudStackTemplateOptions} object is to statically import
- * {@code CloudStackTemplateOptions.*} and invoke a static creation method
- * followed by an instance mutator (if needed):
- * <p>
- *
- * <pre>
- * import static org.jclouds.compute.options.CloudStackTemplateOptions.Builder.*;
- * ComputeService client = // get connection
- * templateBuilder.options(inboundPorts(22, 80, 8080, 443));
- * Set<? extends NodeMetadata> set = client.createNodesInGroup(tag, 2, templateBuilder.build());
- * </pre>
- */
-public class CloudStackTemplateOptions extends TemplateOptions implements Cloneable {
-
- protected Set<String> securityGroupIds = Sets.<String> newLinkedHashSet();
- protected Map<String, String> ipsToNetworks = Maps.<String, String>newLinkedHashMap();
- protected String ipOnDefaultNetwork;
- protected String keyPair;
- protected boolean setupStaticNat = true;
- protected String account;
- protected String domainId;
- protected boolean generateKeyPair = false;
- protected boolean generateSecurityGroup = false;
- protected String diskOfferingId;
- protected int dataDiskSize;
-
- @Override
- public CloudStackTemplateOptions clone() {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- copyTo(options);
- return options;
- }
-
- @Override
- public void copyTo(TemplateOptions to) {
- super.copyTo(to);
- if (to instanceof CloudStackTemplateOptions) {
- CloudStackTemplateOptions eTo = CloudStackTemplateOptions.class.cast(to);
- eTo.securityGroupIds(this.securityGroupIds);
- eTo.ipsToNetworks(this.ipsToNetworks);
- eTo.ipOnDefaultNetwork(this.ipOnDefaultNetwork);
- eTo.keyPair(this.keyPair);
- eTo.generateKeyPair(shouldGenerateKeyPair());
- eTo.generateSecurityGroup(shouldGenerateSecurityGroup());
- eTo.account(this.account);
- eTo.domainId(this.domainId);
- eTo.setupStaticNat(setupStaticNat);
- eTo.diskOfferingId(diskOfferingId);
- eTo.dataDiskSize(dataDiskSize);
- }
- }
-
- /**
- * @see org.jclouds.cloudstack.options.DeployVirtualMachineOptions#diskOfferingId
- */
- public CloudStackTemplateOptions diskOfferingId(String diskOfferingId) {
- this.diskOfferingId = diskOfferingId;
- return this;
- }
-
- public String getDiskOfferingId() {
- return diskOfferingId;
- }
-
- /**
- * @see DeployVirtualMachineOptions#dataDiskSize
- */
- public CloudStackTemplateOptions dataDiskSize(int dataDiskSize) {
- this.dataDiskSize = dataDiskSize;
- return this;
- }
-
- public int getDataDiskSize() {
- return dataDiskSize;
- }
-
- /**
- * @see DeployVirtualMachineOptions#securityGroupId
- */
- public CloudStackTemplateOptions securityGroupId(String securityGroupId) {
- this.securityGroupIds.add(securityGroupId);
- return this;
- }
-
- /**
- * @see DeployVirtualMachineOptions#securityGroupIds
- */
- public CloudStackTemplateOptions securityGroupIds(Iterable<String> securityGroupIds) {
- Iterables.addAll(this.securityGroupIds, checkNotNull(securityGroupIds, "securityGroupIds was null"));
- return this;
- }
-
- public Set<String> getSecurityGroupIds() {
- return securityGroupIds;
- }
-
- /**
- * @see #shouldGenerateKeyPair()
- */
- public CloudStackTemplateOptions generateSecurityGroup(boolean enable) {
- this.generateSecurityGroup = enable;
- return this;
- }
-
- /**
- * @return true if auto generation of keypairs is enabled
- */
- public boolean shouldGenerateSecurityGroup() {
- return generateSecurityGroup;
- }
-
- /**
- * @deprecated See TemplateOptions#networks
- * @see DeployVirtualMachineOptions#networkId
- */
- @Deprecated
- public CloudStackTemplateOptions networkId(String networkId) {
- this.networks.add(networkId);
- return this;
- }
-
- /**
- * @deprecated See TemplateOptions#networks
- * @see DeployVirtualMachineOptions#networkIds
- */
- @Deprecated
- public CloudStackTemplateOptions networkIds(Iterable<String> networkIds) {
- Iterables.addAll(this.networks, checkNotNull(networkIds, "networkIds was null"));
- return this;
- }
-
- /**
- * @deprecated See TemplateOptions#getNetworks
- */
- @Deprecated
- public Set<String> getNetworkIds() {
- return this.getNetworks();
- }
-
- public CloudStackTemplateOptions setupStaticNat(boolean setupStaticNat) {
- this.setupStaticNat = setupStaticNat;
- return this;
- }
-
- public boolean shouldSetupStaticNat() {
- return this.setupStaticNat;
- }
-
- /**
- * @see DeployVirtualMachineOptions#ipOnDefaultNetwork
- */
- public CloudStackTemplateOptions ipOnDefaultNetwork(String ipOnDefaultNetwork) {
- this.ipOnDefaultNetwork = ipOnDefaultNetwork;
- return this;
- }
-
- public String getIpOnDefaultNetwork() {
- return ipOnDefaultNetwork;
- }
-
- /**
- * @see DeployVirtualMachineOptions#ipOnDefaultNetwork(String)
- */
- public CloudStackTemplateOptions ipsToNetworks(Map<String, String> ipsToNetworks) {
- this.ipsToNetworks.putAll(ipsToNetworks);
- return this;
- }
-
- public Map<String, String> getIpsToNetworks() {
- return ipsToNetworks;
- }
-
- /**
- * @see DeployVirtualMachineOptions#keyPair(String)
- */
- public CloudStackTemplateOptions keyPair(String keyPair) {
- this.keyPair = keyPair;
- return this;
- }
-
- public String getKeyPair() {
- return keyPair;
- }
-
- /**
- * @see #shouldGenerateKeyPair()
- */
- public CloudStackTemplateOptions generateKeyPair(boolean enable) {
- this.generateKeyPair = enable;
- return this;
- }
-
- /**
- * @return true if auto generation of keypairs is enabled
- */
- public boolean shouldGenerateKeyPair() {
- return generateKeyPair;
- }
-
- /**
- * @see DeployVirtualMachineOptions#accountInDomain(String,String)
- */
- public CloudStackTemplateOptions account(String account) {
- this.account = account;
- return this;
- }
-
- public String getAccount() {
- return account;
- }
-
- /**
- * @see DeployVirtualMachineOptions#accountInDomain(String,String)
- * @see DeployVirtualMachineOptions#domainId(String)
- */
- public CloudStackTemplateOptions domainId(String domainId) {
- this.domainId = domainId;
- return this;
- }
-
- public String getDomainId() {
- return domainId;
- }
-
- public static final CloudStackTemplateOptions NONE = new CloudStackTemplateOptions();
-
- public static class Builder {
-
- /**
- * @see CloudStackTemplateOptions#diskOfferingId
- */
- public static CloudStackTemplateOptions diskOfferingId(String diskOfferingId) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.diskOfferingId(diskOfferingId);
- }
-
- /**
- * @see CloudStackTemplateOptions#dataDiskSize
- */
- public static CloudStackTemplateOptions dataDiskSize(int dataDiskSize) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.dataDiskSize(dataDiskSize);
- }
-
- /**
- * @see CloudStackTemplateOptions#securityGroupId
- */
- public static CloudStackTemplateOptions securityGroupId(String id) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.securityGroupId(id);
- }
-
- /**
- * @see CloudStackTemplateOptions#securityGroupIds
- */
- public static CloudStackTemplateOptions securityGroupIds(Iterable<String> securityGroupIds) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.securityGroupIds(securityGroupIds);
- }
-
- /**
- * @see CloudStackTemplateOptions#shouldGenerateSecurityGroup()
- */
- public static CloudStackTemplateOptions generateSecurityGroup(boolean enable) {
- return new CloudStackTemplateOptions().generateSecurityGroup(enable);
- }
-
- /**
- * @deprecated See TemplateOptions#networks
- * @see CloudStackTemplateOptions#networkId
- */
- @Deprecated
- public static CloudStackTemplateOptions networkId(String id) {
- return networks(id);
- }
-
- /**
- * @deprecated see TemplateOptions#networks
- * @see CloudStackTemplateOptions#networkIds
- */
- @Deprecated
- public static CloudStackTemplateOptions networkIds(Iterable<String> networkIds) {
- return networks(networkIds);
- }
-
- /**
- * @see CloudStackTemplateOptions#ipOnDefaultNetwork
- */
- public static CloudStackTemplateOptions ipOnDefaultNetwork(String ipAddress) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.ipOnDefaultNetwork(ipAddress);
- }
-
- /**
- * @see CloudStackTemplateOptions#ipsToNetworks
- */
- public static CloudStackTemplateOptions ipsToNetworks(Map<String, String> ipToNetworkMap) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.ipsToNetworks(ipToNetworkMap);
- }
-
- /**
- * @see CloudStackTemplateOptions#setupStaticNat
- */
- public static CloudStackTemplateOptions setupStaticNat(boolean setupStaticNat) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.setupStaticNat(setupStaticNat);
- }
-
- /**
- * @see CloudStackTemplateOptions#keyPair
- */
- public static CloudStackTemplateOptions keyPair(String keyPair) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.keyPair(keyPair);
- }
-
- /**
- * @see CloudStackTemplateOptions#shouldGenerateKeyPair()
- */
- public static CloudStackTemplateOptions generateKeyPair(boolean enable) {
- return new CloudStackTemplateOptions().generateKeyPair(enable);
- }
-
- /**
- * @see CloudStackTemplateOptions#account
- */
- public static CloudStackTemplateOptions account(String account) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.account(account);
- }
-
- /**
- * @see CloudStackTemplateOptions#domainId
- */
- public static CloudStackTemplateOptions domainId(String domainId) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return options.domainId(domainId);
- }
-
- // methods that only facilitate returning the correct object type
-
- /**
- * @see TemplateOptions#inboundPorts(int...)
- */
- public static CloudStackTemplateOptions inboundPorts(int... ports) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return CloudStackTemplateOptions.class.cast(options.inboundPorts(ports));
- }
-
- /**
- * @see TemplateOptions#blockOnPort(int, int)
- */
- public static CloudStackTemplateOptions blockOnPort(int port, int seconds) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return CloudStackTemplateOptions.class.cast(options.blockOnPort(port, seconds));
- }
-
- /**
- * @see TemplateOptions#userMetadata(Map)
- */
- public static CloudStackTemplateOptions userMetadata(Map<String, String> userMetadata) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return CloudStackTemplateOptions.class.cast(options.userMetadata(userMetadata));
- }
-
- /**
- * @see TemplateOptions#userMetadata(String, String)
- */
- public static CloudStackTemplateOptions userMetadata(String key, String value) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return CloudStackTemplateOptions.class.cast(options.userMetadata(key, value));
- }
-
- /**
- * @see TemplateOptions#nodeNames(Iterable)
- */
- public static CloudStackTemplateOptions nodeNames(Iterable<String> nodeNames) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return CloudStackTemplateOptions.class.cast(options.nodeNames(nodeNames));
- }
-
- /**
- * @see TemplateOptions#networks(Iterable)
- */
- public static CloudStackTemplateOptions networks(Iterable<String> networks) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return CloudStackTemplateOptions.class.cast(options.networks(networks));
- }
-
- /**
- * @see TemplateOptions#networks(String...)
- */
- public static CloudStackTemplateOptions networks(String... networks) {
- CloudStackTemplateOptions options = new CloudStackTemplateOptions();
- return CloudStackTemplateOptions.class.cast(options.networks(networks));
- }
- }
-
- // methods that only facilitate returning the correct object type
-
- /**
- * @see TemplateOptions#blockOnPort(int, int)
- */
- @Override
- public CloudStackTemplateOptions blockOnPort(int port, int seconds) {
- return CloudStackTemplateOptions.class.cast(super.blockOnPort(port, seconds));
- }
-
- /**
- * @see TemplateOptions#inboundPorts(int...)
- */
- @Override
- public CloudStackTemplateOptions inboundPorts(int... ports) {
- return CloudStackTemplateOptions.class.cast(super.inboundPorts(ports));
- }
-
- /**
- * @see TemplateOptions#authorizePublicKey(String)
- */
- @Override
- public CloudStackTemplateOptions authorizePublicKey(String publicKey) {
- return CloudStackTemplateOptions.class.cast(super.authorizePublicKey(publicKey));
- }
-
- /**
- * @see TemplateOptions#installPrivateKey(String)
- */
- @Override
- public CloudStackTemplateOptions installPrivateKey(String privateKey) {
- return CloudStackTemplateOptions.class.cast(super.installPrivateKey(privateKey));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CloudStackTemplateOptions userMetadata(Map<String, String> userMetadata) {
- return CloudStackTemplateOptions.class.cast(super.userMetadata(userMetadata));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CloudStackTemplateOptions userMetadata(String key, String value) {
- return CloudStackTemplateOptions.class.cast(super.userMetadata(key, value));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CloudStackTemplateOptions nodeNames(Iterable<String> nodeNames) {
- return CloudStackTemplateOptions.class.cast(super.nodeNames(nodeNames));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CloudStackTemplateOptions networks(Iterable<String> networks) {
- return CloudStackTemplateOptions.class.cast(super.networks(networks));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public CloudStackTemplateOptions networks(String... networks) {
- return CloudStackTemplateOptions.class.cast(super.networks(networks));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java
deleted file mode 100644
index 6a4bd89..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/predicates/AllNodesInGroupTerminated.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.predicates;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.and;
-import static com.google.common.collect.Iterables.all;
-import static org.jclouds.compute.predicates.NodePredicates.TERMINATED;
-import static org.jclouds.compute.predicates.NodePredicates.inGroup;
-import static org.jclouds.compute.predicates.NodePredicates.locationId;
-import static org.jclouds.compute.predicates.NodePredicates.parentLocationId;
-
-import javax.inject.Inject;
-
-import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.domain.ComputeMetadata;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-
-public class AllNodesInGroupTerminated implements Predicate<ZoneAndName> {
- private final ComputeService computeService;
-
-
- //TODO: TESTME
- @Inject
- public AllNodesInGroupTerminated(ComputeService computeService) {
- this.computeService = checkNotNull(computeService, "computeService");
- }
-
- @Override
- public boolean apply(ZoneAndName input) {
- // new nodes can have the zone as their location, existing nodes, the parent is the
- // location
- return all(computeService.listNodesDetailsMatching(Predicates.<ComputeMetadata> or(locationId(input.getZone()),
- parentLocationId(input.getZone()))), and(inGroup(input.getName()), TERMINATED));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java
deleted file mode 100644
index efbce39..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.strategy;
-
-import com.google.common.collect.Iterables;
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-
-import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Predicates.and;
-import static com.google.common.collect.Iterables.filter;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.defaultNetworkInZone;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.isIsolatedNetwork;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsStaticNAT;
-
-/**
- * Convert template options into DeployVirtualMachineOptions, when the target zone has advanced networking.
- */
-public class AdvancedNetworkOptionsConverter implements OptionsConverter {
- @Override
- public DeployVirtualMachineOptions apply(CloudStackTemplateOptions templateOptions, Map<String, Network> networks, String zoneId, DeployVirtualMachineOptions options) {
- // security groups not allowed.
- // at least one network must be given to CloudStack,
- // but jclouds will try to autodetect an appropriate network if none given.
- checkArgument(templateOptions.getSecurityGroupIds().isEmpty(), "security groups cannot be specified for locations (zones) that use advanced networking");
- if (!templateOptions.getNetworks().isEmpty()) {
- options.networkIds(templateOptions.getNetworks());
- } else if (templateOptions.getIpsToNetworks().isEmpty()) {
- checkArgument(!networks.isEmpty(), "please setup a network for zone: " + zoneId);
- Network defaultNetworkInZone = Iterables.getFirst(filter(networks.values(), and(defaultNetworkInZone(zoneId), supportsStaticNAT())), null);
- if (defaultNetworkInZone == null) {
- defaultNetworkInZone = Iterables.getFirst(filter(networks.values(), isIsolatedNetwork()), null);
- }
- if (defaultNetworkInZone == null) {
- throw new IllegalArgumentException("please choose a specific network in zone " + zoneId + ": " + networks);
- } else {
- options.networkId(defaultNetworkInZone.getId());
- }
- }
- return options;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java
deleted file mode 100644
index 181ddc7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.strategy;
-
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-
-import java.util.Map;
-
-/**
- * Convert template options into DeployVirtualMachineOptions, when the target zone has basic networking.
- */
-public class BasicNetworkOptionsConverter implements OptionsConverter {
- @Override
- public DeployVirtualMachineOptions apply(CloudStackTemplateOptions templateOptions, Map<String, Network> networks, String zoneId, DeployVirtualMachineOptions options) {
- // both security groups and networks are optional, and CloudStack will
- // use the zone/user's default network/security group if none given
- if (!templateOptions.getSecurityGroupIds().isEmpty()) {
- options.securityGroupIds(templateOptions.getSecurityGroupIds());
- }
- if (!templateOptions.getNetworks().isEmpty()) {
- options.networkIds(templateOptions.getNetworks());
- }
- return options;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
deleted file mode 100644
index 29f5c85..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.strategy;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.contains;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.get;
-import static org.jclouds.cloudstack.options.DeployVirtualMachineOptions.Builder.displayName;
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.id;
-import static org.jclouds.cloudstack.predicates.TemplatePredicates.isReady;
-import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityGroups;
-import static org.jclouds.ssh.SshKeys.fingerprintPrivateKey;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.Capabilities;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.Project;
-import org.jclouds.cloudstack.domain.PublicIPAddress;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-import org.jclouds.cloudstack.features.TemplateApi;
-import org.jclouds.cloudstack.functions.CreateFirewallRulesForIP;
-import org.jclouds.cloudstack.functions.CreatePortForwardingRulesForIP;
-import org.jclouds.cloudstack.functions.StaticNATVirtualMachineInNetwork;
-import org.jclouds.cloudstack.functions.StaticNATVirtualMachineInNetwork.Factory;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-import org.jclouds.cloudstack.options.ListFirewallRulesOptions;
-import org.jclouds.cloudstack.options.ListTemplatesOptions;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.ComputeServiceAdapter;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.domain.Credentials;
-import org.jclouds.domain.LoginCredentials;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.collect.Sets;
-import com.google.common.primitives.Ints;
-
-/**
- * defines the connection between the {@link CloudStackApi} implementation
- * and the jclouds {@link ComputeService}
- */
-@Singleton
-public class CloudStackComputeServiceAdapter implements
- ComputeServiceAdapter<VirtualMachine, ServiceOffering, Template, Zone> {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final CloudStackApi client;
- private final Predicate<String> jobComplete;
- private final Supplier<Map<String, Network>> networkSupplier;
- private final Supplier<Map<String, Project>> projectSupplier;
- private final BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult;
- private final Factory staticNATVMInNetwork;
- private final CreatePortForwardingRulesForIP setupPortForwardingRulesForIP;
- private final CreateFirewallRulesForIP setupFirewallRulesForIP;
- private final LoadingCache<String, Set<IPForwardingRule>> vmToRules;
- private final Map<String, Credentials> credentialStore;
- private final Map<NetworkType, ? extends OptionsConverter> optionsConverters;
- private final Supplier<LoadingCache<String, Zone>> zoneIdToZone;
- private final LoadingCache<ZoneAndName, SecurityGroup> securityGroupCache;
- private final LoadingCache<String, SshKeyPair> keyPairCache;
- private final GroupNamingConvention.Factory namingConvention;
-
- @Inject
- public CloudStackComputeServiceAdapter(CloudStackApi client, Predicate<String> jobComplete,
- @Memoized Supplier<Map<String, Network>> networkSupplier,
- @Memoized Supplier<Map<String, Project>> projectSupplier,
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult,
- StaticNATVirtualMachineInNetwork.Factory staticNATVMInNetwork,
- CreatePortForwardingRulesForIP setupPortForwardingRulesForIP,
- CreateFirewallRulesForIP setupFirewallRulesForIP,
- LoadingCache<String, Set<IPForwardingRule>> vmToRules,
- Map<String, Credentials> credentialStore,
- Map<NetworkType, ? extends OptionsConverter> optionsConverters,
- Supplier<LoadingCache<String, Zone>> zoneIdToZone,
- LoadingCache<ZoneAndName, SecurityGroup> securityGroupCache,
- LoadingCache<String, SshKeyPair> keyPairCache,
- GroupNamingConvention.Factory namingConvention) {
- this.client = checkNotNull(client, "client");
- this.jobComplete = checkNotNull(jobComplete, "jobComplete");
- this.networkSupplier = checkNotNull(networkSupplier, "networkSupplier");
- this.projectSupplier = checkNotNull(projectSupplier, "projectSupplier");
- this.blockUntilJobCompletesAndReturnResult = checkNotNull(blockUntilJobCompletesAndReturnResult,
- "blockUntilJobCompletesAndReturnResult");
- this.staticNATVMInNetwork = checkNotNull(staticNATVMInNetwork, "staticNATVMInNetwork");
- this.setupPortForwardingRulesForIP = checkNotNull(setupPortForwardingRulesForIP, "setupPortForwardingRulesForIP");
- this.setupFirewallRulesForIP = checkNotNull(setupFirewallRulesForIP, "setupFirewallRulesForIP");
- this.vmToRules = checkNotNull(vmToRules, "vmToRules");
- this.credentialStore = checkNotNull(credentialStore, "credentialStore");
- this.securityGroupCache = checkNotNull(securityGroupCache, "securityGroupCache");
- this.keyPairCache = checkNotNull(keyPairCache, "keyPairCache");
- this.optionsConverters = optionsConverters;
- this.zoneIdToZone = zoneIdToZone;
- this.namingConvention = namingConvention;
- }
-
- @Override
- public NodeAndInitialCredentials<VirtualMachine> createNodeWithGroupEncodedIntoName(String group, String name,
- org.jclouds.compute.domain.Template template) {
-
- checkNotNull(template, "template was null");
- checkNotNull(template.getOptions(), "template options was null");
- checkArgument(template.getOptions().getClass().isAssignableFrom(CloudStackTemplateOptions.class),
- "options class %s should have been assignable from CloudStackTemplateOptions", template.getOptions()
- .getClass());
- Map<String, Network> networks = networkSupplier.get();
-
- final String zoneId = template.getLocation().getId();
- Zone zone = zoneIdToZone.get().getUnchecked(zoneId);
-
- CloudStackTemplateOptions templateOptions = template.getOptions().as(CloudStackTemplateOptions.class);
-
- checkState(optionsConverters.containsKey(zone.getNetworkType()), "no options converter configured for network type %s", zone.getNetworkType());
- DeployVirtualMachineOptions options = displayName(name).name(name);
- if (templateOptions.getAccount() != null) {
- options.accountInDomain(templateOptions.getAccount(), templateOptions.getDomainId());
- } else if (templateOptions.getDomainId() != null) {
- options.domainId(templateOptions.getDomainId());
- }
-
- OptionsConverter optionsConverter = optionsConverters.get(zone.getNetworkType());
- options = optionsConverter.apply(templateOptions, networks, zoneId, options);
-
- options.group(group);
-
- if (templateOptions.getIpOnDefaultNetwork() != null) {
- options.ipOnDefaultNetwork(templateOptions.getIpOnDefaultNetwork());
- }
-
- if (!templateOptions.getIpsToNetworks().isEmpty()) {
- options.ipsToNetworks(templateOptions.getIpsToNetworks());
- }
-
- if (templateOptions.getKeyPair() != null) {
- SshKeyPair keyPair = null;
- if (templateOptions.getLoginPrivateKey() != null) {
- String pem = templateOptions.getLoginPrivateKey();
- keyPair = SshKeyPair.builder().name(templateOptions.getKeyPair())
- .fingerprint(fingerprintPrivateKey(pem)).privateKey(pem).build();
- keyPairCache.asMap().put(keyPair.getName(), keyPair);
- options.keyPair(keyPair.getName());
- } else if (client.getSSHKeyPairApi().getSSHKeyPair(templateOptions.getKeyPair()) != null) {
- keyPair = client.getSSHKeyPairApi().getSSHKeyPair(templateOptions.getKeyPair());
- }
- if (keyPair != null) {
- keyPairCache.asMap().put(keyPair.getName(), keyPair);
- options.keyPair(keyPair.getName());
- }
- } else if (templateOptions.shouldGenerateKeyPair()) {
- SshKeyPair keyPair = keyPairCache.getUnchecked(namingConvention.create()
- .sharedNameForGroup(group));
- keyPairCache.asMap().put(keyPair.getName(), keyPair);
- templateOptions.keyPair(keyPair.getName());
- options.keyPair(keyPair.getName());
- }
-
- if (templateOptions.getDiskOfferingId() != null) {
- options.diskOfferingId(templateOptions.getDiskOfferingId());
- if (templateOptions.getDataDiskSize() > 0) {
- options.dataDiskSize(templateOptions.getDataDiskSize());
- }
- }
-
- if (supportsSecurityGroups().apply(zone)) {
- List<Integer> inboundPorts = Ints.asList(templateOptions.getInboundPorts());
-
- if (templateOptions.getSecurityGroupIds().isEmpty()
- && !inboundPorts.isEmpty()
- && templateOptions.shouldGenerateSecurityGroup()) {
- String securityGroupName = namingConvention.create().sharedNameForGroup(group);
- SecurityGroup sg = securityGroupCache.getUnchecked(ZoneSecurityGroupNamePortsCidrs.builder()
- .zone(zone.getId())
- .name(securityGroupName)
- .ports(ImmutableSet.copyOf(inboundPorts))
- .cidrs(ImmutableSet.<String> of()).build());
- options.securityGroupId(sg.getId());
- }
- }
-
- String templateId = template.getImage().getId();
- String serviceOfferingId = template.getHardware().getId();
-
- logger.debug("serviceOfferingId %s, templateId %s, zoneId %s, options %s%n", serviceOfferingId, templateId,
- zoneId, options);
- AsyncCreateResponse job = client.getVirtualMachineApi().deployVirtualMachineInZone(zoneId, serviceOfferingId,
- templateId, options);
- VirtualMachine vm = blockUntilJobCompletesAndReturnResult.<VirtualMachine>apply(job);
- logger.debug("--- virtualmachine: %s", vm);
- LoginCredentials.Builder credentialsBuilder = LoginCredentials.builder();
- if (templateOptions.getKeyPair() != null) {
- SshKeyPair keyPair = keyPairCache.getUnchecked(templateOptions.getKeyPair());
- credentialsBuilder.privateKey(keyPair.getPrivateKey());
- } else if (vm.isPasswordEnabled()) {
- assert vm.getPassword() != null : vm;
- credentialsBuilder.password(vm.getPassword());
- }
-
- try {
- if (templateOptions.shouldSetupStaticNat()) {
- Capabilities capabilities = client.getConfigurationApi().listCapabilities();
- // TODO: possibly not all network ids, do we want to do this
- for (String networkId : options.getNetworkIds()) {
- logger.debug(">> creating static NAT for virtualMachine(%s) in network(%s)", vm.getId(), networkId);
- PublicIPAddress ip = staticNATVMInNetwork.create(networks.get(networkId)).apply(vm);
- logger.trace("<< static NATed IPAddress(%s) to virtualMachine(%s)", ip.getId(), vm.getId());
- vm = client.getVirtualMachineApi().getVirtualMachine(vm.getId());
- List<Integer> ports = Ints.asList(templateOptions.getInboundPorts());
- if (capabilities.getCloudStackVersion().startsWith("2")) {
- logger.debug(">> setting up IP forwarding for IPAddress(%s) rules(%s)", ip.getId(), ports);
- Set<IPForwardingRule> rules = setupPortForwardingRulesForIP.apply(ip, ports);
- logger.trace("<< setup %d IP forwarding rules on IPAddress(%s)", rules.size(), ip.getId());
- } else {
- logger.debug(">> setting up firewall rules for IPAddress(%s) rules(%s)", ip.getId(), ports);
- Set<FirewallRule> rules = setupFirewallRulesForIP.apply(ip, ports);
- logger.trace("<< setup %d firewall rules on IPAddress(%s)", rules.size(), ip.getId());
- }
- }
- }
- } catch (RuntimeException re) {
- logger.error("-- exception after node has been created, trying to destroy the created virtualMachine(%s)", vm.getId());
- try {
- destroyNode(vm.getId());
- } catch (RuntimeException re2) {
- logger.debug("-- exception in exceptionHandler while executing destroyNode for virtualMachine(%s), ignoring and rethrowing original exception", vm.getId());
- }
- throw re;
- }
- return new NodeAndInitialCredentials<VirtualMachine>(vm, vm.getId() + "", credentialsBuilder.build());
- }
-
- @Override
- public Iterable<ServiceOffering> listHardwareProfiles() {
- // TODO: we may need to filter these
- return client.getOfferingApi().listServiceOfferings();
- }
-
- @Override
- public Iterable<Template> listImages() {
- TemplateApi templateApi = client.getTemplateApi();
- ImmutableSet.Builder<Template> templates = ImmutableSet.builder();
- templates.addAll(templateApi.listTemplates());
- for (String project : projectSupplier.get().keySet()) {
- templates.addAll(templateApi.listTemplates(ListTemplatesOptions.Builder.projectId(project)));
- }
-
- return filter(templates.build(), isReady());
- }
-
- @Override
- public Template getImage(String id) {
- return get(client.getTemplateApi().listTemplates(id(id)), 0, null);
- }
-
- @Override
- public Iterable<VirtualMachine> listNodes() {
- return client.getVirtualMachineApi().listVirtualMachines();
- }
-
- @Override
- public Iterable<VirtualMachine> listNodesByIds(final Iterable<String> ids) {
- return filter(listNodes(), new Predicate<VirtualMachine>() {
-
- @Override
- public boolean apply(VirtualMachine vm) {
- return contains(ids, vm.getId());
- }
- });
- }
-
- @Override
- public Iterable<Zone> listLocations() {
- // TODO: we may need to filter these
- return client.getZoneApi().listZones();
- }
-
- @Override
- public VirtualMachine getNode(String id) {
- String virtualMachineId = id;
- return client.getVirtualMachineApi().getVirtualMachine(virtualMachineId);
- }
-
- @Override
- public void destroyNode(String id) {
- String virtualMachineId = id;
- // There was a bug in 2.2.12 release happening when static nat IP address
- // was being released, and corresponding firewall rules were left behind.
- // So next time the same IP is allocated, it might be not be static nat
- // enabled, but there are still rules associated with it. And when you try
- // to release this IP, the release will fail.
- //
- // The bug was fixed in 2.2.13 release only, and the current system wasn't
- // updated yet.
- //
- // To avoid the issue, every time you release a static nat ip address, do
- // the following:
-
- // 1) Delete IP forwarding rules associated with IP.
- Set<String> ipAddresses = deleteIPForwardingRulesForVMAndReturnDistinctIPs(virtualMachineId);
-
- // 2) Delete firewall rules associated with IP.
- ipAddresses.addAll(deleteFirewallRulesForVMAndReturnDistinctIPs(virtualMachineId));
-
- // 3) Disable static nat rule for the IP.
- disableStaticNATOnIPAddresses(ipAddresses);
-
- // 4) Only after 1 and 2 release the IP address.
- disassociateIPAddresses(ipAddresses);
-
- destroyVirtualMachine(virtualMachineId);
-
- vmToRules.invalidate(virtualMachineId);
- }
-
- public void disassociateIPAddresses(Set<String> ipAddresses) {
- for (String ipAddress : ipAddresses) {
- logger.debug(">> disassociating IPAddress(%s)", ipAddress);
- client.getAddressApi().disassociateIPAddress(ipAddress);
- }
- }
-
- public void destroyVirtualMachine(String virtualMachineId) {
-
- String destroyVirtualMachine = client.getVirtualMachineApi().destroyVirtualMachine(virtualMachineId);
- if (destroyVirtualMachine != null) {
- logger.debug(">> destroying virtualMachine(%s) job(%s)", virtualMachineId, destroyVirtualMachine);
- awaitCompletion(destroyVirtualMachine);
- } else {
- logger.trace("<< virtualMachine(%s) not found", virtualMachineId);
- }
-
- }
-
- public void disableStaticNATOnIPAddresses(Set<String> ipAddresses) {
- Builder<String> jobsToTrack = ImmutableSet.builder();
- for (String ipAddress : ipAddresses) {
- String disableStaticNAT = client.getNATApi().disableStaticNATOnPublicIP(ipAddress);
- if (disableStaticNAT != null) {
- logger.debug(">> disabling static NAT IPAddress(%s) job(%s)", ipAddress, disableStaticNAT);
- jobsToTrack.add(disableStaticNAT);
- }
- }
- awaitCompletion(jobsToTrack.build());
- }
-
- public Set<String> deleteIPForwardingRulesForVMAndReturnDistinctIPs(String virtualMachineId) {
- Builder<String> jobsToTrack = ImmutableSet.builder();
-
- // immutable doesn't permit duplicates
- Set<String> ipAddresses = Sets.newLinkedHashSet();
-
- Set<IPForwardingRule> forwardingRules = client.getNATApi().getIPForwardingRulesForVirtualMachine(
- virtualMachineId);
- for (IPForwardingRule rule : forwardingRules) {
- if (!"Deleting".equals(rule.getState())) {
- ipAddresses.add(rule.getIPAddressId());
- String deleteForwardingRule = client.getNATApi().deleteIPForwardingRule(rule.getId());
- if (deleteForwardingRule != null) {
- logger.debug(">> deleting IPForwardingRule(%s) job(%s)", rule.getId(), deleteForwardingRule);
- jobsToTrack.add(deleteForwardingRule);
- }
- }
- }
- awaitCompletion(jobsToTrack.build());
- return ipAddresses;
- }
-
- public Set<String> deleteFirewallRulesForVMAndReturnDistinctIPs(String virtualMachineId) {
- // immutable doesn't permit duplicates
- Set<String> ipAddresses = Sets.newLinkedHashSet();
-
- String publicIpId = client.getVirtualMachineApi().getVirtualMachine(virtualMachineId).getPublicIPId();
- if (publicIpId != null) {
- Set<FirewallRule> firewallRules = client.getFirewallApi()
- .listFirewallRules(ListFirewallRulesOptions.Builder.ipAddressId(client.getVirtualMachineApi().getVirtualMachine(virtualMachineId).getPublicIPId()));
-
- for (FirewallRule rule : firewallRules) {
- if (rule.getState() != FirewallRule.State.DELETING) {
- ipAddresses.add(rule.getIpAddressId());
- client.getFirewallApi().deleteFirewallRule(rule.getId());
- logger.debug(">> deleting FirewallRule(%s)", rule.getId());
- }
- }
- }
- return ipAddresses;
- }
-
- public void awaitCompletion(Iterable<String> jobs) {
- logger.debug(">> awaiting completion of jobs(%s)", jobs);
- for (String job : jobs)
- awaitCompletion(job);
- logger.trace("<< completed jobs(%s)", jobs);
- }
-
- public void awaitCompletion(String job) {
- boolean completed = jobComplete.apply(job);
- logger.trace("<< job(%s) complete(%s)", job, completed);
- }
-
- @Override
- public void rebootNode(String id) {
- String virtualMachineId = id;
- String job = client.getVirtualMachineApi().rebootVirtualMachine(virtualMachineId);
- if (job != null) {
- logger.debug(">> rebooting virtualMachine(%s) job(%s)", virtualMachineId, job);
- awaitCompletion(job);
- }
- }
-
- @Override
- public void resumeNode(String id) {
- String virtualMachineId = id;
- String job = client.getVirtualMachineApi().startVirtualMachine(id);
- if (job != null) {
- logger.debug(">> starting virtualMachine(%s) job(%s)", virtualMachineId, job);
- awaitCompletion(job);
- }
- }
-
- @Override
- public void suspendNode(String id) {
- String virtualMachineId = id;
- String job = client.getVirtualMachineApi().stopVirtualMachine(id);
- if (job != null) {
- logger.debug(">> stopping virtualMachine(%s) job(%s)", virtualMachineId, job);
- awaitCompletion(job);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java
deleted file mode 100644
index 4cc6b9f..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.strategy;
-
-import java.util.Map;
-
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-
-/**
- * Convert template options into DeployVirtualMachineOptions. Expressed as an interface, because in
- * CloudStack different zone network types have different requirements when it comes to networks and
- * security groups.
- */
-public interface OptionsConverter {
-
- /**
- * Convert a CloudStackTemplateOptions and apply to a DeployVirtualMachineOptions instance.
- *
- * @param templateOptions the input set of options
- * @param networks the networks available
- * @param zoneId the zone of the new virtual machine
- * @param options where the resulting set of options will be applied
- * @return same as "options" parameter
- */
- DeployVirtualMachineOptions apply(CloudStackTemplateOptions templateOptions, Map<String, Network> networks, String zoneId, DeployVirtualMachineOptions options);
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java
deleted file mode 100644
index 95f186e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.config;
-
-import static org.jclouds.rest.config.BinderUtils.bindHttpApi;
-
-import java.util.concurrent.TimeUnit;
-
-import org.jclouds.Constants;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.CloudStackDomainApi;
-import org.jclouds.cloudstack.CloudStackGlobalApi;
-import org.jclouds.cloudstack.domain.LoginResponse;
-import org.jclouds.cloudstack.features.SessionApi;
-import org.jclouds.cloudstack.filters.AddSessionKeyAndJSessionIdToRequest;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.filters.QuerySigner;
-import org.jclouds.cloudstack.handlers.CloudStackErrorHandler;
-import org.jclouds.cloudstack.handlers.InvalidateSessionAndRetryOn401AndLogoutOnClose;
-import org.jclouds.cloudstack.loaders.LoginWithPasswordCredentials;
-import org.jclouds.domain.Credentials;
-import org.jclouds.http.HttpErrorHandler;
-import org.jclouds.http.HttpRetryHandler;
-import org.jclouds.http.annotation.ClientError;
-import org.jclouds.http.annotation.Redirection;
-import org.jclouds.http.annotation.ServerError;
-import org.jclouds.location.Provider;
-import org.jclouds.location.suppliers.ImplicitLocationSupplier;
-import org.jclouds.location.suppliers.implicit.OnlyLocationOrFirstZone;
-import org.jclouds.rest.ConfiguresHttpApi;
-import org.jclouds.rest.ApiContext;
-import org.jclouds.rest.config.HttpApiModule;
-import org.jclouds.rest.internal.ApiContextImpl;
-
-import com.google.common.base.Supplier;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.LoadingCache;
-import com.google.inject.Inject;
-import com.google.inject.Provides;
-import com.google.inject.Scopes;
-import com.google.inject.Singleton;
-import com.google.inject.TypeLiteral;
-import com.google.inject.name.Named;
-
-/**
- * Configures the cloudstack connection.
- */
-@ConfiguresHttpApi
-public class CloudStackHttpApiModule extends HttpApiModule<CloudStackApi> {
-
- @Override
- protected void configure() {
- bind(new TypeLiteral<ApiContext<CloudStackDomainApi>>() {
- }).to(new TypeLiteral<ApiContextImpl<CloudStackDomainApi>>() {
- });
- bind(new TypeLiteral<ApiContext<CloudStackGlobalApi>>() {
- }).to(new TypeLiteral<ApiContextImpl<CloudStackGlobalApi>>() {
- });
- bind(CredentialType.class).toProvider(CredentialTypeFromPropertyOrDefault.class);
- // session client is used directly for filters and retry handlers, so let's bind it explicitly
- bindHttpApi(binder(), SessionApi.class);
- bindHttpApi(binder(), CloudStackDomainApi.class);
- bindHttpApi(binder(), CloudStackGlobalApi.class);
- bind(HttpRetryHandler.class).annotatedWith(ClientError.class).to(InvalidateSessionAndRetryOn401AndLogoutOnClose.class);
-
- super.configure();
- }
-
- @Override
- protected void installLocations() {
- super.installLocations();
- bind(ImplicitLocationSupplier.class).to(OnlyLocationOrFirstZone.class).in(Scopes.SINGLETON);
- }
-
- @Override
- protected void bindErrorHandlers() {
- bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(CloudStackErrorHandler.class);
- bind(HttpErrorHandler.class).annotatedWith(ClientError.class).to(CloudStackErrorHandler.class);
- bind(HttpErrorHandler.class).annotatedWith(ServerError.class).to(CloudStackErrorHandler.class);
- }
-
- @Singleton
- static class CredentialTypeFromPropertyOrDefault implements javax.inject.Provider<CredentialType> {
- /**
- * use optional injection to supply a default value for credential type. so that we don't have
- * to set a default property.
- */
- @Inject(optional = true)
- @Named(CloudStackProperties.CREDENTIAL_TYPE)
- String credentialType = CredentialType.API_ACCESS_KEY_CREDENTIALS.toString();
-
- @Override
- public CredentialType get() {
- return CredentialType.fromValue(credentialType);
- }
- }
-
- /**
- * we use the type of credentials specified at login to determine which way we want to filter the
- * request. <br/>
- * for ex, if we are getting passwords, we know we will need to login/logout. Otherwise we are
- * signing requests.
- */
- @Provides
- @Singleton
- protected AuthenticationFilter authenticationFilterForCredentialType(CredentialType credentialType,
- AddSessionKeyAndJSessionIdToRequest addSessionKeyAndJSessionIdToRequest, QuerySigner querySigner) {
- switch (credentialType) {
- case PASSWORD_CREDENTIALS:
- return addSessionKeyAndJSessionIdToRequest;
- case API_ACCESS_KEY_CREDENTIALS:
- return querySigner;
- default:
- throw new IllegalArgumentException("credential type not supported: " + credentialType);
- }
- }
-
- // PROPERTY_SESSION_INTERVAL is default to 60 seconds
- @Provides
- @Singleton
- protected LoadingCache<Credentials, LoginResponse> provideLoginResponseCache(
- LoginWithPasswordCredentials getLoginResponse,
- @Named(Constants.PROPERTY_SESSION_INTERVAL) int seconds) {
- return CacheBuilder.newBuilder().expireAfterWrite(seconds, TimeUnit.SECONDS).build(getLoginResponse);
- }
-
- // Temporary conversion of a cache to a supplier until there is a single-element cache
- // http://code.google.com/p/guava-libraries/issues/detail?id=872
- @Provides
- @Singleton
- protected Supplier<LoginResponse> provideLoginResponseSupplier(final LoadingCache<Credentials, LoginResponse> cache,
- @Provider final Supplier<Credentials> creds) {
- return new Supplier<LoginResponse>() {
- @Override
- public LoginResponse get() {
- return cache.getUnchecked(creds.get());
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java
deleted file mode 100644
index ab1fac0..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.config;
-
-import java.io.IOException;
-import java.util.Date;
-
-import javax.inject.Inject;
-
-import org.jclouds.date.DateService;
-import org.jclouds.json.config.GsonModule.DateAdapter;
-import org.jclouds.json.config.GsonModule.Iso8601DateAdapter;
-import org.jclouds.json.internal.NullFilteringTypeAdapterFactories.IterableTypeAdapter;
-import org.jclouds.json.internal.NullFilteringTypeAdapterFactories.IterableTypeAdapterFactory;
-
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-import com.google.inject.AbstractModule;
-
-public class CloudStackParserModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(DateAdapter.class).to(CloudStackDateAdapter.class);
- bind(IterableTypeAdapterFactory.class).to(CommaDelimitedOKIterableTypeAdapterFactory.class);
- }
-
- /**
- * Data adapter for the date formats used by CloudStack.
- *
- * Essentially this is a workaround for the CloudStack getUsage() API call returning a corrupted form of ISO-8601
- * dates, which have an unexpected pair of apostrophes, like 2011-12-12'T'00:00:00+00:00
- *
- */
- public static class CloudStackDateAdapter extends Iso8601DateAdapter {
-
- @Inject
- private CloudStackDateAdapter(DateService dateService) {
- super(dateService);
- }
-
- public Date read(JsonReader reader) throws IOException {
- return parseDate(reader.nextString().replaceAll("'T'", "T"));
- }
-
- }
-
- /**
- * Handles types that were previously strings and now arrays (ex. tags)
- *
- */
- public static class CommaDelimitedOKIterableTypeAdapterFactory extends IterableTypeAdapterFactory {
-
- @Override
- @SuppressWarnings("unchecked")
- protected <E, I> TypeAdapter<I> newAdapter(TypeAdapter<E> elementAdapter) {
- return (TypeAdapter<I>) new Adapter<E>(elementAdapter);
- }
-
- public static final class Adapter<E> extends TypeAdapter<Iterable<E>> {
-
- private final IterableTypeAdapter<E> delegate;
-
- public Adapter(TypeAdapter<E> elementAdapter) {
- this.delegate = new IterableTypeAdapter<E>(elementAdapter);
- nullSafe();
- }
-
- public void write(JsonWriter out, Iterable<E> value) throws IOException {
- this.delegate.write(out, value);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Iterable<E> read(JsonReader in) throws IOException {
- // HACK as cloudstack changed a field from String to Set!
- if (in.peek() == JsonToken.STRING) {
- String val = Strings.emptyToNull(in.nextString());
- return (Iterable<E>) (val != null ? Splitter.on(',').split(val) : ImmutableSet.of());
- } else {
- return delegate.read(in);
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackProperties.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackProperties.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackProperties.java
deleted file mode 100644
index e123847..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CloudStackProperties.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.config;
-
-
-/**
- * Configuration properties and constants used in CloudStack connections.
- */
-public final class CloudStackProperties {
-
- /**
- * Type of credentials specified during {@link ComputeServiceContextBuilder#overrides}. If
- * {@link CredentialType#API_ACCESS_KEY_CREDENTIALS}, the request signing is used. If
- * {@link CredentialType#PASSWORD_CREDENTIALS}, login will happen and a session will be
- * persisted.
- *
- * <h3>valid values</h3>
- * <ul>
- * <li>apiAccessKeyCredentials</li>
- * <li>passwordCredentials</li>
- * </ul>
- *
- * @see CredentialType
- * @see <a href="http://docs.cloud.com/CloudStack_Documentation/Customizing_the_CloudStack_UI#Cross_Site_Request_Forgery_%28CSRF%29"
- * />
- */
- public static final String CREDENTIAL_TYPE = "jclouds.cloudstack.credential-type";
-
- /**
- * Whenever a node is created, automatically generate keypairs for groups, as needed, also
- * delete the keypair(s) when the last node in the group is destroyed.
- */
- public static final String AUTO_GENERATE_KEYPAIRS = "jclouds.cloudstack.auto-generate-keypairs";
-
- private CloudStackProperties() {
- throw new AssertionError("intentionally unimplemented");
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CredentialType.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CredentialType.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CredentialType.java
deleted file mode 100644
index 628e96c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/config/CredentialType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.config;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.base.CaseFormat;
-
-/**
- * Decides what type of credentials createContext is supplied with.
- */
-public enum CredentialType {
-
- API_ACCESS_KEY_CREDENTIALS,
-
- PASSWORD_CREDENTIALS;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, name());
- }
-
- public static CredentialType fromValue(String credentialType) {
- return valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(credentialType,
- "credentialType")));
- }
-
-}
[48/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
deleted file mode 100644
index 1109cbb..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
-import static org.jclouds.cloudstack.predicates.SshKeyPairPredicates.nameMatches;
-import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityGroups;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import org.jclouds.Constants;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.compute.callables.RunScriptOnNode;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.compute.extensions.ImageExtension;
-import org.jclouds.compute.extensions.SecurityGroupExtension;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.compute.internal.BaseComputeService;
-import org.jclouds.compute.internal.PersistNodeCredentials;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.compute.reference.ComputeServiceConstants.Timeouts;
-import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet;
-import org.jclouds.compute.strategy.DestroyNodeStrategy;
-import org.jclouds.compute.strategy.GetImageStrategy;
-import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
-import org.jclouds.compute.strategy.InitializeRunScriptOnNodeOrPlaceInBadMap;
-import org.jclouds.compute.strategy.ListNodesStrategy;
-import org.jclouds.compute.strategy.RebootNodeStrategy;
-import org.jclouds.compute.strategy.ResumeNodeStrategy;
-import org.jclouds.compute.strategy.SuspendNodeStrategy;
-import org.jclouds.domain.Credentials;
-import org.jclouds.domain.Location;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.predicates.SecurityGroupPredicates;
-import org.jclouds.scriptbuilder.functions.InitAdminAccess;
-
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Multimap;
-import com.google.common.util.concurrent.ListeningExecutorService;
-
-@Singleton
-public class CloudStackComputeService extends BaseComputeService {
- protected final CloudStackApi client;
- protected final LoadingCache<ZoneAndName, SecurityGroup> securityGroupMap;
- protected final LoadingCache<String, SshKeyPair> keyPairCache;
- protected final Function<Set<? extends NodeMetadata>, Multimap<String, String>> orphanedGroupsByZoneId;
- protected final GroupNamingConvention.Factory namingConvention;
- protected final Supplier<LoadingCache<String, Zone>> zoneIdToZone;
-
- @Inject
- protected CloudStackComputeService(ComputeServiceContext context, Map<String, Credentials> credentialStore,
- @Memoized Supplier<Set<? extends Image>> images, @Memoized Supplier<Set<? extends Hardware>> sizes,
- @Memoized Supplier<Set<? extends Location>> locations, ListNodesStrategy listNodesStrategy,
- GetImageStrategy getImageStrategy, GetNodeMetadataStrategy getNodeMetadataStrategy,
- CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy, RebootNodeStrategy rebootNodeStrategy,
- DestroyNodeStrategy destroyNodeStrategy, ResumeNodeStrategy startNodeStrategy,
- SuspendNodeStrategy stopNodeStrategy, Provider<TemplateBuilder> templateBuilderProvider,
- @Named("DEFAULT") Provider<TemplateOptions> templateOptionsProvider,
- @Named(TIMEOUT_NODE_RUNNING) Predicate<AtomicReference<NodeMetadata>> nodeRunning,
- @Named(TIMEOUT_NODE_TERMINATED) Predicate<AtomicReference<NodeMetadata>> nodeTerminated,
- @Named(TIMEOUT_NODE_SUSPENDED) Predicate<AtomicReference<NodeMetadata>> nodeSuspended,
- InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory,
- RunScriptOnNode.Factory runScriptOnNodeFactory, InitAdminAccess initAdminAccess,
- PersistNodeCredentials persistNodeCredentials, Timeouts timeouts,
- @Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor, CloudStackApi client,
- LoadingCache<ZoneAndName, SecurityGroup> securityGroupMap,
- LoadingCache<String, SshKeyPair> keyPairCache,
- Function<Set<? extends NodeMetadata>, Multimap<String, String>> orphanedGroupsByZoneId,
- GroupNamingConvention.Factory namingConvention,
- Supplier<LoadingCache<String, Zone>> zoneIdToZone,
- Optional<ImageExtension> imageExtension,
- Optional<SecurityGroupExtension> securityGroupExtension) {
- super(context, credentialStore, images, sizes, locations, listNodesStrategy, getImageStrategy,
- getNodeMetadataStrategy, runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy,
- startNodeStrategy, stopNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning,
- nodeTerminated, nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory,
- persistNodeCredentials, timeouts, userExecutor, imageExtension, securityGroupExtension);
- this.zoneIdToZone = checkNotNull(zoneIdToZone, "zoneIdToZone");
- this.client = checkNotNull(client, "client");
- this.securityGroupMap = checkNotNull(securityGroupMap, "securityGroupMap");
- this.keyPairCache = checkNotNull(keyPairCache, "keyPairCache");
- this.orphanedGroupsByZoneId = checkNotNull(orphanedGroupsByZoneId, "orphanedGroupsByZoneId");
- this.namingConvention = checkNotNull(namingConvention, "namingConvention");
- }
-
- @Override
- protected void cleanUpIncidentalResourcesOfDeadNodes(Set<? extends NodeMetadata> deadNodes) {
- Multimap<String, String> zoneToZoneAndGroupNames = orphanedGroupsByZoneId.apply(deadNodes);
- for (String zoneId : zoneToZoneAndGroupNames.keySet()) {
- cleanOrphanedGroupsInZone(ImmutableSet.copyOf(zoneToZoneAndGroupNames.get(zoneId)), zoneId);
- }
- }
-
- protected void cleanOrphanedGroupsInZone(Set<String> groups, String zoneId) {
- cleanupOrphanedSecurityGroupsInZone(groups, zoneId);
- cleanupOrphanedKeyPairsInZone(groups, zoneId);
- }
-
- private void cleanupOrphanedSecurityGroupsInZone(Set<String> groups, String zoneId) {
- Zone zone = zoneIdToZone.get().getUnchecked(zoneId);
-
- if (supportsSecurityGroups().apply(zone)) {
- for (String group : groups) {
- for (SecurityGroup securityGroup : Iterables.filter(client.getSecurityGroupApi().listSecurityGroups(),
- SecurityGroupPredicates.nameMatches(namingConvention.create().containsGroup(group)))) {
- ZoneAndName zoneAndName = ZoneAndName.fromZoneAndName(zoneId, securityGroup.getName());
- logger.debug(">> deleting securityGroup(%s)", zoneAndName);
- client.getSecurityGroupApi().deleteSecurityGroup(securityGroup.getId());
- // TODO: test this clear happens
- securityGroupMap.invalidate(zoneAndName);
- logger.debug("<< deleted securityGroup(%s)", zoneAndName);
- }
- }
- }
- }
-
- private void cleanupOrphanedKeyPairsInZone(Set<String> groups, String zoneId) {
- for (String group : groups) {
- for (SshKeyPair pair : Iterables.filter(client.getSSHKeyPairApi().listSSHKeyPairs(),
- nameMatches(namingConvention.create().containsGroup(group)))) {
- logger.debug(">> deleting keypair(%s)", pair.getName());
- client.getSSHKeyPairApi().deleteSSHKeyPair(pair.getName());
- // TODO: test this clear happens
- keyPairCache.invalidate(pair.getName());
- logger.debug("<< deleted keypair(%s)", pair.getName());
- }
- keyPairCache.invalidate(namingConvention.create().sharedNameForGroup(group));
- }
- }
-
- /**
- * returns template options, as {@link CloudStackTemplateOptions}.
- */
- @Override
- public CloudStackTemplateOptions templateOptions() {
- return CloudStackTemplateOptions.class.cast(super.templateOptions());
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
deleted file mode 100644
index b2c02ad..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.config;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.cloudstack.config.CloudStackProperties.AUTO_GENERATE_KEYPAIRS;
-import static org.jclouds.util.Predicates2.retry;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.compute.extensions.CloudStackImageExtension;
-import org.jclouds.cloudstack.compute.extensions.CloudStackSecurityGroupExtension;
-import org.jclouds.cloudstack.compute.functions.CloudStackSecurityGroupToSecurityGroup;
-import org.jclouds.cloudstack.compute.functions.IngressRuleToIpPermission;
-import org.jclouds.cloudstack.compute.functions.OrphanedGroupsByZoneId;
-import org.jclouds.cloudstack.compute.functions.ServiceOfferingToHardware;
-import org.jclouds.cloudstack.compute.functions.TemplateToImage;
-import org.jclouds.cloudstack.compute.functions.TemplateToOperatingSystem;
-import org.jclouds.cloudstack.compute.functions.VirtualMachineToNodeMetadata;
-import org.jclouds.cloudstack.compute.functions.ZoneToLocation;
-import org.jclouds.cloudstack.compute.loaders.CreateUniqueKeyPair;
-import org.jclouds.cloudstack.compute.loaders.FindSecurityGroupOrCreate;
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.compute.strategy.AdvancedNetworkOptionsConverter;
-import org.jclouds.cloudstack.compute.strategy.BasicNetworkOptionsConverter;
-import org.jclouds.cloudstack.compute.strategy.CloudStackComputeServiceAdapter;
-import org.jclouds.cloudstack.compute.strategy.OptionsConverter;
-import org.jclouds.cloudstack.domain.FirewallRule;
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Project;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.User;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-import org.jclouds.cloudstack.features.GuestOSApi;
-import org.jclouds.cloudstack.functions.CreateSecurityGroupIfNeeded;
-import org.jclouds.cloudstack.functions.GetFirewallRulesByVirtualMachine;
-import org.jclouds.cloudstack.functions.GetIPForwardingRulesByVirtualMachine;
-import org.jclouds.cloudstack.functions.StaticNATVirtualMachineInNetwork;
-import org.jclouds.cloudstack.functions.ZoneIdToZone;
-import org.jclouds.cloudstack.predicates.JobComplete;
-import org.jclouds.cloudstack.suppliers.GetCurrentUser;
-import org.jclouds.cloudstack.suppliers.NetworksForCurrentUser;
-import org.jclouds.cloudstack.suppliers.ProjectsForCurrentUser;
-import org.jclouds.cloudstack.suppliers.ZoneIdToZoneSupplier;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.ComputeServiceAdapter;
-import org.jclouds.compute.config.ComputeServiceAdapterContextModule;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.extensions.ImageExtension;
-import org.jclouds.compute.extensions.SecurityGroupExtension;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.domain.Location;
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.Provides;
-import com.google.inject.TypeLiteral;
-import com.google.inject.assistedinject.FactoryModuleBuilder;
-import com.google.inject.name.Names;
-
-public class CloudStackComputeServiceContextModule extends
- ComputeServiceAdapterContextModule<VirtualMachine, ServiceOffering, Template, Zone> {
-
- @Override
- protected void configure() {
- super.configure();
- bind(new TypeLiteral<ComputeServiceAdapter<VirtualMachine, ServiceOffering, Template, Zone>>() {
- }).to(CloudStackComputeServiceAdapter.class);
- bind(new TypeLiteral<Function<VirtualMachine, NodeMetadata>>() {
- }).to(VirtualMachineToNodeMetadata.class);
- bind(new TypeLiteral<Function<SecurityGroup, org.jclouds.compute.domain.SecurityGroup>>() {
- }).to(CloudStackSecurityGroupToSecurityGroup.class);
- bind(new TypeLiteral<Function<IngressRule, IpPermission>>() {
- }).to(IngressRuleToIpPermission.class);
- bind(new TypeLiteral<Function<Template, org.jclouds.compute.domain.Image>>() {
- }).to(TemplateToImage.class);
- bind(new TypeLiteral<Function<ServiceOffering, org.jclouds.compute.domain.Hardware>>() {
- }).to(ServiceOfferingToHardware.class);
- bind(new TypeLiteral<Function<Zone, Location>>() {
- }).to(ZoneToLocation.class);
- bind(TemplateOptions.class).to(CloudStackTemplateOptions.class);
- bind(new TypeLiteral<Function<Template, OperatingSystem>>() {
- }).to(TemplateToOperatingSystem.class);
- install(new FactoryModuleBuilder().build(StaticNATVirtualMachineInNetwork.Factory.class));
- bind(new TypeLiteral<CacheLoader<String, Set<IPForwardingRule>>>() {
- }).to(GetIPForwardingRulesByVirtualMachine.class);
- bind(new TypeLiteral<CacheLoader<String, Set<FirewallRule>>>() {
- }).to(GetFirewallRulesByVirtualMachine.class);
- bind(new TypeLiteral<CacheLoader<String, Zone>>() {
- }).to(ZoneIdToZone.class);
- bind(new TypeLiteral<CacheLoader<String, SshKeyPair>>() {
- }).to(CreateUniqueKeyPair.class);
- bind(new TypeLiteral<Supplier<LoadingCache<String, Zone>>>() {
- }).to(ZoneIdToZoneSupplier.class);
- bind(new TypeLiteral<Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup>>() {
- }).to(CreateSecurityGroupIfNeeded.class);
- bind(new TypeLiteral<CacheLoader<ZoneAndName, SecurityGroup>>() {
- }).to(FindSecurityGroupOrCreate.class);
- bind(new TypeLiteral<Function<Set<? extends NodeMetadata>, Multimap<String, String>>>() {
- }).to(OrphanedGroupsByZoneId.class);
-
- bind(new TypeLiteral<ImageExtension>() {
- }).to(CloudStackImageExtension.class);
-
- bind(new TypeLiteral<SecurityGroupExtension>() {
- }).to(CloudStackSecurityGroupExtension.class);
-
- // to have the compute service adapter override default locations
- install(new LocationsFromComputeServiceAdapterModule<VirtualMachine, ServiceOffering, Template, Zone>() {
- });
- }
-
-
- @Override
- protected TemplateOptions provideTemplateOptions(Injector injector, TemplateOptions options) {
- return options.as(CloudStackTemplateOptions.class)
- .generateKeyPair(injector.getInstance(
- Key.get(boolean.class, Names.named(AUTO_GENERATE_KEYPAIRS))));
- }
-
- @Provides
- @Singleton
- @Memoized
- public Supplier<Map<String, String>> listOSCategories(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds,
- final CloudStackApi client) {
- return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException,
- new Supplier<Map<String, String>>() {
- @Override
- public Map<String, String> get() {
- GuestOSApi guestOSClient = client.getGuestOSApi();
- return guestOSClient.listOSCategories();
- }
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
- }
- }, seconds, TimeUnit.SECONDS);
- }
-
- @Provides
- @Singleton
- @Memoized
- public Supplier<Map<String, OSType>> listOSTypes(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds,
- final CloudStackApi client) {
- return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException,
- new Supplier<Map<String, OSType>>() {
- @Override
- public Map<String, OSType> get() {
- GuestOSApi guestOSClient = client.getGuestOSApi();
- return Maps.uniqueIndex(guestOSClient.listOSTypes(), new Function<OSType, String>() {
-
- @Override
- public String apply(OSType arg0) {
- return arg0.getId();
- }
- });
- }
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
- }
- }, seconds, TimeUnit.SECONDS);
- }
-
- @Provides
- @Singleton
- @Memoized
- public Supplier<Map<String, Network>> listNetworks(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds,
- final NetworksForCurrentUser networksForCurrentUser) {
- return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, networksForCurrentUser,
- seconds, TimeUnit.SECONDS);
- }
-
- @Provides
- @Singleton
- @Memoized
- public Supplier<Map<String, Project>> listProjects(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds,
- final ProjectsForCurrentUser projectsForCurrentUser) {
- return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, projectsForCurrentUser,
- seconds, TimeUnit.SECONDS);
- }
-
- @Provides
- @Singleton
- @Memoized
- public Supplier<User> getCurrentUser(AtomicReference<AuthorizationException> authException, @Named(PROPERTY_SESSION_INTERVAL) long seconds,
- final GetCurrentUser getCurrentUser) {
- return MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.create(authException, getCurrentUser,
- seconds, TimeUnit.SECONDS);
- }
-
- @Provides
- @Singleton
- protected Predicate<String> jobComplete(JobComplete jobComplete) {
- return retry(jobComplete, 1200, 1, 5, SECONDS);
- }
-
- @Provides
- @Singleton
- protected LoadingCache<String, SshKeyPair> keyPairMap(
- CacheLoader<String, SshKeyPair> in) {
- return CacheBuilder.newBuilder().build(in);
- }
-
- @Provides
- @Singleton
- protected LoadingCache<ZoneAndName, SecurityGroup> securityGroupMap(
- CacheLoader<ZoneAndName, SecurityGroup> in) {
- return CacheBuilder.newBuilder().build(in);
- }
-
- @Provides
- @Singleton
- protected LoadingCache<String, Set<IPForwardingRule>> getIPForwardingRulesByVirtualMachine(
- CacheLoader<String, Set<IPForwardingRule>> in) {
- return CacheBuilder.newBuilder().build(in);
- }
-
-
- @Provides
- @Singleton
- protected LoadingCache<String, Set<FirewallRule>> getFirewallRulesByVirtualMachine(
- CacheLoader<String, Set<FirewallRule>> getFirewallRules) {
- return CacheBuilder.newBuilder().build(getFirewallRules);
- }
-
- @Provides
- @Singleton
- public Map<NetworkType, ? extends OptionsConverter> optionsConverters() {
- return ImmutableMap.of(
- NetworkType.ADVANCED, new AdvancedNetworkOptionsConverter(),
- NetworkType.BASIC, new BasicNetworkOptionsConverter());
- }
-
- @Override
- protected Optional<ImageExtension> provideImageExtension(Injector i) {
- return Optional.of(i.getInstance(ImageExtension.class));
- }
-
- @Override
- protected Optional<SecurityGroupExtension> provideSecurityGroupExtension(Injector i) {
- return Optional.of(i.getInstance(SecurityGroupExtension.class));
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java
deleted file mode 100644
index 2009e6d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtension.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.extensions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.find;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_IMAGE_AVAILABLE;
-import static org.jclouds.location.predicates.LocationPredicates.idEquals;
-
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.Constants;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateMetadata;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.options.CreateTemplateOptions;
-import org.jclouds.cloudstack.options.ListVolumesOptions;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.domain.CloneImageTemplate;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.domain.ImageTemplate;
-import org.jclouds.compute.domain.ImageTemplateBuilder;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.extensions.ImageExtension;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.domain.Location;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.collect.Iterables;
-import com.google.common.util.concurrent.Atomics;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.UncheckedTimeoutException;
-
-/**
- * CloudStack implementation of {@link ImageExtension}
- */
-@Singleton
-public class CloudStackImageExtension implements ImageExtension {
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final CloudStackApi client;
- private final ListeningExecutorService userExecutor;
- private final Supplier<Set<? extends Location>> locations;
- private final Predicate<AtomicReference<Image>> imageAvailablePredicate;
- private final BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult;
- private final Predicate<String> jobComplete;
-
- @Inject
- public CloudStackImageExtension(CloudStackApi client,
- @Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor,
- @Memoized Supplier<Set<? extends Location>> locations,
- @Named(TIMEOUT_IMAGE_AVAILABLE) Predicate<AtomicReference<Image>> imageAvailablePredicate,
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult,
- Predicate<String> jobComplete) {
- this.client = checkNotNull(client, "client");
- this.userExecutor = checkNotNull(userExecutor, "userExecutor");
- this.locations = checkNotNull(locations, "locations");
- this.imageAvailablePredicate = checkNotNull(imageAvailablePredicate, "imageAvailablePredicate");
- this.blockUntilJobCompletesAndReturnResult = checkNotNull(blockUntilJobCompletesAndReturnResult,
- "blockUntilJobCompletesAndReturnResult");
- this.jobComplete = checkNotNull(jobComplete, "jobComplete");
- }
-
- @Override
- public ImageTemplate buildImageTemplateFromNode(String name, String id) {
- VirtualMachine vm = client.getVirtualMachineApi().getVirtualMachine(id);
- if (vm == null)
- throw new NoSuchElementException("Cannot find vm with id: " + id);
- CloneImageTemplate template = new ImageTemplateBuilder.CloneImageTemplateBuilder().nodeId(id).name(name).build();
- return template;
- }
-
- @Override
- public ListenableFuture<Image> createImage(ImageTemplate template) {
- checkState(template instanceof CloneImageTemplate,
- " cloudstack only currently supports creating images through cloning.");
- CloneImageTemplate cloneTemplate = (CloneImageTemplate) template;
-
- VirtualMachine vm = client.getVirtualMachineApi().getVirtualMachine(cloneTemplate.getSourceNodeId());
- String stopJob = client.getVirtualMachineApi().stopVirtualMachine(vm.getId());
- jobComplete.apply(stopJob);
-
- Set<Volume> volumes = client.getVolumeApi().listVolumes(ListVolumesOptions.Builder.virtualMachineId(vm.getId()));
- Volume volume = Iterables.getOnlyElement(volumes);
-
- CreateTemplateOptions options = CreateTemplateOptions.Builder.volumeId(volume.getId());
- AsyncCreateResponse templateJob = client.getTemplateApi().createTemplate(TemplateMetadata.builder()
- .name(cloneTemplate.getName())
- .osTypeId(vm.getGuestOSId())
- .displayText(cloneTemplate.getName())
- .build(), options);
- Template newTemplate = blockUntilJobCompletesAndReturnResult.<Template>apply(templateJob);
-
- logger.info(">> Registered new template %s, waiting for it to become available.", newTemplate.getId());
-
- final AtomicReference<Image> image = Atomics.newReference(new ImageBuilder()
- .location(find(locations.get(), idEquals(vm.getZoneId())))
- .id(newTemplate.getId())
- .providerId(newTemplate.getId())
- .description(cloneTemplate.getName())
- .operatingSystem(OperatingSystem.builder().description(cloneTemplate.getName()).build())
- .status(Image.Status.PENDING).build());
-
- return userExecutor.submit(new Callable<Image>() {
- @Override
- public Image call() throws Exception {
- if (imageAvailablePredicate.apply(image))
- return image.get();
- // TODO: get rid of the expectation that the image will be available, as it is very brittle
- throw new UncheckedTimeoutException("Image was not created within the time limit: " + image.get());
- }
- });
- }
-
- @Override
- public boolean deleteImage(String id) {
- try {
- AsyncCreateResponse deleteJob = client.getTemplateApi().deleteTemplate(id);
- jobComplete.apply(deleteJob.getJobId());
- return true;
- } catch (Exception e) {
- return false;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
deleted file mode 100644
index 70f7728..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.extensions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.notNull;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.ruleCidrMatches;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.ruleGroupMatches;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-import org.jclouds.cloudstack.options.ListSecurityGroupsOptions;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.compute.extensions.SecurityGroupExtension;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.domain.Location;
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.net.domain.IpProtocol;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
-
-/**
- * An extension to compute service to allow for the manipulation of {@link org.jclouds.compute.domain.SecurityGroup}s. Implementation
- * is optional by providers.
- */
-public class CloudStackSecurityGroupExtension implements SecurityGroupExtension {
- protected final CloudStackApi api;
- protected final Function<org.jclouds.cloudstack.domain.SecurityGroup, SecurityGroup> groupConverter;
- protected final LoadingCache<ZoneAndName, org.jclouds.cloudstack.domain.SecurityGroup> groupCreator;
- protected final GroupNamingConvention.Factory namingConvention;
- protected final Supplier<Set<? extends Location>> locations;
- protected final BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult;
- protected final Predicate<String> jobComplete;
-
- @Inject
- public CloudStackSecurityGroupExtension(CloudStackApi api,
- Function<org.jclouds.cloudstack.domain.SecurityGroup, SecurityGroup> groupConverter,
- LoadingCache<ZoneAndName, org.jclouds.cloudstack.domain.SecurityGroup> groupCreator,
- GroupNamingConvention.Factory namingConvention,
- @Memoized Supplier<Set<? extends Location>> locations,
- BlockUntilJobCompletesAndReturnResult blockUntilJobCompletesAndReturnResult,
- Predicate<String> jobComplete) {
- this.api = checkNotNull(api, "api");
- this.groupConverter = checkNotNull(groupConverter, "groupConverter");
- this.groupCreator = checkNotNull(groupCreator, "groupCreator");
- this.namingConvention = checkNotNull(namingConvention, "namingConvention");
- this.locations = checkNotNull(locations, "locations");
- this.blockUntilJobCompletesAndReturnResult = checkNotNull(blockUntilJobCompletesAndReturnResult,
- "blockUntilJobCompletesAndReturnResult");
- this.jobComplete = checkNotNull(jobComplete, "jobComplete");
- }
-
- @Override
- public Set<SecurityGroup> listSecurityGroups() {
- Iterable<? extends org.jclouds.cloudstack.domain.SecurityGroup> rawGroups =
- api.getSecurityGroupApi().listSecurityGroups();
- Iterable<SecurityGroup> groups = transform(filter(rawGroups, notNull()),
- groupConverter);
- return ImmutableSet.copyOf(groups);
- }
-
- /**
- * Note that for the time being, security groups are not scoped by location in
- * CloudStack, so this will simply return listSecurityGroups().
- *
- * @param location
- * @return security groups
- */
- @Override
- public Set<SecurityGroup> listSecurityGroupsInLocation(final Location location) {
- return listSecurityGroups();
- }
-
- @Override
- public Set<SecurityGroup> listSecurityGroupsForNode(String id) {
- checkNotNull(id, "id");
-
- Iterable<? extends org.jclouds.cloudstack.domain.SecurityGroup> rawGroups =
- api.getSecurityGroupApi().listSecurityGroups(ListSecurityGroupsOptions.Builder
- .virtualMachineId(id));
-
- Iterable<SecurityGroup> groups = transform(filter(rawGroups, notNull()),
- groupConverter);
- return ImmutableSet.copyOf(groups);
- }
-
- @Override
- public SecurityGroup getSecurityGroupById(String id) {
- checkNotNull(id, "id");
-
- org.jclouds.cloudstack.domain.SecurityGroup rawGroup
- = api.getSecurityGroupApi().getSecurityGroup(id);
-
- if (rawGroup == null) {
- return null;
- }
-
- return groupConverter.apply(rawGroup);
- }
-
- @Override
- public SecurityGroup createSecurityGroup(String name, Location location) {
- checkNotNull(name, "name");
- checkNotNull(location, "location");
-
- String markerGroup = namingConvention.create().sharedNameForGroup(name);
-
- ZoneSecurityGroupNamePortsCidrs zoneAndName = ZoneSecurityGroupNamePortsCidrs.builder()
- .zone(location.getId())
- .name(markerGroup)
- .build();
-
- return groupConverter.apply(groupCreator.getUnchecked(zoneAndName));
- }
-
- @Override
- public boolean removeSecurityGroup(String id) {
- checkNotNull(id, "id");
-
- org.jclouds.cloudstack.domain.SecurityGroup group =
- api.getSecurityGroupApi().getSecurityGroup(id);
-
- if (group == null) {
- return false;
- }
-
- for (IngressRule rule : group.getIngressRules()) {
- jobComplete.apply(api.getSecurityGroupApi().revokeIngressRule(rule.getId()));
- }
-
- api.getSecurityGroupApi().deleteSecurityGroup(id);
-
- // TODO find something better here maybe - hard to map zones to groups
- for (Location location : locations.get()) {
- groupCreator.invalidate(ZoneSecurityGroupNamePortsCidrs.builder()
- .zone(location.getId())
- .name(group.getName())
- .build());
- }
-
- return true;
- }
-
- @Override
- public SecurityGroup addIpPermission(IpPermission ipPermission, SecurityGroup group) {
- checkNotNull(group, "group");
- checkNotNull(ipPermission, "ipPermission");
- String id = checkNotNull(group.getId(), "group.getId()");
-
- if (!ipPermission.getCidrBlocks().isEmpty()) {
- jobComplete.apply(api.getSecurityGroupApi().authorizeIngressPortsToCIDRs(id,
- ipPermission.getIpProtocol().toString().toUpperCase(),
- ipPermission.getFromPort(),
- ipPermission.getToPort(),
- ipPermission.getCidrBlocks()));
- }
-
- if (!ipPermission.getTenantIdGroupNamePairs().isEmpty()) {
- jobComplete.apply(api.getSecurityGroupApi().authorizeIngressPortsToSecurityGroups(id,
- ipPermission.getIpProtocol().toString().toUpperCase(),
- ipPermission.getFromPort(),
- ipPermission.getToPort(),
- ipPermission.getTenantIdGroupNamePairs()));
- }
-
- return getSecurityGroupById(id);
- }
-
- @Override
- public SecurityGroup addIpPermission(IpProtocol protocol, int startPort, int endPort,
- Multimap<String, String> tenantIdGroupNamePairs,
- Iterable<String> ipRanges,
- Iterable<String> groupIds, SecurityGroup group) {
- IpPermission.Builder permBuilder = IpPermission.builder();
- permBuilder.ipProtocol(protocol);
- permBuilder.fromPort(startPort);
- permBuilder.toPort(endPort);
- permBuilder.tenantIdGroupNamePairs(tenantIdGroupNamePairs);
- permBuilder.cidrBlocks(ipRanges);
- permBuilder.groupIds(groupIds);
-
- return addIpPermission(permBuilder.build(), group);
- }
-
- @Override
- public SecurityGroup removeIpPermission(IpPermission ipPermission, SecurityGroup group) {
- checkNotNull(group, "group");
- checkNotNull(ipPermission, "ipPermission");
- String id = checkNotNull(group.getId(), "group.getId()");
-
- org.jclouds.cloudstack.domain.SecurityGroup rawGroup = api.getSecurityGroupApi()
- .getSecurityGroup(id);
-
- if (!ipPermission.getCidrBlocks().isEmpty()) {
- for (IngressRule rule : filter(rawGroup.getIngressRules(),
- ruleCidrMatches(ipPermission.getIpProtocol().toString(),
- ipPermission.getFromPort(),
- ipPermission.getToPort(),
- ipPermission.getCidrBlocks()))) {
- jobComplete.apply(api.getSecurityGroupApi().revokeIngressRule(rule.getId()));
- }
- }
-
- if (!ipPermission.getTenantIdGroupNamePairs().isEmpty()) {
- for (IngressRule rule : filter(rawGroup.getIngressRules(),
- ruleGroupMatches(ipPermission.getIpProtocol().toString(),
- ipPermission.getFromPort(),
- ipPermission.getToPort(),
- ipPermission.getTenantIdGroupNamePairs()))) {
- jobComplete.apply(api.getSecurityGroupApi().revokeIngressRule(rule.getId()));
- }
- }
-
- return getSecurityGroupById(id);
- }
-
- @Override
- public SecurityGroup removeIpPermission(IpProtocol protocol, int startPort, int endPort,
- Multimap<String, String> tenantIdGroupNamePairs,
- Iterable<String> ipRanges,
- Iterable<String> groupIds, SecurityGroup group) {
- IpPermission.Builder permBuilder = IpPermission.builder();
- permBuilder.ipProtocol(protocol);
- permBuilder.fromPort(startPort);
- permBuilder.toPort(endPort);
- permBuilder.tenantIdGroupNamePairs(tenantIdGroupNamePairs);
- permBuilder.cidrBlocks(ipRanges);
- permBuilder.groupIds(groupIds);
-
- return removeIpPermission(permBuilder.build(), group);
- }
-
- @Override
- public boolean supportsTenantIdGroupNamePairs() {
- return true;
- }
-
- @Override
- public boolean supportsTenantIdGroupIdPairs() {
- return false;
- }
-
- @Override
- public boolean supportsGroupIds() {
- return false;
- }
-
- @Override
- public boolean supportsPortRangesForGroups() {
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
deleted file mode 100644
index 0d17317..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static com.google.common.collect.Iterables.transform;
-
-
-import javax.annotation.Resource;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.compute.domain.SecurityGroupBuilder;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.cloudstack.domain.IngressRule;
-
-import com.google.common.base.Function;
-import com.google.inject.Inject;
-
-
-/**
- * A function for transforming a CloudStack-specific SecurityGroup into a generic
- * SecurityGroup object.
- */
-@Singleton
-public class CloudStackSecurityGroupToSecurityGroup implements Function<org.jclouds.cloudstack.domain.SecurityGroup, SecurityGroup> {
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- protected final Function<IngressRule, IpPermission> ruleToPermission;
-
- @Inject
- public CloudStackSecurityGroupToSecurityGroup(Function<IngressRule, IpPermission> ruleToPermission) {
- this.ruleToPermission = ruleToPermission;
- }
-
- @Override
- public SecurityGroup apply(org.jclouds.cloudstack.domain.SecurityGroup group) {
- SecurityGroupBuilder builder = new SecurityGroupBuilder();
-
- builder.id(group.getId());
- builder.providerId(group.getId());
- builder.name(group.getName());
- builder.ownerId(group.getAccount());
- builder.ipPermissions(transform(group.getIngressRules(), ruleToPermission));
-
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java
deleted file mode 100644
index fbcdc18..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/IngressRuleToIpPermission.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import javax.annotation.Resource;
-import javax.inject.Named;
-
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.cloudstack.domain.IngressRule;
-import org.jclouds.logging.Logger;
-import org.jclouds.net.domain.IpPermission;
-import org.jclouds.net.domain.IpProtocol;
-
-import com.google.common.base.Function;
-
-
-/**
- * A function for transforming a CloudStack-specific IngressRule into a generic
- * IpPermission object.
- */
-public class IngressRuleToIpPermission implements Function<IngressRule, IpPermission> {
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- public IngressRuleToIpPermission() {
- }
-
- @Override
- public IpPermission apply(IngressRule rule) {
- IpPermission.Builder builder = IpPermission.builder();
- builder.ipProtocol(IpProtocol.fromValue(rule.getProtocol()));
- builder.fromPort(rule.getStartPort());
- builder.toPort(rule.getEndPort());
- if (rule.getCIDR() != null) {
- builder.cidrBlock(rule.getCIDR());
- }
- if (rule.getSecurityGroupName() != null
- && rule.getAccount() != null) {
- builder.tenantIdGroupNamePair(rule.getAccount(), rule.getSecurityGroupName());
- }
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java
deleted file mode 100644
index d7a187d..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/OrphanedGroupsByZoneId.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
-import static com.google.common.collect.Sets.filter;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.predicates.NodePredicates;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.cloudstack.compute.predicates.AllNodesInGroupTerminated;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-
-public class OrphanedGroupsByZoneId implements Function<Set<? extends NodeMetadata>, Multimap<String, String>> {
- private final Predicate<ZoneAndName> allNodesInGroupTerminated;
-
- @Inject
- protected OrphanedGroupsByZoneId(ComputeService computeService) {
- this(new AllNodesInGroupTerminated(checkNotNull(computeService, "computeService")));
- }
-
- @VisibleForTesting
- OrphanedGroupsByZoneId(Predicate<ZoneAndName> allNodesInGroupTerminated) {
- this.allNodesInGroupTerminated = checkNotNull(allNodesInGroupTerminated, "allNodesInGroupTerminated");
- }
-
- public Multimap<String, String> apply(Set<? extends NodeMetadata> deadNodes) {
- Iterable<? extends NodeMetadata> nodesWithGroup = filter(deadNodes, NodePredicates.hasGroup());
- Set<ZoneAndName> zoneAndGroupNames = ImmutableSet.copyOf(filter(transform(nodesWithGroup,
- new Function<NodeMetadata, ZoneAndName>() {
-
- @Override
- public ZoneAndName apply(NodeMetadata input) {
- String zoneId = input.getLocation().getScope() == LocationScope.HOST ? input.getLocation()
- .getParent().getId() : input.getLocation().getId();
- return ZoneAndName.fromZoneAndName(zoneId, input.getGroup());
- }
-
- }), allNodesInGroupTerminated));
- Multimap<String, String> zoneToZoneAndGroupNames = Multimaps.transformValues(Multimaps.index(zoneAndGroupNames,
- ZoneAndName.ZONE_FUNCTION), ZoneAndName.NAME_FUNCTION);
- return zoneToZoneAndGroupNames;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java
deleted file mode 100644
index ab85c3a..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.domain.Processor;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-
-@Singleton
-public class ServiceOfferingToHardware implements Function<ServiceOffering, Hardware> {
-
- @Override
- public Hardware apply(ServiceOffering offering) {
- return new HardwareBuilder()
- .ids(offering.getId() + "")
- .name(offering.getName())
- .tags(offering.getTags())
- .processors(ImmutableList.of(new Processor(offering.getCpuNumber(), offering.getCpuSpeed())))
- .ram(offering.getMemory())//
- // TODO: hypervisor probably from zone?
- // TODO .volumes()
- // displayText
- // created
- // haSupport
- // storageType
- // TODO where's the location of this?
- .build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java
deleted file mode 100644
index 86ab66e..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.location.predicates.LocationPredicates.idEquals;
-
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.Image.Status;
-import org.jclouds.compute.domain.ImageBuilder;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.domain.Location;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-import com.google.common.collect.FluentIterable;
-
-@Singleton
-public class TemplateToImage implements Function<Template, Image> {
- private final Supplier<Set<? extends Location>> locations;
- private final Function<Template, OperatingSystem> templateToOperatingSystem;
-
- @Inject
- public TemplateToImage(@Memoized Supplier<Set<? extends Location>> locations,
- Function<Template, OperatingSystem> templateToOperatingSystem) {
- this.locations = checkNotNull(locations, "locations");
- this.templateToOperatingSystem = checkNotNull(templateToOperatingSystem, "templateToOperatingSystem");
- }
-
- @Override
- public Image apply(Template template) {
- checkNotNull(template, "template");
-
- OperatingSystem os = templateToOperatingSystem.apply(template);
-
- ImageBuilder builder = new ImageBuilder().ids(template.getId() + "").name(template.getName())
- .description(template.getDisplayText()).operatingSystem(os);
-
- if (!template.isCrossZones())
- builder.location(FluentIterable.from(locations.get()).firstMatch(idEquals(template.getZoneId())).orNull());
-
- //TODO: implement status mapping!!!
- builder.status(Status.AVAILABLE);
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java
deleted file mode 100644
index 9abb7da..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.domain.OperatingSystem;
-import org.jclouds.compute.domain.OsFamily;
-import org.jclouds.compute.domain.OperatingSystem.Builder;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.compute.util.ComputeServiceUtils;
-import org.jclouds.logging.Logger;
-
-import com.google.common.base.Function;
-import com.google.common.base.Supplier;
-
-@Singleton
-public class TemplateToOperatingSystem implements Function<Template, OperatingSystem> {
- // CentOS 5.2 (32-bit)
- public static final Pattern DEFAULT_PATTERN = Pattern.compile(".* ([0-9.]+) ?\\(.*");
-
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
-
- private final Supplier<Map<String, OSType>> osTypes;
- private final Supplier<Map<String, String>> osCategories;
- private final Map<OsFamily, Map<String, String>> osVersionMap;
-
- @Inject
- public TemplateToOperatingSystem(@Memoized Supplier<Map<String, OSType>> osTypes,
- @Memoized Supplier<Map<String, String>> osCategories, Map<OsFamily, Map<String, String>> osVersionMap) {
- this.osTypes = checkNotNull(osTypes, "osTypes");
- this.osCategories = checkNotNull(osCategories, "osCategories");
- this.osVersionMap = checkNotNull(osVersionMap, "osVersionMap");
- }
-
- public OperatingSystem apply(Template from) {
- Builder builder = OperatingSystem.builder().description(from.getOSType());
-
- OSType type = osTypes.get().get(from.getOSTypeId());
- if (type == null) {
- logger.warn("Template refers to OS type ID %s but this does not exist. Template=%s Known OS types=%s", from.getOSTypeId(), from, osTypes.get());
- return builder.build();
- }
- builder.description(type.getDescription());
- builder.is64Bit(type.getDescription().indexOf("64-bit") != -1);
- String osCategory = osCategories.get().get(type.getOSCategoryId());
- if (osCategory == null) {
- logger.warn("OS type refers to OS category ID %s but this does not exist. OS type=%s Known OS categories=%s", type.getOSCategoryId(), type, osCategories.get());
- return builder.build();
- }
- builder.name(osCategory);
- OsFamily family = OsFamily.fromValue(osCategory.toLowerCase());
- builder.family(family);
- Matcher matcher = DEFAULT_PATTERN.matcher(type.getDescription());
- if (matcher.find()) {
- builder.version(ComputeServiceUtils.parseVersionOrReturnEmptyString(family, matcher.group(1), osVersionMap));
- }
- return builder.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java
deleted file mode 100644
index cb78ece..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
-import static com.google.common.collect.Sets.newHashSet;
-import static org.jclouds.location.predicates.LocationPredicates.idEquals;
-import static org.jclouds.util.InetAddresses2.isPrivateIPAddress;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.NIC;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.domain.HardwareBuilder;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeMetadata.Status;
-import org.jclouds.compute.domain.NodeMetadataBuilder;
-import org.jclouds.compute.domain.Processor;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.domain.Location;
-import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.util.Throwables2;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-
-@Singleton
-public class VirtualMachineToNodeMetadata implements Function<VirtualMachine, NodeMetadata> {
-
- public static final Map<VirtualMachine.State, Status> vmStateToNodeStatus = ImmutableMap
- .<VirtualMachine.State, Status> builder().put(VirtualMachine.State.STARTING, Status.PENDING)
- .put(VirtualMachine.State.RUNNING, Status.RUNNING).put(VirtualMachine.State.STOPPING, Status.PENDING)
- .put(VirtualMachine.State.STOPPED, Status.SUSPENDED)
- .put(VirtualMachine.State.DESTROYED, Status.TERMINATED)
- .put(VirtualMachine.State.EXPUNGING, Status.TERMINATED)
- .put(VirtualMachine.State.MIGRATING, Status.PENDING).put(VirtualMachine.State.ERROR, Status.ERROR)
- .put(VirtualMachine.State.UNKNOWN, Status.UNRECOGNIZED)
- // TODO: is this really a state?
- .put(VirtualMachine.State.SHUTDOWNED, Status.PENDING)
- .put(VirtualMachine.State.UNRECOGNIZED, Status.UNRECOGNIZED).build();
-
- private final Supplier<Set<? extends Location>> locations;
- private final Supplier<Set<? extends Image>> images;
- private final LoadingCache<String, Set<IPForwardingRule>> getIPForwardingRulesByVirtualMachine;
- private final GroupNamingConvention nodeNamingConvention;
-
- @Inject
- VirtualMachineToNodeMetadata(@Memoized Supplier<Set<? extends Location>> locations,
- @Memoized Supplier<Set<? extends Image>> images,
- LoadingCache<String, Set<IPForwardingRule>> getIPForwardingRulesByVirtualMachine,
- GroupNamingConvention.Factory namingConvention) {
- this.nodeNamingConvention = checkNotNull(namingConvention, "namingConvention").createWithoutPrefix();
- this.locations = checkNotNull(locations, "locations");
- this.images = checkNotNull(images, "images");
- this.getIPForwardingRulesByVirtualMachine = checkNotNull(getIPForwardingRulesByVirtualMachine,
- "getIPForwardingRulesByVirtualMachine");
- }
-
- @Override
- public NodeMetadata apply(final VirtualMachine from) {
- // convert the result object to a jclouds NodeMetadata
- NodeMetadataBuilder builder = new NodeMetadataBuilder();
- builder.ids(from.getId() + "");
- builder.name(from.getName());
- // TODO: in cloudstack 2.2.12, when "name" was set fine on the backend,
- // but wrong API response was returned to the user
- // http://bugs.cloud.com/show_bug.cgi?id=11664
- //
- // we set displayName to the same value as name, but this could be wrong
- // on hosts not started with jclouds
- builder.hostname(from.getDisplayName());
- builder.location(FluentIterable.from(locations.get()).firstMatch(idEquals(from.getZoneId())).orNull());
- if (from.getGroup() != null) {
- builder.group(from.getGroup());
- } else if (from.getDisplayName() != null) {
- builder.group(nodeNamingConvention.groupInUniqueNameOrNull(from.getDisplayName()));
- }
- Image image = FluentIterable.from(images.get()).firstMatch(new Predicate<Image>() {
- @Override
- public boolean apply(Image input) {
- return input.getProviderId().equals(from.getTemplateId() + "")
- // either location free image (location is null) or in the same zone as the VM
- && (input.getLocation() == null || input.getId().equals(from.getZoneId() + ""));
- }
- }).orNull();
- if (image != null) {
- builder.imageId(image.getId());
- builder.operatingSystem(image.getOperatingSystem());
- }
-
- builder.hardware(new HardwareBuilder()
- .ids(from.getServiceOfferingId() + "")
- .name(from.getServiceOfferingName() + "")
- // .tags() TODO
- .processors(ImmutableList.of(new Processor(from.getCpuCount(), from.getCpuSpeed())))
- .ram((int)from.getMemory())//
- .hypervisor(from.getHypervisor())//
- .build());
-
- builder.status(vmStateToNodeStatus.get(from.getState()));
-
- Set<String> publicAddresses = newHashSet();
- Set<String> privateAddresses = newHashSet();
- if (from.getIPAddress() != null) {
- boolean isPrivate = isPrivateIPAddress(from.getIPAddress());
- if (isPrivate) {
- privateAddresses.add(from.getIPAddress());
- } else {
- publicAddresses.add(from.getIPAddress());
- }
- }
- if (from.getPublicIP() != null) {
- publicAddresses.add(from.getPublicIP());
- }
- for (NIC nic : from.getNICs()) {
- if (nic.getIPAddress() != null) {
- if (isPrivateIPAddress(nic.getIPAddress())) {
- privateAddresses.add(nic.getIPAddress());
- } else {
- publicAddresses.add(nic.getIPAddress());
- }
- }
- }
- try {
- /* Also add to the list of public IPs any public IP address that has a
- forwarding rule that links to this machine */
- Iterables.addAll(publicAddresses, transform(
- filter(getIPForwardingRulesByVirtualMachine.getUnchecked(from.getId()),
- new Predicate<IPForwardingRule>() {
- @Override
- public boolean apply(IPForwardingRule rule) {
- return !"Deleting".equals(rule.getState());
- }
- }), new Function<IPForwardingRule, String>() {
- @Override
- public String apply(IPForwardingRule rule) {
- return rule.getIPAddress();
- }
- }));
- } catch (UncheckedExecutionException e) {
- if (Throwables2.getFirstThrowableOfType(e, ResourceNotFoundException.class) == null) {
- Throwables.propagateIfPossible(e.getCause());
- throw e;
- }
- }
- return builder.privateAddresses(privateAddresses).publicAddresses(publicAddresses).build();
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java
deleted file mode 100644
index ae46a67..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.functions;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.inject.Inject;
-
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.domain.Location;
-import org.jclouds.domain.LocationBuilder;
-import org.jclouds.domain.LocationScope;
-import org.jclouds.location.suppliers.all.JustProvider;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-
-/**
- * Converts an Zone into a Location.
- */
-public class ZoneToLocation implements Function<Zone, Location> {
- private final JustProvider provider;
-
- // allow us to lazy discover the provider of a resource
- @Inject
- public ZoneToLocation(JustProvider provider) {
- this.provider = checkNotNull(provider, "provider");
- }
-
- @Override
- public Location apply(Zone zone) {
- return new LocationBuilder().scope(LocationScope.ZONE).metadata(ImmutableMap.<String, Object> of())
- .description(zone.getName()).id(zone.getId())
- .parent(Iterables.getOnlyElement(provider.get())).build();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
deleted file mode 100644
index 81d51d8..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.loaders;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import javax.annotation.Resource;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-
-import com.google.common.base.Throwables;
-import com.google.common.cache.CacheLoader;
-import com.google.inject.Inject;
-
-@Singleton
-public class CreateUniqueKeyPair extends CacheLoader<String, SshKeyPair> {
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
- protected final CloudStackApi client;
-
- @Inject
- public CreateUniqueKeyPair(CloudStackApi client) {
- this.client = checkNotNull(client, "client");
- }
-
- @Override
- public SshKeyPair load(String input) {
- SshKeyPair keyPair = null;
- while (keyPair == null) {
- try {
- keyPair = client.getSSHKeyPairApi().createSSHKeyPair(input);
- logger.debug(">> creating SSH key pair with name %s", input);
- } catch (IllegalStateException e) {
- logger.error(e, "<< error creating SSH key pair with name %s: ",
- Throwables.getRootCause(e).getMessage());
- throw Throwables.propagate(e);
- }
- }
-
- logger.debug("<< created keyPair(%s)", keyPair.getName());
- return keyPair;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
deleted file mode 100644
index 93f32a9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.compute.loaders;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-
-
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.logging.Logger;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-
-import com.google.common.base.Function;
-import com.google.common.cache.CacheLoader;
-
-public class FindSecurityGroupOrCreate extends CacheLoader<ZoneAndName, SecurityGroup> {
- @Resource
- @Named(ComputeServiceConstants.COMPUTE_LOGGER)
- protected Logger logger = Logger.NULL;
- protected final CloudStackApi client;
- protected final Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup> groupCreator;
-
- @Inject
- public FindSecurityGroupOrCreate(CloudStackApi client,
- Function<ZoneSecurityGroupNamePortsCidrs, SecurityGroup> groupCreator) {
- this.client = checkNotNull(client, "client");
- this.groupCreator = checkNotNull(groupCreator, "groupCreator");
- }
-
- @Override
- public SecurityGroup load(ZoneAndName in) {
- SecurityGroup group = client.getSecurityGroupApi().getSecurityGroupByName(in.getName());
- if (group != null) {
- return group;
- } else {
- return createNewSecurityGroup(in);
- }
- }
-
- private SecurityGroup createNewSecurityGroup(ZoneAndName in) {
- checkState(
- checkNotNull(in, "ZoneSecurityGrioupNamePortsCidrs") instanceof ZoneSecurityGroupNamePortsCidrs,
- "programming error: when issuing get to this cacheloader, you need to pass an instance of ZoneSecurityGroupNamePortsCidrs, not %s",
- in);
- ZoneSecurityGroupNamePortsCidrs zoneSecurityGroupNamePortsCidrs = ZoneSecurityGroupNamePortsCidrs.class.cast(in);
- return groupCreator.apply(zoneSecurityGroupNamePortsCidrs);
- }
-
- @Override
- public String toString() {
- return "returnExistingSecurityGroupInZoneOrCreateAsNeeded()";
- }
-
-}
[05/51] [abbrv] stratos git commit: untill oct 16
Posted by im...@apache.org.
untill oct 16
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fff134d5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fff134d5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fff134d5
Branch: refs/heads/master
Commit: fff134d5370030ca304893b04effa33ca18003e8
Parents: 0c047de
Author: asankasa <as...@wso2.com>
Authored: Thu Oct 16 11:51:52 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 13 10:56:28 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/CloudstackIaas.java | 51 +++++++++++++++-----
.../util/CloudControllerConstants.java | 1 +
2 files changed, 40 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fff134d5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
index ccf4701..926894f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/CloudstackIaas.java
@@ -26,6 +26,8 @@ import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeoutException;
@@ -157,7 +159,12 @@ public class CloudstackIaas extends Iaas{
.tags(Arrays.asList(iaasInfo.getProperty(CloudControllerConstants.TAGS)
.split(CloudControllerConstants.ENTRY_SEPARATOR)));
}
- //todo add disk offering
+ //todo check whether this is working or not
+ if (iaasInfo.getProperty(CloudControllerConstants.DISK_OFFERING) != null) {
+ template.getOptions()
+ .as(CloudStackTemplateOptions.class)
+ .diskOfferingId(iaasInfo.getProperty(CloudControllerConstants.DISK_OFFERING));
+ }
// set Template
iaasInfo.setTemplate(template);
@@ -165,7 +172,15 @@ public class CloudstackIaas extends Iaas{
@Override
public void setDynamicPayload() {
- ///todo implement this method
+ System.out.println("=====================inside set setDynamicPayload method=================================");
+
+ IaasProvider iaasInfo = getIaasProvider();
+ if (iaasInfo.getTemplate() != null && iaasInfo.getPayload() != null) {
+ //todo check whether this is working or not
+ iaasInfo.getTemplate().getOptions().as(CloudStackTemplateOptions.class)
+ .userMetadata(convertByteArrayToHashMap(iaasInfo.getPayload()));
+
+ }
}
@Override
@@ -183,16 +198,16 @@ public class CloudstackIaas extends Iaas{
@Override
public String associatePredefinedAddress(NodeMetadata node, String ip) {
- System.out.println("======================This is the associatePredifinedAddress method=====================");
+ System.out.println("======================This is the associatePredefinedAddress method=====================");
//todo implement this method
return null;
}
@Override
public void releaseAddress(String ip) {
-//todo test this method
+ //todo test this method
- System.out.println("======================this is the release address method============");
+ System.out.println("======================this is the releaseAddress method============");
IaasProvider iaasInfo = getIaasProvider();
ComputeServiceContext context = iaasInfo.getComputeService().getContext();
@@ -211,12 +226,9 @@ public class CloudstackIaas extends Iaas{
@Override
public boolean isValidRegion(String region) throws InvalidRegionException {
-
- //todo study more about this
-
IaasProvider iaasInfo = getIaasProvider();
- //no such a method in jclouds
+ //no such method in Jclouds cloudstack api
String msg = "Invalid region: " + region +" in the iaas: " +iaasInfo.getType();
log.error(msg);
throw new InvalidRegionException(msg);
@@ -245,11 +257,9 @@ public class CloudstackIaas extends Iaas{
@Override
public boolean isValidHost(String zone, String host) throws InvalidHostException {
- //todo study more about this
IaasProvider iaasInfo = getIaasProvider();
-
- // there's no such concept in cloudstack
+ // there's no such method in jclouds cloustack api
String msg = "Invalid host: " + host +" in the zone: "+zone+ " and of the iaas: "+iaasInfo.getType();
log.error(msg);
throw new InvalidHostException(msg);
@@ -430,4 +440,21 @@ public class CloudstackIaas extends Iaas{
return true;
}
+
+ private Map<String,String> convertByteArrayToHashMap(byte[] byteArray){
+
+ Map<String, String> map = new HashMap<String, String>();
+
+ String stringFromByteArray = new String(byteArray);
+ String[] keyValuePairs = stringFromByteArray.split(",");
+
+ for(String keyValuePair : keyValuePairs){
+ String[] keyValue = keyValuePair.split("=");
+ if(keyValue.length>1) {
+ map.put(keyValue[0], keyValue[1]);
+ }
+ }
+
+ return map;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/fff134d5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 9063e1b..c72d0ba 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -101,6 +101,7 @@ public final class CloudControllerConstants {
public static final String USER_NAME = "userName";
public static final String DOMAIN_ID = "domainId";
+ public static final String DISK_OFFERING = "diskOffering";
/**
* column names
[46/51] [abbrv] stratos git commit: removed cloudstack dependancy
from dependancies folder
Posted by im...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Account.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Account.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Account.java
deleted file mode 100644
index 8dad3a9..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Account.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Map;
-import java.util.Set;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ForwardingSet;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Class Account
- */
-public class Account extends ForwardingSet<User> {
-
- /**
- */
- public static enum State {
- ENABLED, DISABLED, LOCKED, UNRECOGNIZED;
-
- @Override
- public String toString() {
- return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, name());
- }
-
- public static State fromValue(String state) {
- try {
- return valueOf(CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- }
-
- /**
- */
- public static enum Type {
- /**
- * API access for all the resources associated with their account. There
- * may be many users in a domain, many domains in a deployment, and many
- * users in a deployment. This is typically the end user
- */
- USER(0),
- /**
- * full API access. This is typically a service administrator or code that
- * executes with complete trust in the service operator's environment.
- */
- ADMIN(1),
- /**
- * full API access within a domain. This is the most privileged user that
- * a given customer has. This may be a reseller for the service provider.
- */
- DOMAIN_ADMIN(2), UNRECOGNIZED(Integer.MAX_VALUE);
-
- private int code;
-
- private static final Map<Integer, Type> INDEX = Maps.uniqueIndex(ImmutableSet.copyOf(Type.values()),
- new Function<Type, Integer>() {
-
- @Override
- public Integer apply(Type input) {
- return input.code;
- }
-
- });
-
- Type(int code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return "" + code;
- }
-
- public static Type fromValue(String type) {
- Integer code = Integer.valueOf(checkNotNull(type, "type"));
- return INDEX.containsKey(code) ? INDEX.get(code) : UNRECOGNIZED;
- }
-
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromAccount(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected Account.Type type;
- protected String networkDomain;
- protected String domain;
- protected String domainId;
- protected Long IPsAvailable;
- protected Long IPLimit;
- protected long IPs;
- protected boolean cleanupRequired;
- protected String name;
- protected long receivedBytes;
- protected long sentBytes;
- protected Long snapshotsAvailable;
- protected Long snapshotLimit;
- protected long snapshots;
- protected Account.State state;
- protected Long templatesAvailable;
- protected Long templateLimit;
- protected long templates;
- protected Long VMsAvailable;
- protected Long VMLimit;
- protected long VMsRunning;
- protected long VMsStopped;
- protected long VMs;
- protected Long volumesAvailable;
- protected Long volumeLimit;
- protected long volumes;
- protected Set<User> users = ImmutableSet.of();
-
- /**
- * @see Account#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Account#getType()
- */
- public T type(Account.Type type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Account#getNetworkDomain()
- */
- public T networkDomain(String networkDomain) {
- this.networkDomain = networkDomain;
- return self();
- }
-
- /**
- * @see Account#getDomain()
- */
- public T domain(String domain) {
- this.domain = domain;
- return self();
- }
-
- /**
- * @see Account#getDomainId()
- */
- public T domainId(String domainId) {
- this.domainId = domainId;
- return self();
- }
-
- /**
- * @see Account#getIPsAvailable()
- */
- public T IPsAvailable(Long IPsAvailable) {
- this.IPsAvailable = IPsAvailable;
- return self();
- }
-
- /**
- * @see Account#getIPLimit()
- */
- public T IPLimit(Long IPLimit) {
- this.IPLimit = IPLimit;
- return self();
- }
-
- /**
- * @see Account#getIPs()
- */
- public T IPs(long IPs) {
- this.IPs = IPs;
- return self();
- }
-
- /**
- * @see Account#isCleanupRequired()
- */
- public T cleanupRequired(boolean cleanupRequired) {
- this.cleanupRequired = cleanupRequired;
- return self();
- }
-
- /**
- * @see Account#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Account#getReceivedBytes()
- */
- public T receivedBytes(long receivedBytes) {
- this.receivedBytes = receivedBytes;
- return self();
- }
-
- /**
- * @see Account#getSentBytes()
- */
- public T sentBytes(long sentBytes) {
- this.sentBytes = sentBytes;
- return self();
- }
-
- /**
- * @see Account#getSnapshotsAvailable()
- */
- public T snapshotsAvailable(Long snapshotsAvailable) {
- this.snapshotsAvailable = snapshotsAvailable;
- return self();
- }
-
- /**
- * @see Account#getSnapshotLimit()
- */
- public T snapshotLimit(Long snapshotLimit) {
- this.snapshotLimit = snapshotLimit;
- return self();
- }
-
- /**
- * @see Account#getSnapshots()
- */
- public T snapshots(long snapshots) {
- this.snapshots = snapshots;
- return self();
- }
-
- /**
- * @see Account#getState()
- */
- public T state(Account.State state) {
- this.state = state;
- return self();
- }
-
- /**
- * @see Account#getTemplatesAvailable()
- */
- public T templatesAvailable(Long templatesAvailable) {
- this.templatesAvailable = templatesAvailable;
- return self();
- }
-
- /**
- * @see Account#getTemplateLimit()
- */
- public T templateLimit(Long templateLimit) {
- this.templateLimit = templateLimit;
- return self();
- }
-
- /**
- * @see Account#getTemplates()
- */
- public T templates(long templates) {
- this.templates = templates;
- return self();
- }
-
- /**
- * @see Account#getVMsAvailable()
- */
- public T VMsAvailable(Long VMsAvailable) {
- this.VMsAvailable = VMsAvailable;
- return self();
- }
-
- /**
- * @see Account#getVMLimit()
- */
- public T VMLimit(Long VMLimit) {
- this.VMLimit = VMLimit;
- return self();
- }
-
- /**
- * @see Account#getVMsRunning()
- */
- public T VMsRunning(long VMsRunning) {
- this.VMsRunning = VMsRunning;
- return self();
- }
-
- /**
- * @see Account#getVMsStopped()
- */
- public T VMsStopped(long VMsStopped) {
- this.VMsStopped = VMsStopped;
- return self();
- }
-
- /**
- * @see Account#getVMs()
- */
- public T VMs(long VMs) {
- this.VMs = VMs;
- return self();
- }
-
- /**
- * @see Account#getVolumesAvailable()
- */
- public T volumesAvailable(Long volumesAvailable) {
- this.volumesAvailable = volumesAvailable;
- return self();
- }
-
- /**
- * @see Account#getVolumeLimit()
- */
- public T volumeLimit(Long volumeLimit) {
- this.volumeLimit = volumeLimit;
- return self();
- }
-
- /**
- * @see Account#getVolumes()
- */
- public T volumes(long volumes) {
- this.volumes = volumes;
- return self();
- }
-
- /**
- * @see Account#getUsers()
- */
- public T users(Set<User> users) {
- this.users = ImmutableSet.copyOf(checkNotNull(users, "users"));
- return self();
- }
-
- public T users(User... in) {
- return users(ImmutableSet.copyOf(in));
- }
-
- public Account build() {
- return new Account(id, type, networkDomain, domain, domainId, IPsAvailable, IPLimit, IPs, cleanupRequired, name, receivedBytes, sentBytes, snapshotsAvailable, snapshotLimit, snapshots, state, templatesAvailable, templateLimit, templates, VMsAvailable, VMLimit, VMsRunning, VMsStopped, VMs, volumesAvailable, volumeLimit, volumes, users);
- }
-
- public T fromAccount(Account in) {
- return this
- .id(in.getId())
- .type(in.getType())
- .networkDomain(in.getNetworkDomain())
- .domain(in.getDomain())
- .domainId(in.getDomainId())
- .IPsAvailable(in.getIPsAvailable())
- .IPLimit(in.getIPLimit())
- .IPs(in.getIPs())
- .cleanupRequired(in.isCleanupRequired())
- .name(in.getName())
- .receivedBytes(in.getReceivedBytes())
- .sentBytes(in.getSentBytes())
- .snapshotsAvailable(in.getSnapshotsAvailable())
- .snapshotLimit(in.getSnapshotLimit())
- .snapshots(in.getSnapshots())
- .state(in.getState())
- .templatesAvailable(in.getTemplatesAvailable())
- .templateLimit(in.getTemplateLimit())
- .templates(in.getTemplates())
- .VMsAvailable(in.getVMsAvailable())
- .VMLimit(in.getVMLimit())
- .VMsRunning(in.getVMsRunning())
- .VMsStopped(in.getVMsStopped())
- .VMs(in.getVMs())
- .volumesAvailable(in.getVolumesAvailable())
- .volumeLimit(in.getVolumeLimit())
- .volumes(in.getVolumes())
- .users(in.getUsers());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final Account.Type type;
- private final String networkDomain;
- private final String domain;
- private final String domainId;
- private final Long IPsAvailable;
- private final Long IPLimit;
- private final long IPs;
- private final boolean cleanupRequired;
- private final String name;
- private final long receivedBytes;
- private final long sentBytes;
- private final Long snapshotsAvailable;
- private final Long snapshotLimit;
- private final long snapshots;
- private final Account.State state;
- private final Long templatesAvailable;
- private final Long templateLimit;
- private final long templates;
- private final Long VMsAvailable;
- private final Long VMLimit;
- private final long VMsRunning;
- private final long VMsStopped;
- private final long VMs;
- private final Long volumesAvailable;
- private final Long volumeLimit;
- private final long volumes;
- private final Set<User> users;
-
- @ConstructorProperties({
- "id", "accounttype", "networkdomain", "domain", "domainid", "ipavailable", "iplimit", "iptotal", "iscleanuprequired",
- "name", "receivedbytes", "sentbytes", "snapshotavailable", "snapshotlimit", "snapshottotal", "state", "templateavailable",
- "templatelimit", "templatetotal", "vmavailable", "vmlimit", "vmrunning", "vmstopped", "vmtotal", "volumeavailable", "volumelimit",
- "volumetotal", "user"
- })
- private Account(String id, @Nullable Type type, @Nullable String networkDomain, @Nullable String domain,
- @Nullable String domainId, @Nullable String IPsAvailable, @Nullable String IPLimit, long IPs,
- boolean cleanupRequired, @Nullable String name, long receivedBytes, long sentBytes,
- @Nullable String snapshotsAvailable, @Nullable String snapshotLimit, long snapshots,
- @Nullable State state, @Nullable String templatesAvailable, @Nullable String templateLimit,
- long templates, @Nullable String VMsAvailable, @Nullable String VMLimit, long VMsRunning,
- long VMsStopped, long VMs, @Nullable String volumesAvailable, @Nullable String volumeLimit,
- long volumes, @Nullable Set<User> users) {
- this(id, type, networkDomain, domain, domainId, toLongNullIfUnlimited(IPsAvailable), toLongNullIfUnlimited(IPLimit), IPs,
- cleanupRequired, name, receivedBytes, sentBytes, toLongNullIfUnlimited(snapshotsAvailable), toLongNullIfUnlimited(snapshotLimit),
- snapshots, state, toLongNullIfUnlimited(templatesAvailable), toLongNullIfUnlimited(templateLimit), templates,
- toLongNullIfUnlimited(VMsAvailable), toLongNullIfUnlimited(VMLimit), VMsRunning, VMsStopped, VMs,
- toLongNullIfUnlimited(volumesAvailable), toLongNullIfUnlimited(volumeLimit), volumes, users);
- }
-
- private static Long toLongNullIfUnlimited(String in) {
- return in == null || "Unlimited".equals(in) ? null : Long.valueOf(in);
- }
-
- protected Account(String id, @Nullable Account.Type type, @Nullable String networkDomain, @Nullable String domain,
- @Nullable String domainId, @Nullable Long IPsAvailable, @Nullable Long IPLimit, long IPs,
- boolean cleanupRequired, @Nullable String name, long receivedBytes, long sentBytes, @Nullable Long snapshotsAvailable,
- @Nullable Long snapshotLimit, long snapshots, @Nullable Account.State state, @Nullable Long templatesAvailable,
- @Nullable Long templateLimit, long templates, @Nullable Long VMsAvailable, @Nullable Long VMLimit, long VMsRunning,
- long VMsStopped, long VMs, @Nullable Long volumesAvailable, @Nullable Long volumeLimit, long volumes,
- @Nullable Set<User> users) {
- this.id = checkNotNull(id, "id");
- this.type = type;
- this.networkDomain = networkDomain;
- this.domain = domain;
- this.domainId = domainId;
- this.IPsAvailable = IPsAvailable;
- this.IPLimit = IPLimit;
- this.IPs = IPs;
- this.cleanupRequired = cleanupRequired;
- this.name = name;
- this.receivedBytes = receivedBytes;
- this.sentBytes = sentBytes;
- this.snapshotsAvailable = snapshotsAvailable;
- this.snapshotLimit = snapshotLimit;
- this.snapshots = snapshots;
- this.state = state;
- this.templatesAvailable = templatesAvailable;
- this.templateLimit = templateLimit;
- this.templates = templates;
- this.VMsAvailable = VMsAvailable;
- this.VMLimit = VMLimit;
- this.VMsRunning = VMsRunning;
- this.VMsStopped = VMsStopped;
- this.VMs = VMs;
- this.volumesAvailable = volumesAvailable;
- this.volumeLimit = volumeLimit;
- this.volumes = volumes;
- this.users = users == null ? ImmutableSet.<User>of() : ImmutableSet.copyOf(users);
- }
-
- /**
- * @return the id of the account
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return account type (admin, domain-admin, user)
- */
- @Nullable
- public Account.Type getType() {
- return this.type;
- }
-
- /**
- * @return the network domain
- */
- @Nullable
- public String getNetworkDomain() {
- return this.networkDomain;
- }
-
- /**
- * @return name of the Domain the account belongs to
- */
- @Nullable
- public String getDomain() {
- return this.domain;
- }
-
- /**
- * @return id of the Domain the account belongs to
- */
- @Nullable
- public String getDomainId() {
- return this.domainId;
- }
-
- /**
- * @return the total number of public ip addresses available for this account
- * to acquire, or null if unlimited
- */
- @Nullable
- public Long getIPsAvailable() {
- return this.IPsAvailable;
- }
-
- /**
- * @return the total number of public ip addresses this account can acquire,
- * or null if unlimited
- */
- @Nullable
- public Long getIPLimit() {
- return this.IPLimit;
- }
-
- /**
- * @return the total number of public ip addresses allocated for this account
- */
- public long getIPs() {
- return this.IPs;
- }
-
- /**
- * @return true if the account requires cleanup
- */
- public boolean isCleanupRequired() {
- return this.cleanupRequired;
- }
-
- /**
- * @return the name of the account
- */
- @Nullable
- public String getName() {
- return this.name;
- }
-
- /**
- * @return the total number of network traffic bytes received
- */
- public long getReceivedBytes() {
- return this.receivedBytes;
- }
-
- /**
- * @return the total number of network traffic bytes sent
- */
- public long getSentBytes() {
- return this.sentBytes;
- }
-
- /**
- * @return the total number of snapshots available for this account, or null
- * if unlimited
- */
- @Nullable
- public Long getSnapshotsAvailable() {
- return this.snapshotsAvailable;
- }
-
- /**
- * @return the total number of snapshots which can be stored by this account,
- * or null if unlimited
- */
- @Nullable
- public Long getSnapshotLimit() {
- return this.snapshotLimit;
- }
-
- /**
- * @return the total number of snapshots stored by this account
- */
- public long getSnapshots() {
- return this.snapshots;
- }
-
- /**
- * @return the state of the account
- */
- @Nullable
- public State getState() {
- return this.state;
- }
-
- /**
- * @return the total number of templates available to be created by this
- * account, or null if unlimited
- */
- @Nullable
- public Long getTemplatesAvailable() {
- return this.templatesAvailable;
- }
-
- /**
- * @return the total number of templates which can be created by this
- * account, or null if unlimited
- */
- @Nullable
- public Long getTemplateLimit() {
- return this.templateLimit;
- }
-
- /**
- * @return the total number of templates which have been created by this
- * account
- */
- public long getTemplates() {
- return this.templates;
- }
-
- /**
- * @return the total number of virtual machines available for this account to
- * acquire, or null if unlimited
- */
- @Nullable
- public Long getVMsAvailable() {
- return this.VMsAvailable;
- }
-
- /**
- * @return the total number of virtual machines that can be deployed by this
- * account, or null if unlimited
- */
- @Nullable
- public Long getVMLimit() {
- return this.VMLimit;
- }
-
- /**
- * @return the total number of virtual machines running for this account
- */
- public long getVMsRunning() {
- return this.VMsRunning;
- }
-
- /**
- * @return the total number of virtual machines stopped for this account
- */
- public long getVMsStopped() {
- return this.VMsStopped;
- }
-
- /**
- * @return the total number of virtual machines deployed by this account
- */
- public long getVMs() {
- return this.VMs;
- }
-
- /**
- * @return the total volume available for this account, or null if unlimited
- */
- @Nullable
- public Long getVolumesAvailable() {
- return this.volumesAvailable;
- }
-
- /**
- * @return the total volume which can be used by this account, or null if
- * unlimited
- */
- @Nullable
- public Long getVolumeLimit() {
- return this.volumeLimit;
- }
-
- /**
- * @return the total volume being used by this account
- */
- public long getVolumes() {
- return this.volumes;
- }
-
- /**
- * @return the list of users associated with account
- */
- public Set<User> getUsers() {
- return this.users;
- }
-
- @Override
- protected Set<User> delegate() {
- return this.users;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, type, networkDomain, domain, domainId, IPsAvailable, IPLimit, IPs, cleanupRequired, name, receivedBytes, sentBytes, snapshotsAvailable, snapshotLimit, snapshots, state, templatesAvailable, templateLimit, templates, VMsAvailable, VMLimit, VMsRunning, VMsStopped, VMs, volumesAvailable, volumeLimit, volumes, users);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Account that = Account.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.networkDomain, that.networkDomain)
- && Objects.equal(this.domain, that.domain)
- && Objects.equal(this.domainId, that.domainId)
- && Objects.equal(this.IPsAvailable, that.IPsAvailable)
- && Objects.equal(this.IPLimit, that.IPLimit)
- && Objects.equal(this.IPs, that.IPs)
- && Objects.equal(this.cleanupRequired, that.cleanupRequired)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.receivedBytes, that.receivedBytes)
- && Objects.equal(this.sentBytes, that.sentBytes)
- && Objects.equal(this.snapshotsAvailable, that.snapshotsAvailable)
- && Objects.equal(this.snapshotLimit, that.snapshotLimit)
- && Objects.equal(this.snapshots, that.snapshots)
- && Objects.equal(this.state, that.state)
- && Objects.equal(this.templatesAvailable, that.templatesAvailable)
- && Objects.equal(this.templateLimit, that.templateLimit)
- && Objects.equal(this.templates, that.templates)
- && Objects.equal(this.VMsAvailable, that.VMsAvailable)
- && Objects.equal(this.VMLimit, that.VMLimit)
- && Objects.equal(this.VMsRunning, that.VMsRunning)
- && Objects.equal(this.VMsStopped, that.VMsStopped)
- && Objects.equal(this.VMs, that.VMs)
- && Objects.equal(this.volumesAvailable, that.volumesAvailable)
- && Objects.equal(this.volumeLimit, that.volumeLimit)
- && Objects.equal(this.volumes, that.volumes)
- && Objects.equal(this.users, that.users);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("type", type).add("networkDomain", networkDomain).add("domain", domain).add("domainId", domainId).add("IPsAvailable", IPsAvailable).add("IPLimit", IPLimit).add("IPs", IPs).add("cleanupRequired", cleanupRequired).add("name", name).add("receivedBytes", receivedBytes).add("sentBytes", sentBytes).add("snapshotsAvailable", snapshotsAvailable).add("snapshotLimit", snapshotLimit).add("snapshots", snapshots).add("state", state).add("templatesAvailable", templatesAvailable).add("templateLimit", templateLimit).add("templates", templates).add("VMsAvailable", VMsAvailable).add("VMLimit", VMLimit).add("VMsRunning", VMsRunning).add("VMsStopped", VMsStopped).add("VMs", VMs).add("volumesAvailable", volumesAvailable).add("volumeLimit", volumeLimit).add("volumes", volumes).add("users", users);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Alert.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Alert.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Alert.java
deleted file mode 100644
index e46ec15..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Alert.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Represents an alert issued by Cloudstack
- */
-public class Alert {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromAlert(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String description;
- protected Date sent;
- protected String type;
-
- /**
- * @see Alert#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Alert#getDescription()
- */
- public T description(String description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see Alert#getSent()
- */
- public T sent(Date sent) {
- this.sent = sent;
- return self();
- }
-
- /**
- * @see Alert#getType()
- */
- public T type(String type) {
- this.type = type;
- return self();
- }
-
- public Alert build() {
- return new Alert(id, description, sent, type);
- }
-
- public T fromAlert(Alert in) {
- return this
- .id(in.getId())
- .description(in.getDescription())
- .sent(in.getSent())
- .type(in.getType());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String description;
- private final Date sent;
- private final String type;
-
- @ConstructorProperties({
- "id", "description", "sent", "type"
- })
- protected Alert(String id, @Nullable String description, @Nullable Date sent, @Nullable String type) {
- this.id = checkNotNull(id, "id");
- this.description = description;
- this.sent = sent;
- this.type = type;
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public String getDescription() {
- return this.description;
- }
-
- @Nullable
- public Date getSent() {
- return this.sent;
- }
-
- @Nullable
- public String getType() {
- return this.type;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, description, sent, type);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Alert that = Alert.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.description, that.description)
- && Objects.equal(this.sent, that.sent)
- && Objects.equal(this.type, that.type);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("description", description).add("sent", sent).add("type", type);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AllocationState.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AllocationState.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AllocationState.java
deleted file mode 100644
index cb93dae..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AllocationState.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.CaseFormat.UPPER_CAMEL;
-import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
-
-/**
- * Represents the allocationstate field used in several CloudStack domain objects.
- */
-public enum AllocationState {
- DISABLED,
- ENABLED,
- UNKNOWN;
-
- public static AllocationState fromValue(String value) {
- try {
- return valueOf(value.toUpperCase());
- } catch (IllegalArgumentException e) {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString() {
- return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
deleted file mode 100644
index 4acfa0c..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Representation of the API keypair response
- */
-public class ApiKeyPair {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromApiKeyPair(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String apiKey;
- protected String secretKey;
-
- /**
- * @see ApiKeyPair#getApiKey()
- */
- public T apiKey(String apiKey) {
- this.apiKey = apiKey;
- return self();
- }
-
- /**
- * @see ApiKeyPair#getSecretKey()
- */
- public T secretKey(String secretKey) {
- this.secretKey = secretKey;
- return self();
- }
-
- public ApiKeyPair build() {
- return new ApiKeyPair(apiKey, secretKey);
- }
-
- public T fromApiKeyPair(ApiKeyPair in) {
- return this
- .apiKey(in.getApiKey())
- .secretKey(in.getSecretKey());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String apiKey;
- private final String secretKey;
-
- @ConstructorProperties({
- "apikey", "secretkey"
- })
- protected ApiKeyPair(@Nullable String apiKey, @Nullable String secretKey) {
- this.apiKey = apiKey;
- this.secretKey = secretKey;
- }
-
- @Nullable
- public String getApiKey() {
- return this.apiKey;
- }
-
- @Nullable
- public String getSecretKey() {
- return this.secretKey;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(apiKey, secretKey);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- ApiKeyPair that = ApiKeyPair.class.cast(obj);
- return Objects.equal(this.apiKey, that.apiKey)
- && Objects.equal(this.secretKey, that.secretKey);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("apiKey", apiKey).add("secretKey", secretKey);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
deleted file mode 100644
index 8db03f7..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class AsyncCreateResponse
- */
-public class AsyncCreateResponse {
- public static final AsyncCreateResponse UNINITIALIZED = new AsyncCreateResponse(null, null);
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromAsyncCreateResponse(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected String jobId;
-
- /**
- * @see AsyncCreateResponse#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see AsyncCreateResponse#getJobId()
- */
- public T jobId(String jobId) {
- this.jobId = jobId;
- return self();
- }
-
- public AsyncCreateResponse build() {
- return new AsyncCreateResponse(id, jobId);
- }
-
- public T fromAsyncCreateResponse(AsyncCreateResponse in) {
- return this
- .id(in.getId())
- .jobId(in.getJobId());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final String jobId;
-
- @ConstructorProperties({
- "id", "jobid"
- })
- protected AsyncCreateResponse(@Nullable String id, @Nullable String jobId) {
- this.id = id;
- this.jobId = jobId;
- }
-
- /**
- * @return id of the resource being created
- */
- @Nullable
- public String getId() {
- return this.id;
- }
-
- /**
- * @return id of the job in progress
- */
- @Nullable
- public String getJobId() {
- return this.jobId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, jobId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- AsyncCreateResponse that = AsyncCreateResponse.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.jobId, that.jobId);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("jobId", jobId);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
deleted file mode 100644
index 229d7ef..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Date;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class AsyncJob
- */
-public class AsyncJob<S> {
-
- /**
- * Valid job result codes
- */
- public static enum ResultCode {
- SUCCESS(0),
- FAIL(530),
- UNKNOWN(-1);
-
- private final int code;
-
- private ResultCode(int code) {
- this.code = code;
- }
-
- public int code() {
- return this.code;
- }
-
- public static ResultCode fromValue(String value) {
- try {
- int resultCode = Integer.parseInt(value);
- switch (resultCode) {
- case 0:
- return SUCCESS;
- case 530:
- return FAIL;
- default:
- return UNKNOWN;
- }
- } catch (NumberFormatException e) {
- return UNKNOWN;
- }
- }
- }
-
- /**
- * Valid async job statuses
- */
- public static enum Status {
- IN_PROGRESS(0),
- SUCCEEDED(1),
- FAILED(2),
- UNKNOWN(-1);
-
- private final int code;
-
- private Status(int code) {
- this.code = code;
- }
-
- public int code() {
- return this.code;
- }
-
- public static Status fromValue(String value) {
- try {
- int statusCode = Integer.parseInt(value);
- switch (statusCode) {
- case 0:
- return IN_PROGRESS;
- case 1:
- return SUCCEEDED;
- case 2:
- return FAILED;
- default:
- return UNKNOWN;
- }
- } catch (NumberFormatException e) {
- return UNKNOWN;
- }
- }
- }
-
- public static <T> Builder<?, T> builder() {
- return new ConcreteBuilder<T>();
- }
-
- public Builder toBuilder() {
- return new ConcreteBuilder<S>().fromAsyncJob(this);
- }
-
- public abstract static class Builder<T extends Builder<T, S>, S> {
- protected abstract T self();
-
- protected String accountId;
- protected String cmd;
- protected Date created;
- protected String id;
- protected String instanceId;
- protected String instanceType;
- protected int progress;
- protected S result;
- protected AsyncJob.ResultCode resultCode;
- protected String resultType;
- protected AsyncJob.Status status;
- protected String userId;
- protected AsyncJobError error;
-
- /**
- * @see AsyncJob#getAccountId()
- */
- public T accountId(String accountId) {
- this.accountId = accountId;
- return self();
- }
-
- /**
- * @see AsyncJob#getCmd()
- */
- public T cmd(String cmd) {
- this.cmd = cmd;
- return self();
- }
-
- /**
- * @see AsyncJob#getCreated()
- */
- public T created(Date created) {
- this.created = created;
- return self();
- }
-
- /**
- * @see AsyncJob#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see AsyncJob#getInstanceId()
- */
- public T instanceId(String instanceId) {
- this.instanceId = instanceId;
- return self();
- }
-
- /**
- * @see AsyncJob#getInstanceType()
- */
- public T instanceType(String instanceType) {
- this.instanceType = instanceType;
- return self();
- }
-
- /**
- * @see AsyncJob#getProgress()
- */
- public T progress(int progress) {
- this.progress = progress;
- return self();
- }
-
- /**
- * @see AsyncJob#getResult()
- */
- public T result(S result) {
- this.result = result;
- return self();
- }
-
- /**
- * @see AsyncJob#getResultCode()
- */
- public T resultCode(AsyncJob.ResultCode resultCode) {
- this.resultCode = resultCode;
- return self();
- }
-
- /**
- * @see AsyncJob#getResultType()
- */
- public T resultType(String resultType) {
- this.resultType = resultType;
- return self();
- }
-
- /**
- * @see AsyncJob#getStatus()
- */
- public T status(AsyncJob.Status status) {
- this.status = status;
- return self();
- }
-
- /**
- * @see AsyncJob#getUserId()
- */
- public T userId(String userId) {
- this.userId = userId;
- return self();
- }
-
- /**
- * @see AsyncJob#getError()
- */
- public T error(AsyncJobError error) {
- this.error = error;
- return self();
- }
-
- public AsyncJob build() {
- return new AsyncJob<S>(accountId, cmd, created, id, instanceId, instanceType, progress, result, resultCode,
- resultType, status, userId, error);
- }
-
- public T fromAsyncJob(AsyncJob<S> in) {
- return this
- .accountId(in.getAccountId())
- .cmd(in.getCmd())
- .created(in.getCreated())
- .id(in.getId())
- .instanceId(in.getInstanceId())
- .instanceType(in.getInstanceType())
- .progress(in.getProgress())
- .result(in.getResult())
- .resultCode(in.getResultCode())
- .resultType(in.getResultType())
- .status(in.getStatus())
- .userId(in.getUserId())
- .error(in.getError());
- }
-
- public static Builder<?, Object> fromAsyncJobUntyped(AsyncJob<?> in) {
- return new ConcreteBuilder().fromAsyncJob(in);
- }
- }
-
- private static class ConcreteBuilder<T> extends Builder<ConcreteBuilder<T>, T> {
- @Override
- protected ConcreteBuilder<T> self() {
- return this;
- }
- }
-
- private final String accountId;
- private final String cmd;
- private final Date created;
- private final String id;
- private final String instanceId;
- private final String instanceType;
- private final int progress;
- private final S result;
- private final AsyncJob.ResultCode resultCode;
- private final String resultType;
- private final AsyncJob.Status status;
- private final String userId;
- private final AsyncJobError error;
-
- @ConstructorProperties({
- "accountid", "cmd", "created", "jobid", "jobinstanceid", "jobinstancetype", "jobprocstatus", "jobresult",
- "jobresultcode", "jobresulttype", "jobstatus", "userid", "error"
- })
- protected AsyncJob(@Nullable String accountId, @Nullable String cmd, @Nullable Date created, String id,
- @Nullable String instanceId, @Nullable String instanceType, int progress, @Nullable S result,
- @Nullable AsyncJob.ResultCode resultCode, @Nullable String resultType, @Nullable AsyncJob.Status status,
- @Nullable String userId, @Nullable AsyncJobError error) {
- this.accountId = accountId;
- this.cmd = cmd;
- this.created = created;
- this.id = checkNotNull(id, "id");
- this.instanceId = instanceId;
- this.instanceType = instanceType;
- this.progress = progress;
- this.result = result;
- this.resultCode = resultCode;
- this.resultType = resultType;
- this.status = status;
- this.userId = userId;
- this.error = error;
- }
-
- /**
- * @return the account that executed the async command
- */
- @Nullable
- public String getAccountId() {
- return this.accountId;
- }
-
- /**
- * @return the async command executed
- */
- @Nullable
- public String getCmd() {
- return this.cmd;
- }
-
- /**
- * @return the created date of the job
- */
- @Nullable
- public Date getCreated() {
- return this.created;
- }
-
- /**
- * @return async job ID
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @return the unique ID of the instance/entity object related to the job
- */
- @Nullable
- public String getInstanceId() {
- return this.instanceId;
- }
-
- /**
- * @return the instance/entity object related to the job
- */
- @Nullable
- public String getInstanceType() {
- return this.instanceType;
- }
-
- /**
- * @return the progress information of the PENDING job
- */
- public int getProgress() {
- return this.progress;
- }
-
- /**
- * @return the result reason
- */
- @Nullable
- public S getResult() {
- return this.result;
- }
-
- /**
- * @return the result code for the job
- */
- @Nullable
- public AsyncJob.ResultCode getResultCode() {
- return this.resultCode;
- }
-
- /**
- * @return the result type
- */
- @Nullable
- public String getResultType() {
- return this.resultType;
- }
-
- /**
- * @return the current job status-should be 0 for PENDING
- */
- @Nullable
- public AsyncJob.Status getStatus() {
- return this.status;
- }
-
- /**
- * @return the user that executed the async command
- */
- @Nullable
- public String getUserId() {
- return this.userId;
- }
-
- /**
- * @return the error related to this command, or null if no error or error
- * not yet encountered.
- */
- @Nullable
- public AsyncJobError getError() {
- return this.error;
- }
-
- public boolean hasFailed() {
- return getError() != null || getResultCode() == ResultCode.FAIL || getStatus() == Status.FAILED;
- }
-
- public boolean hasSucceed() {
- return getError() == null && getResultCode() == ResultCode.SUCCESS && getStatus() == Status.SUCCEEDED;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(accountId, cmd, created, id, instanceId, instanceType, progress, result, resultCode, resultType, status, userId, error);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- AsyncJob<?> that = AsyncJob.class.cast(obj);
- return Objects.equal(this.accountId, that.accountId)
- && Objects.equal(this.cmd, that.cmd)
- && Objects.equal(this.created, that.created)
- && Objects.equal(this.id, that.id)
- && Objects.equal(this.instanceId, that.instanceId)
- && Objects.equal(this.instanceType, that.instanceType)
- && Objects.equal(this.progress, that.progress)
- && Objects.equal(this.result, that.result)
- && Objects.equal(this.resultCode, that.resultCode)
- && Objects.equal(this.resultType, that.resultType)
- && Objects.equal(this.status, that.status)
- && Objects.equal(this.userId, that.userId)
- && Objects.equal(this.error, that.error);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("accountId", accountId).add("cmd", cmd).add("created", created).add("id", id).add("instanceId", instanceId)
- .add("instanceType", instanceType).add("progress", progress).add("result", result).add("resultCode", resultCode)
- .add("resultType", resultType).add("status", status).add("userId", userId).add("error", error);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
deleted file mode 100644
index 15c4399..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-public class AsyncJobError {
-
- /**
- * Error codes for job errors
- */
- public static enum ErrorCode {
- INTERNAL_ERROR(530),
- ACCOUNT_ERROR(531),
- ACCOUNT_RESOURCE_LIMIT_ERROR(532),
- INSUFFICIENT_CAPACITY_ERROR(533),
- RESOURCE_UNAVAILABLE_ERROR(534),
- RESOURCE_ALLOCATION_ERROR(535),
- RESOURCE_IN_USE_ERROR(536),
- NETWORK_RULE_CONFLICT_ERROR(537),
- UNKNOWN(-1);
-
- private final int code;
-
- private ErrorCode(int code) {
- this.code = code;
- }
-
- public int code() {
- return this.code;
- }
-
- public static ErrorCode fromValue(String value) {
- try {
- int errorCode = Integer.parseInt(value);
- for (ErrorCode candidate : values()) {
- if (candidate.code() == errorCode) {
- return candidate;
- }
- }
- return UNKNOWN;
-
- } catch (NumberFormatException e) {
- return UNKNOWN;
- }
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromAsyncJobError(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected AsyncJobError.ErrorCode errorCode;
- protected String errorText;
-
- /**
- * @see AsyncJobError#getErrorCode()
- */
- public T errorCode(ErrorCode errorCode) {
- this.errorCode = errorCode;
- return self();
- }
-
- /**
- * @see AsyncJobError#getErrorText()
- */
- public T errorText(String errorText) {
- this.errorText = errorText;
- return self();
- }
-
- public AsyncJobError build() {
- return new AsyncJobError(errorCode, errorText);
- }
-
- public T fromAsyncJobError(AsyncJobError in) {
- return this
- .errorCode(in.getErrorCode())
- .errorText(in.getErrorText());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final ErrorCode errorCode;
- private final String errorText;
-
- @ConstructorProperties({
- "errorcode", "errortext"
- })
- protected AsyncJobError(@Nullable ErrorCode errorCode, @Nullable String errorText) {
- this.errorCode = errorCode;
- this.errorText = errorText;
- }
-
- @Nullable
- public ErrorCode getErrorCode() {
- return this.errorCode;
- }
-
- @Nullable
- public String getErrorText() {
- return this.errorText;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(errorCode, errorText);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- AsyncJobError that = AsyncJobError.class.cast(obj);
- return Objects.equal(this.errorCode, that.errorCode)
- && Objects.equal(this.errorText, that.errorText);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("errorCode", errorCode).add("errorText", errorText);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
deleted file mode 100644
index e6e7e79..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Class Capabilities
- */
-public class Capabilities {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromCapabilities(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String cloudStackVersion;
- protected boolean securityGroupsEnabled;
- protected boolean canShareTemplates;
- protected boolean firewallRuleUiEnabled;
- protected boolean supportELB;
-
- /**
- * @see Capabilities#getCloudStackVersion()
- */
- public T cloudStackVersion(String cloudStackVersion) {
- this.cloudStackVersion = cloudStackVersion;
- return self();
- }
-
- /**
- * @see Capabilities#isSecurityGroupsEnabled()
- */
- public T securityGroupsEnabled(boolean securityGroupsEnabled) {
- this.securityGroupsEnabled = securityGroupsEnabled;
- return self();
- }
-
- /**
- * @see Capabilities#canShareTemplates()
- */
- public T canShareTemplates(boolean canShareTemplates) {
- this.canShareTemplates = canShareTemplates;
- return self();
- }
-
- /**
- * @see Capabilities#isFirewallRuleUiEnabled()
- */
- public T firewallRuleUiEnabled(boolean firewallRuleUiEnabled) {
- this.firewallRuleUiEnabled = firewallRuleUiEnabled;
- return self();
- }
-
- /**
- * @see Capabilities#isSupportELB()
- */
- public T supportELB(boolean supportELB) {
- this.supportELB = supportELB;
- return self();
- }
-
- public Capabilities build() {
- return new Capabilities(cloudStackVersion, securityGroupsEnabled, canShareTemplates, firewallRuleUiEnabled, supportELB);
- }
-
- public T fromCapabilities(Capabilities in) {
- return this
- .cloudStackVersion(in.getCloudStackVersion())
- .securityGroupsEnabled(in.isSecurityGroupsEnabled())
- .canShareTemplates(in.canShareTemplates())
- .firewallRuleUiEnabled(in.isFirewallRuleUiEnabled())
- .supportELB(in.isSupportELB());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String cloudStackVersion;
- private final boolean securityGroupsEnabled;
- private final boolean canShareTemplates;
- private final boolean firewallRuleUiEnabled;
- private final boolean supportELB;
-
- @ConstructorProperties({
- "cloudstackversion", "securitygroupsenabled", "userpublictemplateenabled", "firewallRuleUiEnabled", "supportELB"
- })
- protected Capabilities(@Nullable String cloudStackVersion, boolean securityGroupsEnabled, boolean canShareTemplates,
- boolean firewallRuleUiEnabled, boolean supportELB) {
- this.cloudStackVersion = cloudStackVersion;
- this.securityGroupsEnabled = securityGroupsEnabled;
- this.canShareTemplates = canShareTemplates;
- this.firewallRuleUiEnabled = firewallRuleUiEnabled;
- this.supportELB = supportELB;
- }
-
- /**
- * @return version of the cloud stack
- */
- @Nullable
- public String getCloudStackVersion() {
- return this.cloudStackVersion;
- }
-
- /**
- * @return true if security groups support is enabled, false otherwise
- */
- public boolean isSecurityGroupsEnabled() {
- return this.securityGroupsEnabled;
- }
-
- public boolean canShareTemplates() {
- return this.canShareTemplates;
- }
-
- /**
- * @return true if the firewall rule UI is enabled
- */
- public boolean isFirewallRuleUiEnabled() {
- return this.firewallRuleUiEnabled;
- }
-
- /**
- * @return true if region supports elastic load balancer on basic zones
- */
- public boolean isSupportELB() {
- return this.supportELB;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(cloudStackVersion, securityGroupsEnabled, canShareTemplates, firewallRuleUiEnabled, supportELB);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Capabilities that = Capabilities.class.cast(obj);
- return Objects.equal(this.cloudStackVersion, that.cloudStackVersion)
- && Objects.equal(this.securityGroupsEnabled, that.securityGroupsEnabled)
- && Objects.equal(this.canShareTemplates, that.canShareTemplates)
- && Objects.equal(this.firewallRuleUiEnabled, that.firewallRuleUiEnabled)
- && Objects.equal(this.supportELB, that.supportELB);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("cloudStackVersion", cloudStackVersion).add("securityGroupsEnabled", securityGroupsEnabled).add("canShareTemplates", canShareTemplates).add("firewallRuleUiEnabled", firewallRuleUiEnabled).add("supportELB", supportELB);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capacity.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
deleted file mode 100644
index 1e87723..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-import java.util.Map;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-
-/**
- * Information about a dimension of the capacity
- */
-public class Capacity implements Comparable<Capacity> {
-
- /**
- */
- public static enum Type {
- MEMORY_ALLOCATED_BYTES(0),
- CPU_ALLOCATED_MHZ(1),
- PRIMARY_STORAGE_USED_BYTES(2),
- PRIMARY_STORAGE_ALLOCATED_BYTES(3),
- PUBLIC_IP_ADDRESSES(4),
- PRIVATE_IP_ADDRESSES(5),
- SECONDARY_STORAGE_USED_BYTES(6),
- VLANS(7),
- DIRECT_ATTACHED_PUBLIC_IP_ADDRESSES(8),
- LOCAL_STORAGE_USED_BYTES(9),
- UNRECOGNIZED(Integer.MAX_VALUE);
-
- private int code;
-
- private static final Map<Integer, Type> INDEX = Maps.uniqueIndex(ImmutableSet.copyOf(Type.values()),
- new Function<Type, Integer>() {
-
- @Override
- public Integer apply(Type input) {
- return input.code;
- }
-
- });
-
- Type(int code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return name();
- }
-
- public static Type fromValue(String type) {
- Integer code = Integer.valueOf(checkNotNull(type, "type"));
- return INDEX.containsKey(code) ? INDEX.get(code) : UNRECOGNIZED;
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromCapacity(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected long capacityTotal;
- protected long capacityUsed;
- protected double percentUsed;
- protected String podId;
- protected String podName;
- protected Capacity.Type type;
- protected String zoneId;
- protected String zoneName;
-
- /**
- * @see Capacity#getCapacityTotal()
- */
- public T capacityTotal(long capacityTotal) {
- this.capacityTotal = capacityTotal;
- return self();
- }
-
- /**
- * @see Capacity#getCapacityUsed()
- */
- public T capacityUsed(long capacityUsed) {
- this.capacityUsed = capacityUsed;
- return self();
- }
-
- /**
- * @see Capacity#getPercentUsed()
- */
- public T percentUsed(double percentUsed) {
- this.percentUsed = percentUsed;
- return self();
- }
-
- /**
- * @see Capacity#getPodId()
- */
- public T podId(String podId) {
- this.podId = podId;
- return self();
- }
-
- /**
- * @see Capacity#getPodName()
- */
- public T podName(String podName) {
- this.podName = podName;
- return self();
- }
-
- /**
- * @see Capacity#getType()
- */
- public T type(Capacity.Type type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Capacity#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see Capacity#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- public Capacity build() {
- return new Capacity(capacityTotal, capacityUsed, percentUsed, podId, podName, type, zoneId, zoneName);
- }
-
- public T fromCapacity(Capacity in) {
- return this
- .capacityTotal(in.getCapacityTotal())
- .capacityUsed(in.getCapacityUsed())
- .percentUsed(in.getPercentUsed())
- .podId(in.getPodId())
- .podName(in.getPodName())
- .type(in.getType())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final long capacityTotal;
- private final long capacityUsed;
- private final double percentUsed;
- private final String podId;
- private final String podName;
- private final Capacity.Type type;
- private final String zoneId;
- private final String zoneName;
-
- @ConstructorProperties({
- "capacitytotal", "capacityused", "percentused", "podid", "podname", "type", "zoneid", "zonename"
- })
- protected Capacity(long capacityTotal, long capacityUsed, double percentUsed, @Nullable String podId,
- @Nullable String podName, @Nullable Capacity.Type type, @Nullable String zoneId, @Nullable String zoneName) {
- this.capacityTotal = capacityTotal;
- this.capacityUsed = capacityUsed;
- this.percentUsed = percentUsed;
- this.podId = podId;
- this.podName = podName;
- this.type = type;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- }
-
- public long getCapacityTotal() {
- return this.capacityTotal;
- }
-
- public long getCapacityUsed() {
- return this.capacityUsed;
- }
-
- public double getPercentUsed() {
- return this.percentUsed;
- }
-
- @Nullable
- public String getPodId() {
- return this.podId;
- }
-
- @Nullable
- public String getPodName() {
- return this.podName;
- }
-
- @Nullable
- public Capacity.Type getType() {
- return this.type;
- }
-
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(capacityTotal, capacityUsed, percentUsed, podId, podName, type, zoneId, zoneName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Capacity that = Capacity.class.cast(obj);
- return Objects.equal(this.capacityTotal, that.capacityTotal)
- && Objects.equal(this.capacityUsed, that.capacityUsed)
- && Objects.equal(this.percentUsed, that.percentUsed)
- && Objects.equal(this.podId, that.podId)
- && Objects.equal(this.podName, that.podName)
- && Objects.equal(this.type, that.type)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("capacityTotal", capacityTotal).add("capacityUsed", capacityUsed).add("percentUsed", percentUsed)
- .add("podId", podId).add("podName", podName).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Capacity other) {
- int comparison = this.zoneId.compareTo(other.zoneId);
- if (comparison == 0) comparison = this.podId.compareTo(other.podId);
- if (comparison == 0) Integer.valueOf(this.type.code).compareTo(other.type.code);
- return comparison;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/28833191/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Cluster.java b/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
deleted file mode 100644
index a3b75fa..0000000
--- a/dependencies/jclouds/apis/cloudstack/1.8.0-stratos/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.cloudstack.domain;
-
-import static com.google.common.base.CaseFormat.UPPER_CAMEL;
-import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.beans.ConstructorProperties;
-
-import org.jclouds.javax.annotation.Nullable;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-
-/**
- * Represents a CloudStack Cluster.
- */
-public class Cluster implements Comparable<Cluster> {
-
- /**
- */
- public static enum ManagedState {
- MANAGED,
- PREPARE_UNMANAGED,
- UNMANAGED,
- PREPARE_UNMANAGED_ERROR,
- UNRECOGNIZED;
-
- public static ManagedState fromValue(String value) {
- try {
- return valueOf(UPPER_CAMEL.to(UPPER_UNDERSCORE, value));
- } catch (IllegalArgumentException e) {
- return UNRECOGNIZED;
- }
- }
-
- @Override
- public String toString() {
- return UPPER_UNDERSCORE.to(UPPER_CAMEL, name());
- }
- }
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return new ConcreteBuilder().fromCluster(this);
- }
-
- public abstract static class Builder<T extends Builder<T>> {
- protected abstract T self();
-
- protected String id;
- protected AllocationState allocationState;
- protected Host.ClusterType clusterType;
- protected String hypervisor;
- protected Cluster.ManagedState managedState;
- protected String name;
- protected String podId;
- protected String podName;
- protected String zoneId;
- protected String zoneName;
-
- /**
- * @see Cluster#getId()
- */
- public T id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see Cluster#getAllocationState()
- */
- public T allocationState(AllocationState allocationState) {
- this.allocationState = allocationState;
- return self();
- }
-
- /**
- * @see Cluster#getClusterType()
- */
- public T clusterType(Host.ClusterType clusterType) {
- this.clusterType = clusterType;
- return self();
- }
-
- /**
- * @see Cluster#getHypervisor()
- */
- public T hypervisor(String hypervisor) {
- this.hypervisor = hypervisor;
- return self();
- }
-
- /**
- * @see Cluster#getManagedState()
- */
- public T managedState(Cluster.ManagedState managedState) {
- this.managedState = managedState;
- return self();
- }
-
- /**
- * @see Cluster#getName()
- */
- public T name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see Cluster#getPodId()
- */
- public T podId(String podId) {
- this.podId = podId;
- return self();
- }
-
- /**
- * @see Cluster#getPodName()
- */
- public T podName(String podName) {
- this.podName = podName;
- return self();
- }
-
- /**
- * @see Cluster#getZoneId()
- */
- public T zoneId(String zoneId) {
- this.zoneId = zoneId;
- return self();
- }
-
- /**
- * @see Cluster#getZoneName()
- */
- public T zoneName(String zoneName) {
- this.zoneName = zoneName;
- return self();
- }
-
- public Cluster build() {
- return new Cluster(id, allocationState, clusterType, hypervisor, managedState, name, podId, podName, zoneId, zoneName);
- }
-
- public T fromCluster(Cluster in) {
- return this
- .id(in.getId())
- .allocationState(in.getAllocationState())
- .clusterType(in.getClusterType())
- .hypervisor(in.getHypervisor())
- .managedState(in.getManagedState())
- .name(in.getName())
- .podId(in.getPodId())
- .podName(in.getPodName())
- .zoneId(in.getZoneId())
- .zoneName(in.getZoneName());
- }
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- @Override
- protected ConcreteBuilder self() {
- return this;
- }
- }
-
- private final String id;
- private final AllocationState allocationState;
- private final Host.ClusterType clusterType;
- private final String hypervisor;
- private final Cluster.ManagedState managedState;
- private final String name;
- private final String podId;
- private final String podName;
- private final String zoneId;
- private final String zoneName;
-
- @ConstructorProperties({
- "id", "allocationstate", "clustertype", "hypervisortype", "managedstate", "name", "podid", "podname", "zoneid", "zonename"
- })
- protected Cluster(String id, @Nullable AllocationState allocationState, @Nullable Host.ClusterType clusterType,
- @Nullable String hypervisor, @Nullable Cluster.ManagedState managedState, @Nullable String name,
- @Nullable String podId, @Nullable String podName, @Nullable String zoneId, @Nullable String zoneName) {
- this.id = checkNotNull(id, "id");
- this.allocationState = allocationState;
- this.clusterType = clusterType;
- this.hypervisor = hypervisor;
- this.managedState = managedState;
- this.name = name;
- this.podId = podId;
- this.podName = podName;
- this.zoneId = zoneId;
- this.zoneName = zoneName;
- }
-
- public String getId() {
- return this.id;
- }
-
- @Nullable
- public AllocationState getAllocationState() {
- return this.allocationState;
- }
-
- @Nullable
- public Host.ClusterType getClusterType() {
- return this.clusterType;
- }
-
- @Nullable
- public String getHypervisor() {
- return this.hypervisor;
- }
-
- @Nullable
- public Cluster.ManagedState getManagedState() {
- return this.managedState;
- }
-
- @Nullable
- public String getName() {
- return this.name;
- }
-
- @Nullable
- public String getPodId() {
- return this.podId;
- }
-
- @Nullable
- public String getPodName() {
- return this.podName;
- }
-
- @Nullable
- public String getZoneId() {
- return this.zoneId;
- }
-
- @Nullable
- public String getZoneName() {
- return this.zoneName;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, allocationState, clusterType, hypervisor, managedState, name, podId, podName, zoneId, zoneName);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null || getClass() != obj.getClass()) return false;
- Cluster that = Cluster.class.cast(obj);
- return Objects.equal(this.id, that.id)
- && Objects.equal(this.allocationState, that.allocationState)
- && Objects.equal(this.clusterType, that.clusterType)
- && Objects.equal(this.hypervisor, that.hypervisor)
- && Objects.equal(this.managedState, that.managedState)
- && Objects.equal(this.name, that.name)
- && Objects.equal(this.podId, that.podId)
- && Objects.equal(this.podName, that.podName)
- && Objects.equal(this.zoneId, that.zoneId)
- && Objects.equal(this.zoneName, that.zoneName);
- }
-
- protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
- .add("id", id).add("allocationState", allocationState).add("clusterType", clusterType).add("hypervisor", hypervisor)
- .add("managedState", managedState).add("name", name).add("podId", podId).add("podName", podName).add("zoneId", zoneId).add("zoneName", zoneName);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- @Override
- public int compareTo(Cluster other) {
- return this.id.compareTo(other.id);
- }
-}