From ed1980c7417216efa541c978d4233391d1659b79 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Wed, 12 Jun 2013 03:09:01 -0400 Subject: [PATCH 01/36] Retrying the SSH connection for verifying RR load balancing Attempt multiple-ssh connections to ensure the loadbalancing is going as per round robin policy. Signed-off-by: Prasanna Santhanam --- test/integration/smoke/test_network.py | 373 ++++++++++--------------- 1 file changed, 151 insertions(+), 222 deletions(-) diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py index 1c867fa0422..a75ffeb8953 100644 --- a/test/integration/smoke/test_network.py +++ b/test/integration/smoke/test_network.py @@ -664,6 +664,32 @@ class TestLoadBalancingRule(cloudstackTestCase): cleanup_resources(cls.api_client, cls._cleanup) return + def try_ssh(self, src_nat_ip_addr, hostnames): + try: + self.debug( + "SSH into VM (IPaddress: %s) & NAT Rule (Public IP: %s)" % + (self.vm_1.ipaddress, src_nat_ip_addr.ipaddress) + ) + + ssh_1 = remoteSSHClient( + src_nat_ip_addr.ipaddress, + self.services['lbrule']["publicport"], + self.vm_1.username, + self.vm_1.password + ) + + # If Round Robin Algorithm is chosen, + # each ssh command should alternate between VMs + # hostnames = [ssh_1.execute("hostname")[0]] + hostnames.append(ssh_1.execute("hostname")[0]) + + except Exception as e: + self.fail("%s: SSH failed for VM with IP Address: %s" % + (e, src_nat_ip_addr.ipaddress)) + + time.sleep(self.services["lb_switch_wait"]) + return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_01_create_lb_rule_src_nat(self): """Test to create Load balancing rule with source NAT""" @@ -776,62 +802,33 @@ class TestLoadBalancingRule(cloudstackTestCase): [self.vm_1.id, self.vm_2.id], "Check List Load Balancer instances Rules returns valid VM ID" ) - try: - self.debug( - "SSH into VM (IPaddress: %s) & NAT Rule (Public IP: %s)" % - (self.vm_1.ipaddress, src_nat_ip_addr.ipaddress) - ) - ssh_1 = remoteSSHClient( - src_nat_ip_addr.ipaddress, - self.services['lbrule']["publicport"], - self.vm_1.username, - self.vm_1.password - ) - # If Round Robin Algorithm is chosen, - # each ssh command should alternate between VMs - hostnames = [ssh_1.execute("hostname")[0]] - except Exception as e: - self.fail("%s: SSH failed for VM with IP Address: %s" % - (e, src_nat_ip_addr.ipaddress)) + hostnames = [] + self.try_ssh(src_nat_ip_addr, hostnames) + self.try_ssh(src_nat_ip_addr, hostnames) + self.try_ssh(src_nat_ip_addr, hostnames) + self.try_ssh(src_nat_ip_addr, hostnames) + self.try_ssh(src_nat_ip_addr, hostnames) - time.sleep(self.services["lb_switch_wait"]) - - try: - self.debug("SSHing into IP address: %s after adding VMs (ID: %s , %s)" % - ( - src_nat_ip_addr.ipaddress, - self.vm_1.id, - self.vm_2.id - )) - - ssh_2 = remoteSSHClient( - src_nat_ip_addr.ipaddress, - self.services['lbrule']["publicport"], - self.vm_1.username, - self.vm_1.password - ) - hostnames.append(ssh_2.execute("hostname")[0]) - - except Exception as e: - self.fail("%s: SSH failed for VM with IP Address: %s" % - (e, src_nat_ip_addr.ipaddress)) - - self.debug("Hostnames: %s" % str(hostnames)) - self.assertIn( - self.vm_1.name, - hostnames, - "Check if ssh succeeded for server1" - ) - self.assertIn( - self.vm_2.name, - hostnames, - "Check if ssh succeeded for server2" - ) + self.debug("Hostnames: %s" % str(hostnames)) + self.assertIn( + self.vm_1.name, + hostnames, + "Check if ssh succeeded for server1" + ) + self.assertIn( + self.vm_2.name, + hostnames, + "Check if ssh succeeded for server2" + ) #SSH should pass till there is a last VM associated with LB rule lb_rule.remove(self.apiclient, [self.vm_2]) + + # making hostnames list empty + hostnames[:] = [] + try: self.debug("SSHing into IP address: %s after removing VM (ID: %s)" % ( @@ -839,25 +836,18 @@ class TestLoadBalancingRule(cloudstackTestCase): self.vm_2.id )) - ssh_1 = remoteSSHClient( - src_nat_ip_addr.ipaddress, - self.services['lbrule']["publicport"], - self.vm_1.username, - self.vm_1.password - ) + self.try_ssh(src_nat_ip_addr, hostnames) - hostnames.append(ssh_1.execute("hostname")[0]) - - except Exception as e: - self.fail("%s: SSH failed for VM with IP Address: %s" % - (e, src_nat_ip_addr.ipaddress)) - - self.assertIn( + self.assertIn( self.vm_1.name, hostnames, "Check if ssh succeeded for server1" ) + except Exception as e: + self.fail("%s: SSH failed for VM with IP Address: %s" % + (e, src_nat_ip_addr.ipaddress)) + lb_rule.remove(self.apiclient, [self.vm_1]) with self.assertRaises(Exception): @@ -967,50 +957,24 @@ class TestLoadBalancingRule(cloudstackTestCase): "Check List Load Balancer instances Rules returns valid VM ID" ) try: - self.debug("SSHing into IP address: %s after adding VMs (ID: %s , %s)" % - ( - self.non_src_nat_ip.ipaddress.ipaddress, - self.vm_1.id, - self.vm_2.id - )) - ssh_1 = remoteSSHClient( - self.non_src_nat_ip.ipaddress.ipaddress, - self.services['lbrule']["publicport"], - self.vm_1.username, - self.vm_1.password - ) + hostnames = [] + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) - # If Round Robin Algorithm is chosen, - # each ssh command should alternate between VMs - hostnames = [ssh_1.execute("hostname")[0]] - - time.sleep(self.services["lb_switch_wait"]) - - self.debug("SSHing again into IP address: %s with VMs (ID: %s , %s) added to LB rule" % - ( - self.non_src_nat_ip.ipaddress.ipaddress, - self.vm_1.id, - self.vm_2.id - )) - ssh_2 = remoteSSHClient( - self.non_src_nat_ip.ipaddress.ipaddress, - self.services['lbrule']["publicport"], - self.vm_1.username, - self.vm_1.password - ) - - hostnames.append(ssh_2.execute("hostname")[0]) - self.debug("Hostnames after adding 2 VMs to LB rule: %s" % str(hostnames)) - self.assertIn( + self.debug("Hostnames: %s" % str(hostnames)) + self.assertIn( self.vm_1.name, hostnames, "Check if ssh succeeded for server1" - ) - self.assertIn( + ) + self.assertIn( self.vm_2.name, hostnames, "Check if ssh succeeded for server2" - ) + ) #SSH should pass till there is a last VM associated with LB rule lb_rule.remove(self.apiclient, [self.vm_2]) @@ -1020,25 +984,23 @@ class TestLoadBalancingRule(cloudstackTestCase): self.non_src_nat_ip.ipaddress.ipaddress, self.vm_2.id )) - ssh_1 = remoteSSHClient( - self.non_src_nat_ip.ipaddress.ipaddress, - self.services['lbrule']["publicport"], - self.vm_1.username, - self.vm_1.password - ) + # Making host list empty + hostnames[:] = [] + + self.try_ssh(self.non_src_nat_ip, hostnames) + + self.assertIn( + self.vm_1.name, + hostnames, + "Check if ssh succeeded for server1" + ) - hostnames.append(ssh_1.execute("hostname")[0]) self.debug("Hostnames after removing VM2: %s" % str(hostnames)) + except Exception as e: self.fail("%s: SSH failed for VM with IP Address: %s" % (e, self.non_src_nat_ip.ipaddress.ipaddress)) - self.assertIn( - self.vm_1.name, - hostnames, - "Check if ssh succeeded for server1" - ) - lb_rule.remove(self.apiclient, [self.vm_1]) with self.assertRaises(Exception): self.debug("SSHing into IP address: %s after removing VM (ID: %s) from LB rule" % @@ -1209,7 +1171,7 @@ class TestRebootRouter(cloudstackTestCase): except Exception as e: self.fail( "SSH Access failed for %s: %s" % \ - (self.nat_rule.ipaddress.ipaddress, e)) + (self.vm_1.ipaddress, e)) return def tearDown(self): @@ -1277,6 +1239,36 @@ class TestAssignRemoveLB(cloudstackTestCase): ] return + def tearDown(self): + cleanup_resources(self.apiclient, self.cleanup) + return + + def try_ssh(self, src_nat_ip_addr, hostnames): + try: + self.debug( + "SSH into VM (IPaddress: %s) & NAT Rule (Public IP: %s)" % + (self.vm_1.ipaddress, src_nat_ip_addr.ipaddress) + ) + + ssh_1 = remoteSSHClient( + src_nat_ip_addr.ipaddress, + self.services['lbrule']["publicport"], + self.vm_1.username, + self.vm_1.password + ) + + # If Round Robin Algorithm is chosen, + # each ssh command should alternate between VMs + # hostnames = [ssh_1.execute("hostname")[0]] + hostnames.append(ssh_1.execute("hostname")[0]) + + except Exception as e: + self.fail("%s: SSH failed for VM with IP Address: %s" % + (e, src_nat_ip_addr.ipaddress)) + + time.sleep(self.services["lb_switch_wait"]) + return + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_assign_and_removal_lb(self): """Test for assign & removing load balancing rule""" @@ -1344,137 +1336,74 @@ class TestAssignRemoveLB(cloudstackTestCase): ) lb_rule.assign(self.apiclient, [self.vm_1, self.vm_2]) - try: - self.debug("SSHing into IP address: %s with VMs (ID: %s , %s) added to LB rule" % - ( - self.non_src_nat_ip.ipaddress, - self.vm_1.id, - self.vm_2.id - )) - #Create SSH client for each VM - ssh_1 = remoteSSHClient( - self.non_src_nat_ip.ipaddress, - self.services["lbrule"]["publicport"], - self.vm_1.username, - self.vm_1.password - ) - except Exception as e: - self.fail("SSH failed for VM with IP: %s" % - self.non_src_nat_ip.ipaddress) + hostnames = [] + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) - try: - self.debug("SSHing again into IP address: %s with VMs (ID: %s , %s) added to LB rule" % - ( - self.non_src_nat_ip.ipaddress, - self.vm_1.id, - self.vm_2.id - )) - ssh_2 = remoteSSHClient( - self.non_src_nat_ip.ipaddress, - self.services["lbrule"]["publicport"], - self.vm_2.username, - self.vm_2.password - ) + self.debug("Hostnames: %s" % str(hostnames)) + self.assertIn( + self.vm_1.name, + hostnames, + "Check if ssh succeeded for server1" + ) + self.assertIn( + self.vm_2.name, + hostnames, + "Check if ssh succeeded for server2" + ) - # If Round Robin Algorithm is chosen, - # each ssh command should alternate between VMs - res_1 = ssh_1.execute("hostname")[0] - self.debug(res_1) - - time.sleep(self.services["lb_switch_wait"]) - - res_2 = ssh_2.execute("hostname")[0] - self.debug(res_2) - - except Exception as e: - self.fail("SSH failed for VM with IP: %s" % - self.non_src_nat_ip.ipaddress) - - self.assertIn( - self.vm_1.name, - res_1, - "Check if ssh succeeded for server1" - ) - self.assertIn( - self.vm_2.name, - res_2, - "Check if ssh succeeded for server2" - ) #Removing VM and assigning another VM to LB rule lb_rule.remove(self.apiclient, [self.vm_2]) + # making hostnames list empty + hostnames[:] = [] + try: self.debug("SSHing again into IP address: %s with VM (ID: %s) added to LB rule" % ( self.non_src_nat_ip.ipaddress, self.vm_1.id, )) - # Again make a SSH connection, as previous is not used after LB remove - ssh_1 = remoteSSHClient( - self.non_src_nat_ip.ipaddress, - self.services["lbrule"]["publicport"], - self.vm_1.username, - self.vm_1.password - ) - res_1 = ssh_1.execute("hostname")[0] - self.debug(res_1) + self.try_ssh(self.non_src_nat_ip, hostnames) + + self.assertIn( + self.vm_1.name, + hostnames, + "Check if ssh succeeded for server1" + ) except Exception as e: self.fail("SSH failed for VM with IP: %s" % self.non_src_nat_ip.ipaddress) - self.assertIn( - self.vm_1.name, - res_1, - "Check if ssh succeeded for server1" - ) - lb_rule.assign(self.apiclient, [self.vm_3]) - try: - ssh_1 = remoteSSHClient( - self.non_src_nat_ip.ipaddress, - self.services["lbrule"]["publicport"], - self.vm_1.username, - self.vm_1.password - ) - ssh_3 = remoteSSHClient( - self.non_src_nat_ip.ipaddress, - self.services["lbrule"]["publicport"], - self.vm_3.username, - self.vm_3.password - ) + # Making hostnames list empty + hostnames[:] = [] - res_1 = ssh_1.execute("hostname")[0] - self.debug(res_1) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip, hostnames) - time.sleep(self.services["lb_switch_wait"]) - - res_3 = ssh_3.execute("hostname")[0] - self.debug(res_3) - - except Exception as e: - self.fail("SSH failed for VM with IP: %s" % - self.non_src_nat_ip.ipaddress) - - self.assertIn( - self.vm_1.name, - res_1, - "Check if ssh succeeded for server1" - ) - self.assertIn( - self.vm_3.name, - res_3, - "Check if ssh succeeded for server3" - ) + self.debug("Hostnames: %s" % str(hostnames)) + self.assertIn( + self.vm_1.name, + hostnames, + "Check if ssh succeeded for server1" + ) + self.assertIn( + self.vm_3.name, + hostnames, + "Check if ssh succeeded for server3" + ) return - def tearDown(self): - cleanup_resources(self.apiclient, self.cleanup) - return - - class TestReleaseIP(cloudstackTestCase): def setUp(self): From 5ee38b79aec99e5b73b431edd65c123648f7acd7 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Thu, 13 Jun 2013 14:02:13 -0400 Subject: [PATCH 02/36] Branding - moving the CloudStack logo in the apidocs to a properly apache-ified logo with TM symbol --- tools/apidoc/images/cloudstack.png | Bin 3893 -> 8575 bytes tools/apidoc/includes/main.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/apidoc/images/cloudstack.png b/tools/apidoc/images/cloudstack.png index cc3c9d7d3423e4b59bbf260483d1911fda3ad2b2..2f3d899701af93ab9ca39ef6baf7a41103b709fd 100644 GIT binary patch literal 8575 zcmZ{KWmHt}7w(}`x;rJMyBP-Q6p-#lLg^mKp*y9eJEWvWB?Lx7N*duucQ@SefA813 z*P1$OX0LbNbM}5>pBQaTr5D&#*Z=^$P*Dc!0sxXX;ypJeI^sDOhg|{jg6auU(ZfVU z5T-2@@fpiQ*~k-dc;VjzX;KH;jyOo^rD*8&#@*h_*Xn~E;Opzllf~}`pI}Tt<1BkJqv}i>2B~Y6{x=+!G)QJ#r5=HpWok~( z%K4BwNT6lT)}H9ysC#Gu+c-+#^7X;xQR~WO@9|6fsNvP5uV23kna%a-vxxpVyxLuL zihlaWZZdaZTdw+9DD|v*WY8ZNmaVb9iHV8Rh%w((e#*|y&XdaqE%*2L|A+eh?D_~26Ehs6 zF?=`srjmoyHTT}m_g%R>`GH?Zh`FPtaTynb$R|s#h5Uh}#hem149Go2{NRa!VB(p0%|*TV z-;&O>`e}Wanv$RkVc*uWfG|LM9PWwK3&Et%`M(P*q_96gaTJ4vqO0eB{a-@bubM}B zd3msk!jQc=??*2C5H~G!dVNwhtE8Lz#zSf+hRU|7Fd6&Xm@m%1M%j{_j>mo6 zLJxm@yldy!-U%B+>Ng783`w2-ZSU&tZ#@!$@;GlG(6QHEPNPmZFA;MJra&$yOHiC@ z?w;)GEZn-N4REZexNi{}CWh_`y*wLba5a(fgdaUs%2FPEb=f`s{`?^IFgJY6E^wu0 zX12^=Hn&YYsSlT;gJCN6grYPi

^|(Tp<>zPRv{N&tA`y2s#lc+sCl9@Y&<-~&L^ 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 D&=FOE literal 3893 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 diff --git a/tools/apidoc/includes/main.css b/tools/apidoc/includes/main.css index a8fa348065b..1c3baa871db 100644 --- a/tools/apidoc/includes/main.css +++ b/tools/apidoc/includes/main.css @@ -239,7 +239,7 @@ a:hover.insdownload_button { a.cloud_logo { - width:300px; + width:373px; height:51px; float:left; background:url(../images/cloudstack.png) no-repeat top left; From 3707f70812bbada2d6278d0185a2862c9b551965 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Thu, 13 Jun 2013 13:30:21 -0400 Subject: [PATCH 03/36] removing unsused logos --- tools/apidoc/images/ins_buttonshadow.gif | Bin 1683 -> 0 bytes tools/apidoc/images/insdownload_button.gif | Bin 2531 -> 0 bytes tools/apidoc/images/insdownload_button_hover.gif | Bin 2569 -> 0 bytes tools/apidoc/images/insjoincomm_button.gif | Bin 2627 -> 0 bytes tools/apidoc/images/insjoincomm_button_hover.gif | Bin 2620 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tools/apidoc/images/ins_buttonshadow.gif delete mode 100644 tools/apidoc/images/insdownload_button.gif delete mode 100644 tools/apidoc/images/insdownload_button_hover.gif delete mode 100644 tools/apidoc/images/insjoincomm_button.gif delete mode 100644 tools/apidoc/images/insjoincomm_button_hover.gif diff --git a/tools/apidoc/images/ins_buttonshadow.gif b/tools/apidoc/images/ins_buttonshadow.gif deleted file mode 100644 index ac34ec859c9870a61b8590da4a512b2083794ecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1683 zcmV;E25k99Nk%w1VNd}M0M!5h{QUg*`1t$#`|$Aa^z`)i_xJVn_4fAm^78WP>gw$5 z?C$RF+S=Os`ufn&(CO*v+A9H@#f~{+}zyZ;o;)q;_dD2;Nal%^Yi57(b3V@*Vo(I+uhyW)6>(= z&d$op%GA`<*4Ea{%*@Zv&&9>X&CSim#>T|N#K_3V$H&J200000000000000000000 z00000A^8LV00000EC2ui08jxA000L6K!9*aEEgbV{vSuh>RIpzV6U z;IMey3;dq<(pLV{~kCMgmEyW?Fcqd!hx228W%N8NI%}2*DD;!V<>E#{F?p}^a|P6)cMrU&CCAF z$dC~mh~Ss6N}V1ZvQ^*@Dl%oHK+IFi)}mdJd=U)zkC_L33$n43_b!3SlL;QET>0RG z%aB9HQ|5po0sB$ijgy5NINRF!-0ke)^?m8fdg(R#|+GxrfwHKk0=5t)y$HPmZw4Kw7cZ@xD4>+iod?7Q#1_Rfm~yzeFo z=(;E9c_*DMWV&I5ABI}uiKUu~s%S87CgY4G_{P{#vudEDakqZ(09f{1uz-+6N|H;k z4Fw>GE|TPhz<1DKLyogBVVRyzh*{v}m)DBPnYP<@ke|0{5-9Gc5OQknr4Y+$r@9RH zDQKc#hb^|kfp*=e!y5LXjIv8A5&=TdjOaXEr9&qnW8+#{WevHHivR{UC)J z#xDEpwAa4>>4dI>XtAhplbZ2<8*^;;-MF=?H>|PBilfPX8^_hkf@AY?;nB%Fvs-+e zLKh;8IR1Ds{y-CwNR>NlWzbm_rsbAJw|DfH*0wsI(zR(O8|kmLW;%=f_wWDzz|&s` zU?V)))Q2-4lb>!PQ?14*#y3XmlB|@c0SHu31U=DFt*|l^Tz!Qc7XZ>UoTCi1WW;)m zxP`E?=MX*E>}E`I!~qCk0E7IZ7{dr3l%nyGX1Hv8Aq=8D%CQX}eI+F;8%#`Y#l)D{ z3QJX~Rjp_x0t;FZDmRi~1dTQ_3-soTy?IXD6KTgQkpV3(DP&}zp^rwkS8qOP)9w!agUIcMRI)XW3P4zkX{Mo zdj$CfTRd?+nlVHWh)kw3OVN;HzVMie#6=?;c?n3S<(k;U;UtaGk#2hPo8SzmILCRG dZK5Tc=!}jHFEPzVegc~CL}tyFNsAx=06VJEaGwAG diff --git a/tools/apidoc/images/insdownload_button.gif b/tools/apidoc/images/insdownload_button.gif deleted file mode 100644 index eb5cb5e700fdd6fa146fabbb76a281a836a10d56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2531 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 SBkxP9-lEy0-!K@2&Hn-BBw)S( diff --git a/tools/apidoc/images/insjoincomm_button.gif b/tools/apidoc/images/insjoincomm_button.gif deleted file mode 100644 index f149c8506c195e295543c730455dcb9d75e109b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2627 zcmV-J3cU44Nk%w1VW|Kh0QUd@4J9)>WqdwqfkADBifHXQiQd3mO&e8Vw_>7EP%gP7o~5qh>`H}^sv0c`TF{*ud;cOoz&UeTXcd! zM@mm&Yq-J2c88F4fr-)4(G)E^9Xw5xpQT}HZ(?F%5i2@5OjkEIH*9QdHCSur>g>zW z)DI^$wzjrrb$;96;}aAWrlzJFIZ3a&!T9<5VR3rH%h31u`8Q8pJWpDQm!IJ0>vDmK zU2=Vcke1om*$D~?aes$BafN@5myMvRgQ2l=fQS40{Ar7xy2#M-^76pX*MEzXij|vX zdxnRSm}Yl?X^o+AeuZRhb3;QznV+ISNKKQTr0DDHhL)a1S7JkLgg9JqqNJp?!^$;f zc)rESZ*z1tNmVLKU07sl$IH!mhK`}O!mX{Xf|Q&%X?=f+k&Kz45GOUj!o%R><&~tX zB`GWC>gy2^5jt&wJVHiiXJ>7HiEn&^H(hgIUth7bwvwr~J!N|6=;<6C9h8)mVq;`` zdwV`VK9QWGA^8LV00000EC2ui0I2{V000R80K*6r7zan4Q0M?CT*$DY!-o(fN}Ncs zqQ#3CGdjG(@eVjz8bgX4NwTC#j8jr7+obSRs8r#kF_=lSrp=o;bL!m5v!~CWK!Xac znKIbIEVm3OUCOkn)2C3QN}Wozs@1DlvqDXSV_~%e1j33POSY`pvuM+*UCXwu+qZDh z=F6hc(t*2p^XlEpx3Ay7fCCF2Ot`RNz2-bsVz+8n6@}dzNS;i&vgON|Gi%<=xwGfb zphHtW=4{IT2NH)nM z4ilKMO%!iT(2kQ>W~t?nQJAu$97b;GV=7xHf(RB#q^V{Sn`}bCn{dV{ClM16A?KZV z=2<5Nbmr+NoGpkD=OlanY3QMd<|)D?iQdVEB3w8T#H5r?>Vpp+WUA?=oYF}|rcJak z0SG{3N`(lS<^Ti}qvpV=2O>=W07(~ghAJx+ngSte3r)OA#RR=-+DI4YfGR4fnu^dx ztRgg$!>FZtpem~^P|<~mOqhzQwyCb#YNlPdnga+es2Z&YO~~=;tI-gGML$BsD{s6y z=285A+XB+ zxQ8G^?#Ay9{O`o$PJHhnL?6N{6YMTS^~&QOeD1+-FGC32|DHSs&0~;!`OS}S{_)=z ze>?_^fFBDW*(=Wv9AD(G$plN}PX`^G;KT+7NWcOPa0CaO00I?QKn0Fq0s{BmAo(FkOiz!Bs~Nl##-44AaS1bTqU|8d}xpbRA_!7u?8aG(?*_@oLz z5CaZq!3!_oKny1E$rqTimbVP$1i&CmT7Ghtwe&(Ok01*-h>`=OG=Uam2?8S^fdi{- zQI>mbW|{)sYGkqftIqgo&2Q4 z1Y`=*f6jsgYLJ3b6Oo1q6hjbFxPVlrO4X{)!3IO9Y7J~qgQ|M)2Oo}r z3}|431uVEn09MT67Q6VxFpjZ|XH4T7+xW&f&asYbtPK!=01)D^h5&|4!;cms}1Mqu3V17=V_y%;he7`O9DqvzW(B<}#c4%xF$?nBQS#6br*3 l7{Fi#0_IHTI@|fqc+Rt)_sr)$`}xm+4z!@}+>3w!06W7|6?Oms diff --git a/tools/apidoc/images/insjoincomm_button_hover.gif b/tools/apidoc/images/insjoincomm_button_hover.gif deleted file mode 100644 index 74df0a60e64a76c6151d51cf524a493d467230e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2620 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 From ef4c342d5cae82f711577f95de28068bcf1a7a98 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Thu, 13 Jun 2013 14:22:01 -0400 Subject: [PATCH 04/36] updating copyright year and mark text --- tools/apidoc/generateadmincommands.xsl | 6 +++--- tools/apidoc/generatecommand.xsl | 4 ++-- tools/apidoc/generatedomainadmincommands.xsl | 4 ++-- tools/apidoc/generatetoc_footer.xsl | 4 ++-- tools/apidoc/generateusercommands.xsl | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl index a33e7baf20d..9abec10a4fb 100644 --- a/tools/apidoc/generateadmincommands.xsl +++ b/tools/apidoc/generateadmincommands.xsl @@ -150,10 +150,10 @@ version="1.0">

+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.

+ diff --git a/tools/apidoc/generatecommand.xsl b/tools/apidoc/generatecommand.xsl index b665cf36f7d..965a3a334d1 100644 --- a/tools/apidoc/generatecommand.xsl +++ b/tools/apidoc/generatecommand.xsl @@ -179,9 +179,9 @@ version="1.0">
  • Contacts
    • -

    Copyright © 2012 The Apache Software Foundation, Licensed under the +

    Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    - Apache and the Apache feather logo are trademarks of The Apache Software Foundation.

    + Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.

    diff --git a/tools/apidoc/generatedomainadmincommands.xsl b/tools/apidoc/generatedomainadmincommands.xsl index 7f5321cc06e..7238f05369f 100644 --- a/tools/apidoc/generatedomainadmincommands.xsl +++ b/tools/apidoc/generatedomainadmincommands.xsl @@ -144,9 +144,9 @@ version="1.0"> diff --git a/tools/apidoc/generatetoc_footer.xsl b/tools/apidoc/generatetoc_footer.xsl index cf6dbc4c7b3..93a86671084 100644 --- a/tools/apidoc/generatetoc_footer.xsl +++ b/tools/apidoc/generatetoc_footer.xsl @@ -26,9 +26,9 @@ under the License. diff --git a/tools/apidoc/generateusercommands.xsl b/tools/apidoc/generateusercommands.xsl index e884ab13ac3..4fa1f867fe5 100644 --- a/tools/apidoc/generateusercommands.xsl +++ b/tools/apidoc/generateusercommands.xsl @@ -142,9 +142,9 @@ version="1.0"> From c37d3d818c4159bac7c5730daa66e2a3a17b4e7a Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 13 Jun 2013 12:58:16 -0700 Subject: [PATCH 05/36] VPC UI / Internal LB: Fix typo --- ui/scripts/vpc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 399699d3948..39c258c50a4 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -761,7 +761,7 @@ } }); }, - notificaton: { + notification: { poll: pollAsyncJobResult } } From 643b3b506673fc06e1570a898144f27d81549344 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 13 Jun 2013 13:54:50 -0700 Subject: [PATCH 06/36] CLOUDSTACK-2870: UI - Infrastructure menu - add guest network dialog - change label for isolatedvlanid property. --- ui/scripts/system.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index f853ed53f7e..f37f6026e65 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1340,7 +1340,7 @@ docID: 'helpGuestNetworkZoneVLANID' }, isolatedpvlanId: { - label: 'Private VLAN ID' + label: 'Secondary Isolated VLAN ID' }, scope: { From bf73d755b04e6550b517345de59a8ccd95b86bce Mon Sep 17 00:00:00 2001 From: Fang Wang Date: Fri, 10 May 2013 13:01:47 -0700 Subject: [PATCH 07/36] Add protection for VNC port with password on KVM. --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index bab53bcd68c..f90edd863e5 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3300,7 +3300,9 @@ ServerResource { ConsoleDef console = new ConsoleDef("pty", null, null, (short) 0); devices.addDevice(console); - GraphicDef grap = new GraphicDef("vnc", (short) 0, true, null, null, + //add the VNC port passwd here, get the passwd from the vmInstance. + String passwd = vmTO.getVncPassword(); + GraphicDef grap = new GraphicDef("vnc", (short) 0, true, null, passwd, null); devices.addDevice(grap); From 26306252604ff3fcfbdd3fb3a4a44180359de50d Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 13 Jun 2013 14:58:32 -0700 Subject: [PATCH 08/36] CLOUDSTACK-2360: UI - Infrastructure menu - zone detail - physical network - network service providers - Netscaler - view devices - device detail page - add GSLB Provider enabled or not, GSLB Provider Public IP, GSLB Provider Private IP field. --- ui/scripts/system.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index f37f6026e65..df37f31d5fe 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7899,7 +7899,13 @@ lbdevicededicated: { label: 'label.dedicated', converter: cloudStack.converters.toBooleanText - } + }, + gslbprovider: { + label: 'GSLB service', + converter: cloudStack.converters.toBooleanText + }, + gslbproviderpublicip: { label: 'GSLB service Public IP' }, + gslbproviderprivateip: { label: 'GSLB service Private IP' } } ], dataProvider: function(args) { From fbe6b273e3112ce53b24d7a5db6be95b1bd8d5ae Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 13 Jun 2013 14:57:47 -0700 Subject: [PATCH 09/36] CLOUDSTACK-1170: Redundant Router: Ensure MACs are same on other than first public nic --- .../VirtualNetworkApplianceManagerImpl.java | 19 ++++++++++++++++++- utils/src/com/cloud/utils/net/NetUtils.java | 9 +++++++++ .../com/cloud/utils/net/NetUtilsTest.java | 13 +++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index db4786a7c7e..01f86ece310 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3144,6 +3144,16 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V vlanIpMap.put(vlanTag, ipList); } + List nics = _nicDao.listByVmId(router.getId()); + String baseMac = null; + for (NicVO nic : nics) { + NetworkVO nw = _networkDao.findById(nic.getNetworkId()); + if (nw.getTrafficType() == TrafficType.Public) { + baseMac = nic.getMacAddress(); + break; + } + } + for (Map.Entry> vlanAndIp : vlanIpMap.entrySet()) { List ipAddrList = vlanAndIp.getValue(); // Source nat ip address should always be sent first @@ -3175,7 +3185,14 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V String vlanId = ipAddr.getVlanTag(); String vlanGateway = ipAddr.getGateway(); String vlanNetmask = ipAddr.getNetmask(); - String vifMacAddress = ipAddr.getMacAddress(); + String vifMacAddress = null; + // For non-source nat IP, set the mac to be something based on first public nic's MAC + // We cannot depends on first ip because we need to deal with first ip of other nics + if (!ipAddr.isSourceNat() && ipAddr.getVlanId() != 0) { + vifMacAddress = NetUtils.generateMacOnIncrease(baseMac, ipAddr.getVlanId()); + } else { + vifMacAddress = ipAddr.getMacAddress(); + } IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, firstIP, sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, networkRate, ipAddr.isOneToOneNat()); diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java index ec0ff05fce8..5c13454da79 100755 --- a/utils/src/com/cloud/utils/net/NetUtils.java +++ b/utils/src/com/cloud/utils/net/NetUtils.java @@ -1394,4 +1394,13 @@ public class NetUtils { return null; } + public static String generateMacOnIncrease(String baseMac, long l) { + long mac = mac2Long(baseMac); + if (l > 0xFFFFl) { + return null; + } + mac = mac + (l << 24); + mac = mac & 0x06FFFFFFFFFFl; + return long2Mac(mac); + } } diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java index 9952d3cd864..38fe21d5324 100644 --- a/utils/test/com/cloud/utils/net/NetUtilsTest.java +++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java @@ -155,4 +155,17 @@ public class NetUtilsTest extends TestCase { //Check for Incorrect format of CIDR assertFalse(NetUtils.isSameIpRange(cidrFirst, "10.3.6.5/50")); } + + public void testMacGenerateion() { + String mac = "06:01:23:00:45:67"; + String newMac = NetUtils.generateMacOnIncrease(mac, 2); + assertTrue(newMac.equals("06:01:25:00:45:67")); + newMac = NetUtils.generateMacOnIncrease(mac, 16); + assertTrue(newMac.equals("06:01:33:00:45:67")); + mac = "06:ff:ff:00:45:67"; + newMac = NetUtils.generateMacOnIncrease(mac, 1); + assertTrue(newMac.equals("06:00:00:00:45:67")); + newMac = NetUtils.generateMacOnIncrease(mac, 16); + assertTrue(newMac.equals("06:00:0f:00:45:67")); + } } From 5a8a2a259ea6e049b3e5810ff3a432d6ca7767e1 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Fri, 31 May 2013 16:29:03 -0700 Subject: [PATCH 10/36] CLOUDSTACK-2792: Send "saved_password" to BACKUP router when reset password for user VM Otherwise when MASTER failed, the user VM would get password reset again after reboot. But this fix still have issues if MASTER is failure before VM boot up, but in that case, password of user VM won't change and user would request password change again, then it would be fine. --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 01f86ece310..8da51763982 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3353,7 +3353,12 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V // password should be set only on default network element if (password != null && nic.isDefaultNic()) { - final String encodedPassword = PasswordGenerator.rot13(password); + String encodedPassword = PasswordGenerator.rot13(password); + // We would unset password for BACKUP router in the RvR, to prevent user from accidently reset the + // password again after BACKUP become MASTER + if (router.getIsRedundantRouter() && router.getRedundantState() != RedundantState.MASTER) { + encodedPassword = PasswordGenerator.rot13("saved_password"); + } SavePasswordCommand cmd = new SavePasswordCommand(encodedPassword, nic.getIp4Address(), profile.getVirtualMachine().getHostName()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, getRouterIpInNetwork(nic.getNetworkId(), router.getId())); From 793d5490721bf5d8fd4dbe83fa2a9dccca4ffbb1 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Thu, 13 Jun 2013 16:53:08 -0700 Subject: [PATCH 11/36] fix unit test --- .../src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +- .../hypervisor/kvm/resource/LibvirtComputingResourceTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index 9cddb2e4323..e91e3477b0b 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -951,7 +951,7 @@ public class LibvirtVMDef { if (_listenAddr != null) { graphicBuilder.append(" listen='" + _listenAddr + "'"); } else { - graphicBuilder.append(" listen='' "); + graphicBuilder.append(" listen=''"); } if (_passwd != null) { graphicBuilder.append(" passwd='" + _passwd + "'"); diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 0bafd073f68..c82c31fc510 100644 --- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -80,7 +80,7 @@ public class LibvirtComputingResourceTest { vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; @@ -156,7 +156,7 @@ public class LibvirtComputingResourceTest { vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; - vmStr += "\n"; + vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; vmStr += "\n"; From 18163eaa4d3f3eac0a8de9fc6b87224e22c84914 Mon Sep 17 00:00:00 2001 From: Sanjay Tripathi Date: Wed, 5 Jun 2013 13:26:21 +0530 Subject: [PATCH 12/36] CLOUDSTACK-1960: Key remapping fails to input the keys \ | . of UK Keyboard --- services/console-proxy/server/js/ajaxkeys.js | 42 +++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/services/console-proxy/server/js/ajaxkeys.js b/services/console-proxy/server/js/ajaxkeys.js index 5f497bbb785..677962be192 100644 --- a/services/console-proxy/server/js/ajaxkeys.js +++ b/services/console-proxy/server/js/ajaxkeys.js @@ -146,6 +146,17 @@ X11_KEY_TILDE = 0x7e; // ~ X11_KEY_CIRCUMFLEX_ACCENT = 0x5e; // ^ X11_KEY_YEN_MARK = 0xa5; // Japanese YEN mark X11_KEY_ASTERISK = 0x2a; +X11_KEY_KP_0 = 0xFFB0; +X11_KEY_KP_1 = 0xFFB1; +X11_KEY_KP_2 = 0xFFB2; +X11_KEY_KP_3 = 0xFFB3; +X11_KEY_KP_4 = 0xFFB4; +X11_KEY_KP_5 = 0xFFB5; +X11_KEY_KP_6 = 0xFFB6; +X11_KEY_KP_7 = 0xFFB7; +X11_KEY_KP_8 = 0xFFB8; +X11_KEY_KP_9 = 0xFFB9; +X11_KEY_KP_Decimal = 0xFFAE; KEY_DOWN = 5; KEY_UP = 6; @@ -248,17 +259,17 @@ var keyboardTables = [ {keycode: JS_KEY_FORWARD_SLASH, entry : X11_KEY_FORWARD_SLASH}, {keycode: JS_KEY_DASH, entry : X11_KEY_DASH}, {keycode: JS_KEY_SEMI_COLON, entry : X11_KEY_SEMI_COLON}, - {keycode: JS_KEY_NUMPAD0, entry : X11_KEY_NUMPAD0}, - {keycode: JS_KEY_NUMPAD1, entry : X11_KEY_NUMPAD1}, - {keycode: JS_KEY_NUMPAD2, entry : X11_KEY_NUMPAD2}, - {keycode: JS_KEY_NUMPAD3, entry : X11_KEY_NUMPAD3}, - {keycode: JS_KEY_NUMPAD4, entry : X11_KEY_NUMPAD4}, - {keycode: JS_KEY_NUMPAD5, entry : X11_KEY_NUMPAD5}, - {keycode: JS_KEY_NUMPAD6, entry : X11_KEY_NUMPAD6}, - {keycode: JS_KEY_NUMPAD7, entry : X11_KEY_NUMPAD7}, - {keycode: JS_KEY_NUMPAD8, entry : X11_KEY_NUMPAD8}, - {keycode: JS_KEY_NUMPAD9, entry : X11_KEY_NUMPAD9}, - {keycode: JS_KEY_DECIMAL_POINT, entry : X11_KEY_DECIMAL_POINT}, + {keycode: JS_KEY_NUMPAD0, entry : X11_KEY_KP_0}, + {keycode: JS_KEY_NUMPAD1, entry : X11_KEY_KP_1}, + {keycode: JS_KEY_NUMPAD2, entry : X11_KEY_KP_2}, + {keycode: JS_KEY_NUMPAD3, entry : X11_KEY_KP_3}, + {keycode: JS_KEY_NUMPAD4, entry : X11_KEY_KP_4}, + {keycode: JS_KEY_NUMPAD5, entry : X11_KEY_KP_5}, + {keycode: JS_KEY_NUMPAD6, entry : X11_KEY_KP_6}, + {keycode: JS_KEY_NUMPAD7, entry : X11_KEY_KP_7}, + {keycode: JS_KEY_NUMPAD8, entry : X11_KEY_KP_8}, + {keycode: JS_KEY_NUMPAD9, entry : X11_KEY_KP_9}, + {keycode: JS_KEY_DECIMAL_POINT, entry : X11_KEY_KP_Decimal}, {keycode: JS_KEY_DIVIDE, entry : 0xffaf}, {keycode: JS_KEY_MULTIPLY, entry : 0xffaa}, {keycode: JS_KEY_ADD, entry : 0xffab}, @@ -289,9 +300,12 @@ var keyboardTables = [ ] } }, {tindex: 2, keyboardType: KEYBOARD_TYPE_UK, mappingTable: - {X11: [], - keyPress: [ - //[34 = "] + {X11: [ + //[223 = `¬¦] + {keycode: 223, entry : 0x60, browser: "IE"}, + ], + keyPress: [ + //[34 = "] {keycode: 34, entry: [{type : KEY_DOWN, code : 0x40, modifiers : 64, shift : true}] }, From 5e56e43e31dae8ec505db9b948dfaa476a96deb8 Mon Sep 17 00:00:00 2001 From: Mice Xia Date: Fri, 14 Jun 2013 13:17:38 +0800 Subject: [PATCH 13/36] fix CLOUDSTACK-2930, exception while applying ACL rule with protocol as ALL. 1) change UI, disable startport and endport when protocol=All 2) validate parameters for API createNetworkACL --- .../cloud/network/vpc/NetworkACLServiceImpl.java | 4 ++++ ui/scripts/vpc.js | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java index 4ad22d90770..a28657b4a81 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -294,6 +294,10 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ throw new InvalidParameterValueException("Start port can't be bigger than end port"); } + // start port and end port must be null for protocol = 'all' + if ((portStart != null || portEnd != null ) && protocol != null && protocol.equalsIgnoreCase("all")) + throw new InvalidParameterValueException("start port and end port must be null if protocol = 'all'"); + if (sourceCidrList != null) { for (String cidr: sourceCidrList){ if (!NetUtils.isValidCIDR(cidr)){ diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 39c258c50a4..759364ded1a 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -97,6 +97,13 @@ name != 'icmpcode' && name != 'cidrlist'; }); + var $portFields = $inputs.filter(function() { + var name = $(this).attr('name'); + return $.inArray(name, [ + 'startport', + 'endport' + ]) > -1; + }); var $protocolinput = args.$form.find('td input'); var $protocolFields = $protocolinput.filter(function(){ @@ -124,6 +131,10 @@ $icmpFields.hide(); $icmpFields.parent().find('label.error').hide(); $protocolFields.hide().removeClass('required'); + if ($(this).val() == 'all'){ + $portFields.attr('disabled', 'disabled'); + $portFields.hide(); + } } }); @@ -216,11 +227,11 @@ - if((args.data.protocol == 'tcp' || args.data.protocol == 'udp' || args.data.protocol == 'all') && (args.data.startport=="" || args.data.startport == undefined)){ + if((args.data.protocol == 'tcp' || args.data.protocol == 'udp') && (args.data.startport=="" || args.data.startport == undefined)){ cloudStack.dialog.notice({message:_l('Start Port or End Port value should not be blank')}); $(window).trigger('cloudStack.fullRefresh'); } - else if((args.data.protocol == 'tcp' || args.data.protocol == 'udp' || args.data.protocol == 'all') && (args.data.endport=="" || args.data.endport == undefined)){ + else if((args.data.protocol == 'tcp' || args.data.protocol == 'udp') && (args.data.endport=="" || args.data.endport == undefined)){ cloudStack.dialog.notice({message:_l('Start Port or End Port value should not be blank')}); $(window).trigger('cloudStack.fullRefresh'); } From b2111e46b77a84aa316c9a1af16c12d04490131f Mon Sep 17 00:00:00 2001 From: Radhika PC Date: Fri, 14 Jun 2013 12:05:12 +0530 Subject: [PATCH 14/36] CLOUDSTACK-2986 --- docs/en-US/pvlan.xml | 125 +++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/docs/en-US/pvlan.xml b/docs/en-US/pvlan.xml index c4d8f921c87..d569507f973 100644 --- a/docs/en-US/pvlan.xml +++ b/docs/en-US/pvlan.xml @@ -32,14 +32,10 @@ Isolate VMs in a shared networks by using Private VLANs. - Supported in both VPC and non-VPC deployments. + Supported on KVM, XenServer, and VMware hypervisors - Supported on all hypervisors. - - - Allow end users to deploy VMs in an isolated networks, or a VPC, or a Private - VLAN-enabled shared network. + PVLAN-enabled shared network can be a part of multiple networks of a guest VM.
    @@ -121,55 +117,16 @@ switch, connect the switch to upper switch by using cables. The number of cables should be greater than the number of PVLANs used. - - If your Catalyst switch supports PVLAN, but not PVLAN promiscuous trunk mode, perform - the following: - - - Configure one of the switch port as trunk for management network (management - VLAN). - - - For each PVLAN, perform the following: - - - Connect a port of the Catalyst switch to the upper switch. - - - Set the port in the Catalyst Switch in promiscuous mode for one pair of - PVLAN. - - - Set the port in the upper switch to access mode, and allow only the traffic of - the primary VLAN of the PVLAN pair. - - - - - Configure private VLAN on your physical switches out-of-band. - Open vSwitch (OVS) used by XenServer and KVM does not support PVLAN. Therefore, - simulate PVLAN on OVS for XenServer and KVM by modifying the flow table to achieve the - following: - - - For every traffic leaving user VMs, tag with the secondary isolated VLAN - ID. - - - Change the VLAN ID to primary VLAN ID. - This allows the traffic which is tagged with the secondary isolated VLAN ID reach - the DHCP server. - - - The gateway is PVLAN-unaware; therefore, the switch connected to the gateway - should translate all the secondary VLAN to primary VLAN for communicating with the - gateway. - - + Before you use PVLAN on XenServer and KVM, enable Open vSwitch (OVS) . + + OVS on XenServer and KVM does not support PVLAN. Therefore, simulate PVLAN on OVS + for XenServer and KVM by modifying the flow table and tagging every traffic leaving + guest VMs with the secondary VLAN ID. +
    @@ -208,41 +165,83 @@ Specify the following: - Name: + Name: The name of the network. This will be + visible to the user. - Description: + Description: The short description of the network + that can be displayed to users. - VLAN ID: + VLAN ID: The unique ID of the VLAN. - Private VLAN ID: + Isolated VLAN ID: The unique ID of the Secondary + Isolated VLAN. + For the description on Secondary Isolated VLAN, see . - Scope: + Scope: The available scopes are Domain, Account, + Project, and All. + + + Domain: Selecting Domain limits the scope of + this guest network to the domain you specify. The network will not be available + for other domains. If you select Subdomain Access, the guest network is available + to all the sub domains within the selected domain. + + + Account: The account for which the guest + network is being created for. You must specify the domain the account belongs + to. + + + Project: The project for which the guest + network is being created for. You must specify the domain the project belongs + to. + + + All: The guest network is available for all + the domains, account, projects within the selected zone. + + - Network Offering: + Network Offering: If the administrator has + configured multiple network offerings, select the one you want to use for this + network. - Gateway: + Gateway: The gateway that the guests should + use. - Netmask: + Netmask: The netmask in use on the subnet the + guests will use. - IP Range: + IP Range: A range of IP addresses that are + accessible from the Internet and are assigned to the guest VMs. + If one NIC is used, these IPs should be in the same CIDR in the case of + IPv6. - IPv6 CIDR: + IPv6 CIDR: The network prefix that defines the + guest network subnet. This is the CIDR that describes the IPv6 addresses in use in the + guest networks in this zone. To allot IP addresses from within a particular address + block, enter a CIDR. - Network Domain: + Network Domain: A custom DNS suffix at the level + of a network. If you want to assign a special domain name to the guest VM network, + specify a DNS suffix. - Click OK to confirm. + + Click OK to confirm. + From 7663684981d731eacc84ea6c31cc10250aad39ed Mon Sep 17 00:00:00 2001 From: Mice Xia Date: Fri, 14 Jun 2013 14:54:20 +0800 Subject: [PATCH 15/36] fix CLOUDSTACK-2989 normal user are allowed to create isolated network offerings with vlan assignments 1) only root admin can list network offering with specifyVlan=true 2) only root admin can create network with specifyVlan=true --- .../com/cloud/configuration/ConfigurationManagerImpl.java | 5 ++++- server/src/com/cloud/network/NetworkServiceImpl.java | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index b684e01ea0d..131d34054e3 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -4162,8 +4162,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati sc.addAnd("isDefault", SearchCriteria.Op.EQ, isDefault); } - if (specifyVlan != null) { + // only root admin can list network offering with specifyVlan = true + if (specifyVlan != null && caller.getType() == Account.ACCOUNT_TYPE_ADMIN) { sc.addAnd("specifyVlan", SearchCriteria.Op.EQ, specifyVlan); + }else{ + specifyVlan = false; } if (availability != null) { diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 024c969a043..f026dbc2a32 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -1202,9 +1202,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { + Network.GuestType.Isolated + " with a service " + Service.SourceNat.getName() + " enabled"); } - // Don't allow to specify vlan if the caller is a regular user - if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL && (ntwkOff.getSpecifyVlan() || vlanId != null)) { - throw new InvalidParameterValueException("Regular user is not allowed to specify vlanId"); + // Don't allow to specify vlan if the caller is not ROOT admin + if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN && (ntwkOff.getSpecifyVlan() || vlanId != null)) { + throw new InvalidParameterValueException("Only ROOT admin is allowed to specify vlanId"); } if (ipv4) { From 201c0651ccec02f16e3ca45058bbe00f4dfdaae0 Mon Sep 17 00:00:00 2001 From: Devdeep Singh Date: Fri, 14 Jun 2013 13:16:21 +0530 Subject: [PATCH 16/36] CLOUDSTACK-2948, Explicit dedication processor wasn't added to nonoss components context xml. The processor was never picked up to evaluate which hosts to avoid during deployment. Adding the explicit processor to the list of available processors. --- client/tomcatconf/nonossComponentContext.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 16fd88337fb..143aa220cfc 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -370,6 +370,7 @@ + From 8b4d85309129f9fade7a34c0be946cfe89bd859b Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 14 Jun 2013 10:32:47 +0200 Subject: [PATCH 17/36] CLOUDSTACK-3005: fix template_spool_ref.local_patch error after upgrade from 2.2.14 to 3.X --- setup/db/db/schema-2214to30.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql index e288b0fd4f9..326e9a71cb6 100755 --- a/setup/db/db/schema-2214to30.sql +++ b/setup/db/db/schema-2214to30.sql @@ -665,6 +665,7 @@ ALTER TABLE `cloud`.`dc_storage_network_ip_range` ADD COLUMN `gateway` varchar(1 ALTER TABLE `cloud`.`volumes` ADD COLUMN `last_pool_id` bigint unsigned; UPDATE `cloud`.`volumes` SET `last_pool_id` = `pool_id`; UPDATE `cloud`.`volumes` SET `path` = SUBSTRING_INDEX(`path`, '/', -1); +UPDATE `cloud`.`template_spool_ref` SET `local_path` = SUBSTRING_INDEX(`local_path`, '/', -1); ALTER TABLE `cloud`.`user_ip_address` ADD COLUMN `is_system` int(1) unsigned NOT NULL default '0'; ALTER TABLE `cloud`.`volumes` ADD COLUMN `update_count` bigint unsigned NOT NULL DEFAULT 0; From 3eeca55c76451024db4093cbf6d29c94f6a809aa Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Fri, 14 Jun 2013 12:26:00 -0700 Subject: [PATCH 18/36] Remove zone filter drop-down --- ui/index.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/index.jsp b/ui/index.jsp index 2992afb5c31..34f0c54175b 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -1698,7 +1698,6 @@ under the License. - From 4b2eb18cfc82093640b2cb6c47c0378e69b9f8a2 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 14 Jun 2013 14:17:50 -0700 Subject: [PATCH 19/36] CLOUDSTACK-2981: UI - create network offering - fix a bug that provider dropdown always bounced back to the first enabled option. It should only bounce back to the first enabled option when the selected option is disabled. --- ui/scripts/configuration.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index cb15598d5b8..cadde8c91a7 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1228,8 +1228,11 @@ } }); } - $providers.each(function() { - $(this).val($(this).find('option:first')); + $providers.each(function() { + //if selected option is disabled, select the first enabled option instead + if($(this).find('option:selected:disabled').length > 0) { + $(this).val($(this).find('option:first')); + } }); From cb37d4cb63b45176811475f5b591196de414de8d Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 14 Jun 2013 16:14:21 -0700 Subject: [PATCH 20/36] CLOUDSTACK-3016: remove zonetype parameter from listHosts API. --- .../api/command/admin/host/ListHostsCmd.java | 7 ------- server/src/com/cloud/api/query/QueryManagerImpl.java | 11 +++-------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java index 69c69802bfe..eaaec3091a7 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java @@ -74,9 +74,6 @@ public class ListHostsCmd extends BaseListCmd { @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class, description="the Zone ID for the host") private Long zoneId; - - @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") - private String zoneType; @Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.UUID, entityType = UserVmResponse.class, required=false, description="lists hosts in the same cluster as this VM and flag hosts with enough CPU/RAm to host this VM") @@ -126,10 +123,6 @@ public class ListHostsCmd extends BaseListCmd { public Long getZoneId() { return zoneId; } - - public String getZoneType() { - return zoneType; - } public Long getVirtualMachineId() { return virtualMachineId; diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index beda75e863c..b7d424fb424 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1422,8 +1422,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public Pair, Integer> searchForServersInternal(ListHostsCmd cmd) { - Long zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), cmd.getZoneId()); - String zoneType = cmd.getZoneType(); + Long zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), cmd.getZoneId()); Object name = cmd.getHostName(); Object type = cmd.getType(); Object state = cmd.getState(); @@ -1444,8 +1443,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE); sb.and("type", sb.entity().getType(), SearchCriteria.Op.LIKE); sb.and("status", sb.entity().getStatus(), SearchCriteria.Op.EQ); - sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ); - sb.and("dataCenterType", sb.entity().getZoneType(), SearchCriteria.Op.EQ); + sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ); sb.and("resourceState", sb.entity().getResourceState(), SearchCriteria.Op.EQ); @@ -1489,10 +1487,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } if (zoneId != null) { sc.setParameters("dataCenterId", zoneId); - } - if (zoneType != null) { - sc.setParameters("dataCenterType", zoneType); - } + } if (pod != null) { sc.setParameters("podId", pod); } From ea0de9eaf4a7fb50f961b4227420a8f38effa371 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 14 Jun 2013 16:33:27 -0700 Subject: [PATCH 21/36] CLOUDSTACK-3016: remove zonetype parameter from listStoragePools API. --- .../command/admin/storage/ListStoragePoolsCmd.java | 7 ------- server/src/com/cloud/api/query/QueryManagerImpl.java | 11 +++-------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java index 17adb18ecc8..85a3c22a3e2 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java @@ -59,9 +59,6 @@ public class ListStoragePoolsCmd extends BaseListCmd { @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class, description="the Zone ID for the storage pool") private Long zoneId; - - @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") - private String zoneType; @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = StoragePoolResponse.class, description="the ID of the storage pool") @@ -95,10 +92,6 @@ public class ListStoragePoolsCmd extends BaseListCmd { return zoneId; } - public String getZoneType() { - return zoneType; - } - public Long getId() { return id; } diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index b7d424fb424..fc2948d1585 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1881,8 +1881,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { private Pair, Integer> searchForStoragePoolsInternal(ListStoragePoolsCmd cmd) { - Long zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), cmd.getZoneId()); - String zoneType = cmd.getZoneType(); + Long zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), cmd.getZoneId()); Object id = cmd.getId(); Object name = cmd.getStoragePoolName(); Object path = cmd.getPath(); @@ -1901,8 +1900,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE); sb.and("path", sb.entity().getPath(), SearchCriteria.Op.EQ); - sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ); - sb.and("dataCenterType", sb.entity().getZoneType(), SearchCriteria.Op.EQ); + sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ); sb.and("hostAddress", sb.entity().getHostAddress(), SearchCriteria.Op.EQ); @@ -1932,10 +1930,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } if (zoneId != null) { sc.setParameters("dataCenterId", zoneId); - } - if (zoneType != null) { - sc.setParameters("dataCenterType", zoneType); - } + } if (pod != null) { sc.setParameters("podId", pod); } From b4a692d80f54c0b5a156aa3b682c76aa0cf10ade Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 14 Jun 2013 16:39:04 -0700 Subject: [PATCH 22/36] CLOUDSTACK-3016: remove zonetype parameter from listVolumes API. --- .../api/command/user/volume/ListVolumesCmd.java | 5 ----- server/src/com/cloud/api/query/QueryManagerImpl.java | 11 +++-------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java index 91316b02167..0bced56918b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java @@ -67,8 +67,6 @@ public class ListVolumesCmd extends BaseListTaggedResourcesCmd { description="the ID of the availability zone") private Long zoneId; - @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") - private String zoneType; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -103,9 +101,6 @@ public class ListVolumesCmd extends BaseListTaggedResourcesCmd { return zoneId; } - public String getZoneType() { - return zoneType; - } ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index fc2948d1585..4e0794c321c 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -1544,8 +1544,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { String type = cmd.getType(); Map tags = cmd.getTags(); - Long zoneId = cmd.getZoneId(); - String zoneType = cmd.getZoneType(); + Long zoneId = cmd.getZoneId(); Long podId = null; if (_accountMgr.isAdmin(caller.getType())) { podId = cmd.getPodId(); @@ -1572,8 +1571,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); sb.and("volumeType", sb.entity().getVolumeType(), SearchCriteria.Op.LIKE); sb.and("instanceId", sb.entity().getVmId(), SearchCriteria.Op.EQ); - sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); - sb.and("dataCenterType", sb.entity().getDataCenterType(), SearchCriteria.Op.EQ); + sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); // Only return volumes that are not destroyed sb.and("state", sb.entity().getState(), SearchCriteria.Op.NEQ); @@ -1632,10 +1630,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } if (zoneId != null) { sc.setParameters("dataCenterId", zoneId); - } - if (zoneType != null) { - sc.setParameters("dataCenterType", zoneType); - } + } if (podId != null) { sc.setParameters("podId", podId); } From 8925d39b782556c16cf4828b0062337d4b15021c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 14 Jun 2013 16:51:20 -0700 Subject: [PATCH 23/36] CLOUDSTACK-3016: remove zonetype parameter from listVirtualMachines API. --- .../api/command/user/vm/ListVMsCmd.java | 7 ------- .../src/com/cloud/api/query/QueryManagerImpl.java | 15 ++++----------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java index b2a2ce071f1..d3b29db2801 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java @@ -78,9 +78,6 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, description="the availability zone ID") private Long zoneId; - @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") - private String zoneType; - @Parameter(name=ApiConstants.FOR_VIRTUAL_NETWORK, type=CommandType.BOOLEAN, description="list by network type; true if need to list vms using Virtual Network, false otherwise") private Boolean forVirtualNetwork; @@ -149,10 +146,6 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { return zoneId; } - public String getZoneType() { - return zoneType; - } - public Boolean getForVirtualNetwork() { return forVirtualNetwork; } diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 4e0794c321c..f70f5aef599 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -636,8 +636,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { c.addCriteria(Criteria.ID, cmd.getId()); c.addCriteria(Criteria.NAME, cmd.getInstanceName()); c.addCriteria(Criteria.STATE, cmd.getState()); - c.addCriteria(Criteria.DATACENTERID, cmd.getZoneId()); - c.addCriteria(Criteria.DATACENTERTYPE, cmd.getZoneType()); + c.addCriteria(Criteria.DATACENTERID, cmd.getZoneId()); c.addCriteria(Criteria.GROUPID, cmd.getGroupId()); c.addCriteria(Criteria.FOR_VIRTUAL_NETWORK, cmd.getForVirtualNetwork()); c.addCriteria(Criteria.NETWORKID, cmd.getNetworkId()); @@ -686,8 +685,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Object name = c.getCriteria(Criteria.NAME); Object state = c.getCriteria(Criteria.STATE); Object notState = c.getCriteria(Criteria.NOTSTATE); - Object zoneId = c.getCriteria(Criteria.DATACENTERID); - Object zoneType = c.getCriteria(Criteria.DATACENTERTYPE); + Object zoneId = c.getCriteria(Criteria.DATACENTERID); Object pod = c.getCriteria(Criteria.PODID); Object hostId = c.getCriteria(Criteria.HOSTID); Object hostName = c.getCriteria(Criteria.HOSTNAME); @@ -709,8 +707,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("stateEQ", sb.entity().getState(), SearchCriteria.Op.EQ); sb.and("stateNEQ", sb.entity().getState(), SearchCriteria.Op.NEQ); sb.and("stateNIN", sb.entity().getState(), SearchCriteria.Op.NIN); - sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); - sb.and("dataCenterType", sb.entity().getDataCenterType(), SearchCriteria.Op.EQ); + sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); sb.and("hypervisorType", sb.entity().getHypervisorType(), SearchCriteria.Op.EQ); sb.and("hostIdEQ", sb.entity().getHostId(), SearchCriteria.Op.EQ); @@ -824,11 +821,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sc.setParameters("stateNEQ", "Destroyed"); } } - - if (zoneType != null) { - sc.setParameters("dataCenterType", zoneType); - } - + if (pod != null) { sc.setParameters("podId", pod); From 6d140538c5efc394fda8a4ddc7cb72832470d0b3 Mon Sep 17 00:00:00 2001 From: Rajesh Battala Date: Sat, 15 Jun 2013 11:21:46 +0530 Subject: [PATCH 24/36] CLOUDSTACK-3004: remove duplicate ssvm-check.sh ssvm_check.sh remove the duplicate file from consoleproxy and include the script from secondary storage folder while packing iso Signed-off-by: Prasanna Santhanam --- .../server/scripts/ssvm-check.sh | 136 ------------------ .../server/systemvm-descriptor.xml | 9 ++ 2 files changed, 9 insertions(+), 136 deletions(-) delete mode 100644 services/console-proxy/server/scripts/ssvm-check.sh diff --git a/services/console-proxy/server/scripts/ssvm-check.sh b/services/console-proxy/server/scripts/ssvm-check.sh deleted file mode 100644 index a4011647f07..00000000000 --- a/services/console-proxy/server/scripts/ssvm-check.sh +++ /dev/null @@ -1,136 +0,0 @@ -#!/usr/bin/env bash -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -# Health check script for the Secondary Storage VM - -# DNS server is specified. - - -CMDLINE=/var/cache/cloud/cmdline -for i in `cat $CMDLINE` -do - key=`echo $i | cut -d= -f1` - value=`echo $i | cut -d= -f2` - case $key in - host) - MGMTSERVER=$value - ;; - esac -done - - -# ping dns server -echo ================================================ -DNSSERVER=`egrep '^nameserver' /etc/resolv.conf | awk '{print $2}'| head -1` -echo "First DNS server is " $DNSSERVER -ping -c 2 $DNSSERVER -if [ $? -eq 0 ] -then - echo "Good: Can ping DNS server" -else - echo "WARNING: cannot ping DNS server" - echo "route follows" - route -n -fi - - -# check dns resolve -echo ================================================ -nslookup download.cloud.com 1> /tmp/dns 2>&1 -grep 'no servers could' /tmp/dns 1> /dev/null 2>&1 -if [ $? -eq 0 ] -then - echo "ERROR: DNS not resolving download.cloud.com" - echo resolv.conf follows - cat /etc/resolv.conf - exit 2 -else - echo "Good: DNS resolves download.cloud.com" -fi - - -# check to see if we have the NFS volume mounted -echo ================================================ -mount|grep -v sunrpc|grep nfs 1> /dev/null 2>&1 -if [ $? -eq 0 ] -then - echo "NFS is currently mounted" - # check for write access - for MOUNTPT in `mount|grep -v sunrpc|grep nfs| awk '{print $3}'` - do - if [ $MOUNTPT != "/proc/xen" ] # mounted by xen - then - echo Mount point is $MOUNTPT - touch $MOUNTPT/foo - if [ $? -eq 0 ] - then - echo "Good: Can write to mount point" - rm $MOUNTPT/foo - else - echo "ERROR: Cannot write to mount point" - echo "You need to export with norootsquash" - fi - fi - done -else - echo "ERROR: NFS is not currently mounted" - echo "Try manually mounting from inside the VM" - NFSSERVER=`awk '{print $17}' $CMDLINE|awk -F= '{print $2}'|awk -F: '{print $1}'` - echo "NFS server is " $NFSSERVER - ping -c 2 $NFSSERVER - if [ $? -eq 0 ] - then - echo "Good: Can ping NFS server" - else - echo "WARNING: cannot ping NFS server" - echo routing table follows - route -n - fi -fi - - -# check for connectivity to the management server -echo ================================================ -echo Management server is $MGMTSERVER. Checking connectivity. -socatout=$(echo | socat - TCP:$MGMTSERVER:8250,connect-timeout=3 2>&1) -if [ $? -eq 0 ] -then - echo "Good: Can connect to management server port 8250" -else - echo "ERROR: Cannot connect to $MGMTSERVER port 8250" - echo $socatout - exit 4 -fi - - -# check for the java process running -echo ================================================ -ps -eaf|grep -v grep|grep java 1> /dev/null 2>&1 -if [ $? -eq 0 ] -then - echo "Good: Java process is running" -else - echo "ERROR: Java process not running. Try restarting the SSVM." - exit 3 -fi - -echo ================================================ -echo Tests Complete. Look for ERROR or WARNING above. - -exit 0 diff --git a/services/console-proxy/server/systemvm-descriptor.xml b/services/console-proxy/server/systemvm-descriptor.xml index e34026bc3a6..6c98d2d3eb0 100644 --- a/services/console-proxy/server/systemvm-descriptor.xml +++ b/services/console-proxy/server/systemvm-descriptor.xml @@ -36,6 +36,15 @@ 555 555 + + ../../secondary-storage/scripts/ + + 555 + 555 + + ssvm-check.sh + + ../../../scripts/storage/secondary/ scripts/storage/secondary From 2f345c5b4dcac464770f1f7719e07cf73c5f6ea8 Mon Sep 17 00:00:00 2001 From: rayeesn Date: Sat, 15 Jun 2013 15:17:32 -0700 Subject: [PATCH 25/36] test_accounts.TesttemplateHierarchy;ostype added Signed-off-by: Prasanna Santhanam --- test/integration/component/test_accounts.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index 3f106c3b048..ec135b1de4f 100644 --- a/test/integration/component/test_accounts.py +++ b/test/integration/component/test_accounts.py @@ -84,6 +84,7 @@ class Services: "isfeatured": True, "ispublic": True, "isextractable": True, + "ostype": 'CentOS 5.3 (64-bit)', }, "natrule": { "publicport": 22, From 1a058d77939819ef8a00130064bfb9ca4f108ebe Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 16 Jun 2013 18:33:34 +0530 Subject: [PATCH 26/36] cloudmonkey: Bump up version of cloudmonkey to 4.2.xx Signed-off-by: Rohit Yadav --- tools/cli/cloudmonkey/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/cloudmonkey/config.py b/tools/cli/cloudmonkey/config.py index aaf97ebd25d..36f7e77ed82 100644 --- a/tools/cli/cloudmonkey/config.py +++ b/tools/cli/cloudmonkey/config.py @@ -18,7 +18,7 @@ # Use following rules for versioning: # - -__version__ = "4.1.0-0" +__version__ = "4.2.0-0" __description__ = "Command Line Interface for Apache CloudStack" __maintainer__ = "Rohit Yadav" __maintaineremail__ = "bhaisaab@apache.org" From 10f9516015121fc0521616d3b6d675ac7561c7d9 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 16 Jun 2013 18:34:32 +0530 Subject: [PATCH 27/36] cloumonkey: Remove junk from requester.py This fix removes junk from 6e22843acb6bbd61260849fac171bba61ac6650f which was supposed to just improve error messages and not messup the whole async block logic and go into an infinite recursion or fail with some key error. Signed-off-by: Rohit Yadav --- tools/cli/cloudmonkey/requester.py | 47 +++++++----------------------- 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/tools/cli/cloudmonkey/requester.py b/tools/cli/cloudmonkey/requester.py index d2dae6dfc3f..b06e1fc99e3 100644 --- a/tools/cli/cloudmonkey/requester.py +++ b/tools/cli/cloudmonkey/requester.py @@ -125,61 +125,36 @@ def monkeyrequest(command, args, isasync, asyncblock, logger, host, port, command = "queryAsyncJobResult" request = {'jobid': jobid} timeout = int(timeout) - pollperiod = 3 + pollperiod = 2 progress = 1 while timeout > 0: print '\r' + '.' * progress, sys.stdout.flush() - progress += 1 + time.sleep(pollperiod) timeout = timeout - pollperiod + progress += 1 logger_debug(logger, "Job %s to timeout in %ds" % (jobid, timeout)) - sys.stdout.flush() - if re.match("queryAsyncJobResult", command): - time.sleep(pollperiod) - else: - response, error = monkeyrequest(command, request, isasync, - asyncblock, logger, - host, port, apikey, secretkey, - timeout, protocol, path) + response, error = make_request(command, request, logger, + host, port, apikey, secretkey, + protocol, path) + if error is not None: + return response, error + response = process_json(response) responsekeys = filter(lambda x: 'response' in x, response.keys()) if len(responsekeys) < 1: - time.sleep(pollperiod) continue result = response[responsekeys[0]] jobstatus = result['jobstatus'] - jobresultcode = result['jobresultcode'] - try: - jobresult = result["jobresult"] - logger_debug(logger, "jobresult %s" % (jobresult)) - sys.stdout.flush() - return response, None - except KeyError: - logger_debug(logger, "No jobresult yet %s" % (result)) - sys.stdout.flush() - - if jobresultcode != 0: - error = "Error: resultcode %d for jobid %s" % (jobresultcode, - jobid) - logger_debug(logger, "%s" % (error)) - return response, error - else: - # if we get a valid respons resultcode give back results - response, error = monkeyrequest(command, request, isasync, - asyncblock, logger, - host, port, apikey, secretkey, - timeout, protocol, path) - logger_debug(logger, "Ok: %s" % (jobid)) - return response, error - if jobstatus == 2: + jobresult = result["jobresult"] error = "\rAsync job %s failed\nError %s, %s" % (jobid, jobresult["errorcode"], jobresult["errortext"]) return response, error elif jobstatus == 1: - print '\r', + print "\r" + " " * progress, return response, error else: logger_debug(logger, "We should not arrive here!") From 2fb18db7b1484fbc7cedf616b2970fe596586db8 Mon Sep 17 00:00:00 2001 From: Isaac Chiang Date: Sun, 16 Jun 2013 23:04:33 +0800 Subject: [PATCH 28/36] CLOUDSTACK-2976: At zone level setting same parameter page is getting displayed repeatedly when you scroll down --- ui/scripts/ui/widgets/listView.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index ba4d2881580..8dbc2f6ffbc 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -1327,6 +1327,12 @@ }); $table.dataTable(null, { noSelect: uiCustom }); + if(args.data && + args.data.length < pageSize && + options.setEndTable) { + options.setEndTable(); + } + setTimeout(function() { $table.dataTable('refresh'); }); @@ -1467,6 +1473,12 @@ var page = 1; var actions = listViewData.actions; var reorder = listViewData.reorder; + var tableHeight = $table.height(); + var endTable = false; + var setEndTable = function() { + endTable = true; + } + var $switcher; if (args.sections) { @@ -1572,7 +1584,8 @@ { context: args.context, reorder: reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable } ); @@ -1625,7 +1638,8 @@ { context: $listView.data('view-args').context, reorder: listViewData.reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable } ); }; @@ -1675,7 +1689,8 @@ { context: $listView.data('view-args').context, reorder: listViewData.reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable } ); }; @@ -1728,8 +1743,6 @@ return false; }); - var tableHeight = $table.height(); - var endTable = false; // Infinite scrolling event $listView.bind('scroll', function(event) { @@ -1767,7 +1780,8 @@ filterBy: filterBy }, actions, { reorder: listViewData.reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable }); $table.height() == tableHeight ? endTable = true : tableHeight = $table.height(); } From bf0265d21d77dbc28bc61f46c535ca75b727d115 Mon Sep 17 00:00:00 2001 From: rayeesn Date: Sat, 15 Jun 2013 10:26:13 -0700 Subject: [PATCH 29/36] CLOUDSTACK-3020: Fix assert error If you do not give a name during vm creation, UUID will be set for Name and Display name will be blank. Signed-off-by: Prasanna Santhanam --- test/integration/component/test_custom_hostname.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/component/test_custom_hostname.py b/test/integration/component/test_custom_hostname.py index c9db2154a94..e569215980c 100644 --- a/test/integration/component/test_custom_hostname.py +++ b/test/integration/component/test_custom_hostname.py @@ -300,7 +300,7 @@ class TestInstanceNameFlagTrue(cloudstackTestCase): "Running", "Vm state should be running after deployment" ) - self.assertEqual( + self.assertNotEqual( vm.displayname, vm.id, "Vm display name should not match the given name" From e405703d5c38fd42b4c91533cf50e07190fbe760 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 17 Jun 2013 10:04:26 +0530 Subject: [PATCH 30/36] CLOUDSTACK-3024: Invalid reference to testclient close Testclient does not expose a close() method anymore for closing the connection to cloudstack Signed-off-by: Prasanna Santhanam --- test/integration/component/test_host_high_availability.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/integration/component/test_host_high_availability.py b/test/integration/component/test_host_high_availability.py index 57eb5edede9..2fe07b1771f 100644 --- a/test/integration/component/test_host_high_availability.py +++ b/test/integration/component/test_host_high_availability.py @@ -142,7 +142,6 @@ class TestHostHighAvailability(cloudstackTestCase): try: #Clean up, terminate the created accounts, domains etc cleanup_resources(self.apiclient, self.cleanup) - self.testClient.close() except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return From 776301ce6f124767d42fcd58f9c411a002dc310d Mon Sep 17 00:00:00 2001 From: Ian Duffy Date: Wed, 12 Jun 2013 17:31:23 +0100 Subject: [PATCH 31/36] Change listAll to return a boolean and fix a typo Signed-off-by: Abhinandan Prateek --- .../api/command/admin/ldap/LDAPConfigCmd.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java index 2976de4bf28..2726f84163d 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java @@ -43,10 +43,9 @@ public class LDAPConfigCmd extends BaseCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - - @Parameter(name=ApiConstants.LIST_ALL, type=CommandType.STRING, description="Hostname or ip address of the ldap server eg: my.ldap.com") - private String listall; - + @Parameter(name=ApiConstants.LIST_ALL, type=CommandType.BOOLEAN, description="If true return current LDAP configuration") + private Boolean listAll; + @Parameter(name=ApiConstants.HOST_NAME, type=CommandType.STRING, description="Hostname or ip address of the ldap server eg: my.ldap.com") private String hostname; @@ -78,10 +77,10 @@ public class LDAPConfigCmd extends BaseCmd { /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// - public String getListAll() { - return listall == null ? "false" : listall; + public Boolean getListAll() { + return listAll == null ? Boolean.FALSE : listAll; } - + public String getBindPassword() { return bindPassword; } @@ -156,16 +155,15 @@ public class LDAPConfigCmd extends BaseCmd { InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { try { - if ("true".equalsIgnoreCase(getListAll())){ + if (getListAll()){ // return the existing conf LDAPConfigCmd cmd = _configService.listLDAPConfig(this); - LDAPConfigResponse lr = _responseGenerator.createLDAPConfigResponse(cmd.getHostname(), cmd.getPort(), cmd.getUseSSL(), - cmd.getQueryFilter(), cmd.getSearchBase(), cmd.getBindDN()); + LDAPConfigResponse lr = _responseGenerator.createLDAPConfigResponse(cmd.getHostname(), cmd.getPort(), cmd.getUseSSL(), cmd.getQueryFilter(), cmd.getSearchBase(), cmd.getBindDN()); lr.setResponseName(getCommandName()); this.setResponseObject(lr); } else if (getHostname()==null || getSearchBase() == null || getQueryFilter() == null) { - throw new InvalidParameterValueException("You need to provide hostname, serachbase and queryfilter to configure your LDAP server"); + throw new InvalidParameterValueException("You need to provide hostname, searchbase and queryfilter to configure your LDAP server"); } else { boolean result = _configService.updateLDAP(this); From 2f1ed47213014f2462d7add0bec6a2437e336899 Mon Sep 17 00:00:00 2001 From: Radhika PC Date: Mon, 17 Jun 2013 11:08:59 +0530 Subject: [PATCH 32/36] CLOUDSTACK-769 review comments fixed --- docs/en-US/add-loadbalancer-rule-vpc.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en-US/add-loadbalancer-rule-vpc.xml b/docs/en-US/add-loadbalancer-rule-vpc.xml index b7b9e3e7613..82e870243d1 100644 --- a/docs/en-US/add-loadbalancer-rule-vpc.xml +++ b/docs/en-US/add-loadbalancer-rule-vpc.xml @@ -25,16 +25,16 @@ External LB is nothing but a LB rule created to redirect the traffic received at a public IP of the VPC virtual router. The traffic is load balanced within a tier based on your configuration. Citrix NetScaler and VPC virtual router are supported for external LB. When you use internal LB - service, traffic received at a tier is load balanced across different tiers within the VPC. For - example, traffic reached at Web tier is redirected to Application tier. External load balancing - devices are not supported for internal LB. The service is provided by a internal LB VM + service, traffic received at a tier is load balanced across different VMs within that tier. For + example, traffic reached at Web tier is redirected to another VM in that tier. External load + balancing devices are not supported for internal LB. The service is provided by a internal LB VM configured on the target tier.
    Load Balancing Within a Tier (External LB) A &PRODUCT; user or administrator may create load balancing rules that balance traffic received at a public IP to one or more VMs that belong to a network tier that provides load balancing service in a VPC. A user creates a rule, specifies an algorithm, and assigns the - rule to a set of VMs within a VPC. + rule to a set of VMs within a tier. Log in to the &PRODUCT; UI as an administrator or end user. From fcafe28d7b9231282161e326e9dfa8528054f5fd Mon Sep 17 00:00:00 2001 From: Radhika PC Date: Mon, 17 Jun 2013 11:41:07 +0530 Subject: [PATCH 33/36] CLOUDSTACK-758 --- docs/en-US/create-vpn-connection-vpc.xml | 31 ++++++++++++++++++----- docs/en-US/create-vpn-gateway-for-vpc.xml | 30 +++++++++++++++++----- docs/en-US/delete-reset-vpn.xml | 28 ++++++++++++++++---- 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/docs/en-US/create-vpn-connection-vpc.xml b/docs/en-US/create-vpn-connection-vpc.xml index 1fba09e18fb..88a058c9f89 100644 --- a/docs/en-US/create-vpn-connection-vpc.xml +++ b/docs/en-US/create-vpn-connection-vpc.xml @@ -20,6 +20,7 @@ -->
    Creating a VPN Connection + &PRODUCT; supports creating up to 8 VPN connections. Log in to the &PRODUCT; UI as an administrator or end user. @@ -38,19 +39,37 @@ Click the Settings icon. - The following options are displayed. + For each tier, the following options are displayed: - IP Addresses + Internal LB - Gateways + Public LB IP - Site-to-Site VPN + Static NAT - Network ASLs + Virtual Machines + + + CIDR + + + The following router information is displayed: + + + Private Gateways + + + Public IP Addresses + + + Site-to-Site VPNs + + + Network ACL Lists @@ -100,4 +119,4 @@ -
    \ No newline at end of file +
    diff --git a/docs/en-US/create-vpn-gateway-for-vpc.xml b/docs/en-US/create-vpn-gateway-for-vpc.xml index 396a7d9d174..0f8a0dcc03b 100644 --- a/docs/en-US/create-vpn-gateway-for-vpc.xml +++ b/docs/en-US/create-vpn-gateway-for-vpc.xml @@ -38,19 +38,37 @@ Click the Settings icon. - The following options are displayed. + For each tier, the following options are displayed: - IP Addresses + Internal LB - Gateways + Public LB IP - Site-to-Site VPN + Static NAT - Network ACLs + Virtual Machines + + + CIDR + + + The following router information is displayed: + + + Private Gateways + + + Public IP Addresses + + + Site-to-Site VPNs + + + Network ACL Lists @@ -77,4 +95,4 @@ - \ No newline at end of file + diff --git a/docs/en-US/delete-reset-vpn.xml b/docs/en-US/delete-reset-vpn.xml index 318e5fe321e..2fe85d279b6 100644 --- a/docs/en-US/delete-reset-vpn.xml +++ b/docs/en-US/delete-reset-vpn.xml @@ -38,19 +38,37 @@ Click the Settings icon. - The following options are displayed. + For each tier, the following options are displayed: - IP Addresses + Internal LB - Gateways + Public LB IP - Site-to-Site VPN + Static NAT - Network ASLs + Virtual Machines + + + CIDR + + + The following router information is displayed: + + + Private Gateways + + + Public IP Addresses + + + Site-to-Site VPNs + + + Network ACL Lists From ac48e5dc67e6ae93545ab188500070b3ef3da290 Mon Sep 17 00:00:00 2001 From: Shiva Teja Date: Thu, 13 Jun 2013 23:02:12 +0530 Subject: [PATCH 34/36] Add proposal to CloudStack_GSoC_Guide.xml --- docs/en-US/CloudStack_GSoC_Guide.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en-US/CloudStack_GSoC_Guide.xml b/docs/en-US/CloudStack_GSoC_Guide.xml index 1f435931363..cd8205d34ba 100644 --- a/docs/en-US/CloudStack_GSoC_Guide.xml +++ b/docs/en-US/CloudStack_GSoC_Guide.xml @@ -50,5 +50,6 @@ + From a3d585ea4effc3a326858e777a7f785ddf44dfe2 Mon Sep 17 00:00:00 2001 From: Shiva Teja Date: Fri, 14 Jun 2013 00:54:03 +0530 Subject: [PATCH 35/36] Add Shiva Teja's proposal to GSoC docbook --- docs/en-US/gsoc-shiva.xml | 70 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 docs/en-US/gsoc-shiva.xml diff --git a/docs/en-US/gsoc-shiva.xml b/docs/en-US/gsoc-shiva.xml new file mode 100644 index 00000000000..400af3c82f6 --- /dev/null +++ b/docs/en-US/gsoc-shiva.xml @@ -0,0 +1,70 @@ + + +%BOOK_ENTITIES; +]> + + + + + Shiva Teja's 2013 GSoC Proposal + This chapter describes Shiva Teja's 2013 Google Summer of Code project within the &PRODUCT; ASF project. It is a copy paste of the submitted proposal. +
    + Abstract + + The aim of this project is to create a new modular UI for Apache CloudStack using Bootstrap by Twitter and Backbone.js. To achieve this easily, I'll be creating a RESTful wrapper API on top of the current CloudStack API. I hope this project will make custom UIs for CloudStack very easy. + + Why does CloudStack need a new UI? + + The current UI cannot be reused easliy to make a custom UI. The UI I will be making using backbone.js can be reused very easily to make custom UIs. The models, views, routers etc can remain the same in all the UIs. The user interface can be changed just by changing the templates. Check the implementation details below for further details. + + Why does it need a RESTful wrapper API ? + + Backbone.js heavily depends on RESTful architecture. Making a new UI with backbone.js using a query based API might not be easy. +
    +
    + List of deliverables + + A new UI for CloudStack(with almost all features in the current UI and new ones, if any). + A RESTful wrapper API on top of the CloudStack API + Some documentation about using this UI to make a custom UI. + +
    +
    + Approach + Wrapper API: Backbone.js, by default, uses four HTTP methods(GET, PUT, POST, DELETE) for communicating with the server. It uses GET to fetch a resource from the server, POST to create a resource, PUT to update the resource and DELETE to delete the resource. A query based API can probably be used to make the UI by overriding backbone's default sync function. But it makes more sense to have an API which supports the above mentioned method and is resource based. This RESTful API works on top of the CloudStack API. The main task is to map the combinations of these HTTP methods and the resources to appropriate CloudStack API command. The other task is to decide on how the URLs should look like. Say for starting a virtual machine, for it to be RESTful, we have to use POST as we are creating a resource, or a PUT as we are changing the state of a virtual machine. So the possible options on the URL could be to do a POST /runningvirtualmachines and respond with 201 Created code or a PUT on /virtualmachines/id and respond with 200 OK. If these are decided, the wrapper can be generated or be written manually, which can use defined patters to map to appropriate CloudStack API commands(Similar to what cloudmonkey does. See this prototype. I can use cloudmonkey's code to generate the required API entity verb relationships. Each verb will have a set of rules saying what method should be used in the RESTful API and how should it look like in the URL. Another possible way could be to group entities first manually and write the wrapper manually(something like zone/pods/cluster). Some possibilities have been discussed in this thread. + + UI: It will be a single page app. It'll use client side templating for rendering. This makes it very easy to make a custom UI because it can be achieved just by changing the templates. Backbone views will make use of these templates to render the appropriate models/collections. A completely new interface can be written just by changing the templates. Javascript code can completely remain the same. The views will take care of appropriate DOM events. Such event will correspond to appropriate model/collection chages, thus causing appropriate API calls. +
    +
    + Approximate Schedle + Till June 17 - Decide on how the RESTful API should look like and design algorithms to generate the wrapper. + July 5(soft deadline), July 10(hard deadline) : Wrapper API will be ready. + July 12(soft) - July 15(hard): Make basic wireframes and designs for the website and get them approved. + July 29(mid term evaluation) : All the basic models, views, routes of the UI should be ready along with a few templates. + August 15(hard deadline, shouldn't take much time actually) - A basic usable UI where users can just list all the entities which are present in the current UI's main navigation( Like Instances, Templates, Accounts etc) + September 1(hard) - From this UI, users should be able to launch instances, edit settings of most of the entities. + September 16(Pencil down!) - Fix some design tweaks and finish a completely usable interface with functions similar to current UI. + September 23 - Finish the documentation on how to use this UI to make custom UIs. +
    +
    + About Me + I am a 2nd year computer science undergrad studying at IIT Mandi, India. I've been using Python for an year and a half now. I've used Django, Flask and Tornado for my small projects. Along with Python, I use C++ for competitive programming. Recently, I fell in love with Haskell. I've always been fascinated about web technologies. +
    +     From 0587d3a496b4c5d29a6b14774f5e7fdc42a5bb33 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 17 Jun 2013 12:32:50 +0530 Subject: [PATCH 36/36] Moving maintenance mode into component/maint All tests that could possible disrupt the runs of other tests because of putting resources into maintenace will be put under maint/. This should allow us to run the tests sequentially when other tests are not running on a deployment. Signed-off-by: Prasanna Santhanam --- test/integration/component/maint/__init__.py | 21 ++ .../{ => maint}/test_high_availability.py | 0 .../test_host_high_availability.py | 10 +- .../{ => maint}/test_vpc_host_maintenance.py | 330 +----------------- .../maint/test_vpc_on_host_maintenance.py | 323 +++++++++++++++++ test/integration/component/test_vpc.py | 252 +------------ 6 files changed, 351 insertions(+), 585 deletions(-) create mode 100644 test/integration/component/maint/__init__.py rename test/integration/component/{ => maint}/test_high_availability.py (100%) rename test/integration/component/{ => maint}/test_host_high_availability.py (99%) rename test/integration/component/{ => maint}/test_vpc_host_maintenance.py (63%) create mode 100644 test/integration/component/maint/test_vpc_on_host_maintenance.py diff --git a/test/integration/component/maint/__init__.py b/test/integration/component/maint/__init__.py new file mode 100644 index 00000000000..f044f8bcd9a --- /dev/null +++ b/test/integration/component/maint/__init__.py @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +""" +Tests that put hosts, zones, resources in to maintenance mode are here. +These will have to be run sequentiall when resources are available so as not disrupt other tests +""" \ No newline at end of file diff --git a/test/integration/component/test_high_availability.py b/test/integration/component/maint/test_high_availability.py similarity index 100% rename from test/integration/component/test_high_availability.py rename to test/integration/component/maint/test_high_availability.py diff --git a/test/integration/component/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py similarity index 99% rename from test/integration/component/test_host_high_availability.py rename to test/integration/component/maint/test_host_high_availability.py index 2fe07b1771f..5fb047ba6cb 100644 --- a/test/integration/component/test_host_high_availability.py +++ b/test/integration/component/maint/test_host_high_availability.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -""" P1 tests for dedicated Host high availability +""" P1 tests for dedicated Host high availability """ #Import Local Modules from nose.plugins.attrib import attr @@ -157,7 +157,7 @@ class TestHostHighAvailability(cloudstackTestCase): # Validations, #1. Ensure that the offering is created and that in the UI the 'Offer HA' field is enabled (Yes) #The listServiceOffering API should list 'offerha' as true. - #2. Select the newly created VM and ensure that the Compute offering field value lists the compute service offering that was selected. + #2. Select the newly created VM and ensure that the Compute offering field value lists the compute service offering that was selected. # Also, check that the HA Enabled field is enabled 'Yes'. #list and validate above created service offering with Ha enabled @@ -257,7 +257,7 @@ class TestHostHighAvailability(cloudstackTestCase): self.debug("Deployed VM on host: %s" % vm.hostid) - #validate the virtual machine created is host Ha enabled + #validate the virtual machine created is host Ha enabled list_hosts_response = list_hosts( self.apiclient, id=vm.hostid @@ -593,7 +593,7 @@ class TestHostHighAvailability(cloudstackTestCase): vm_with_ha_enabled = vms[0] - #Verify the virtual machine got created on non HA host + #Verify the virtual machine got created on non HA host list_hosts_response = list_hosts( self.apiclient, id=vm_with_ha_enabled.hostid @@ -725,7 +725,7 @@ class TestHostHighAvailability(cloudstackTestCase): vm_with_ha_disabled = vms[0] - #Verify the virtual machine got created on non HA host + #Verify the virtual machine got created on non HA host list_hosts_response = list_hosts( self.apiclient, id=vm_with_ha_disabled.hostid diff --git a/test/integration/component/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py similarity index 63% rename from test/integration/component/test_vpc_host_maintenance.py rename to test/integration/component/maint/test_vpc_host_maintenance.py index d28b7985b9b..8fc427abd36 100644 --- a/test/integration/component/test_vpc_host_maintenance.py +++ b/test/integration/component/maint/test_vpc_host_maintenance.py @@ -558,332 +558,4 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase): "Router state should be running" ) # TODO: Check for the network connectivity - return - - -class TestVPCNetworkRules(cloudstackTestCase): - - @classmethod - def setUpClass(cls): - cls.api_client = super( - TestVPCNetworkRules, - cls - ).getClsTestClient().getApiClient() - cls.services = Services().services - # Get Zone, Domain and templates - cls.domain = get_domain(cls.api_client, cls.services) - cls.zone = get_zone(cls.api_client, cls.services) - cls.template = get_template( - cls.api_client, - cls.zone.id, - cls.services["ostype"] - ) - cls.services["virtual_machine"]["zoneid"] = cls.zone.id - cls.services["virtual_machine"]["template"] = cls.template.id - - cls.service_offering_1 = ServiceOffering.create( - cls.api_client, - cls.services["service_offering_1"] - ) - cls.service_offering_2 = ServiceOffering.create( - cls.api_client, - cls.services["service_offering_2"] - ) - cls.vpc_off = VpcOffering.create( - cls.api_client, - cls.services["vpc_offering"] - ) - cls.vpc_off.update(cls.api_client, state='Enabled') - - cls.account = Account.create( - cls.api_client, - cls.services["account"], - admin=True, - domainid=cls.domain.id - ) - - cls.vpc_off = VpcOffering.create( - cls.api_client, - cls.services["vpc_offering"] - ) - - cls.vpc_off.update(cls.api_client, state='Enabled') - - cls.services["vpc"]["cidr"] = '10.1.1.1/16' - cls.vpc = VPC.create( - cls.api_client, - cls.services["vpc"], - vpcofferingid=cls.vpc_off.id, - zoneid=cls.zone.id, - account=cls.account.name, - domainid=cls.account.domainid - ) - - cls.nw_off = NetworkOffering.create( - cls.api_client, - cls.services["network_offering"], - conservemode=False - ) - # Enable Network offering - cls.nw_off.update(cls.api_client, state='Enabled') - - # Creating network using the network offering created - cls.network_1 = Network.create( - cls.api_client, - cls.services["network"], - accountid=cls.account.name, - domainid=cls.account.domainid, - networkofferingid=cls.nw_off.id, - zoneid=cls.zone.id, - gateway='10.1.1.1', - vpcid=cls.vpc.id - ) - cls.nw_off_no_lb = NetworkOffering.create( - cls.api_client, - cls.services["network_offering_no_lb"], - conservemode=False - ) - # Enable Network offering - cls.nw_off_no_lb.update(cls.api_client, state='Enabled') - - # Creating network using the network offering created - cls.network_2 = Network.create( - cls.api_client, - cls.services["network"], - accountid=cls.account.name, - domainid=cls.account.domainid, - networkofferingid=cls.nw_off_no_lb.id, - zoneid=cls.zone.id, - gateway='10.1.2.1', - vpcid=cls.vpc.id - ) - # Spawn an instance in that network - cls.vm_1 = VirtualMachine.create( - cls.api_client, - cls.services["virtual_machine"], - accountid=cls.account.name, - domainid=cls.account.domainid, - serviceofferingid=cls.service_offering_1.id, - networkids=[str(cls.network_1.id)] - ) - # Spawn an instance in that network - cls.vm_2 = VirtualMachine.create( - cls.api_client, - cls.services["virtual_machine"], - accountid=cls.account.name, - domainid=cls.account.domainid, - serviceofferingid=cls.service_offering_2.id, - networkids=[str(cls.network_1.id)] - ) - cls.vm_3 = VirtualMachine.create( - cls.api_client, - cls.services["virtual_machine"], - accountid=cls.account.name, - domainid=cls.account.domainid, - serviceofferingid=cls.service_offering_1.id, - networkids=[str(cls.network_2.id)] - ) - cls.vm_4 = VirtualMachine.create( - cls.api_client, - cls.services["virtual_machine"], - accountid=cls.account.name, - domainid=cls.account.domainid, - serviceofferingid=cls.service_offering_2.id, - networkids=[str(cls.network_2.id)] - ) - - cls._cleanup = [ - cls.service_offering_1, - cls.service_offering_2, - cls.nw_off, - cls.nw_off_no_lb, - ] - return - - @classmethod - def tearDownClass(cls): - try: - cls.account.delete(cls.api_client) - wait_for_cleanup(cls.api_client, ["account.cleanup.interval"]) - #Cleanup resources used - cleanup_resources(cls.api_client, cls._cleanup) - - # Waiting for network cleanup to delete vpc offering - wait_for_cleanup(cls.api_client, ["network.gc.wait", - "network.gc.interval"]) - cls.vpc_off.delete(cls.api_client) - except Exception as e: - raise Exception("Warning: Exception during cleanup : %s" % e) - return - - def setUp(self): - - self.apiclient = self.testClient.getApiClient() - self.dbclient = self.testClient.getDbConnection() - self.cleanup = [] - return - - def tearDown(self): - try: - #Clean up, terminate the created network offerings - cleanup_resources(self.apiclient, self.cleanup) - except Exception as e: - raise Exception("Warning: Exception during cleanup : %s" % e) - return - - def validate_vm_deployment(self): - """Validates VM deployment on different hosts""" - - vms = VirtualMachine.list( - self.apiclient, - account=self.account.name, - domainid=self.account.domainid, - networkid=self.network_1.id, - listall=True - ) - self.assertEqual( - isinstance(vms, list), - True, - "List VMs shall return a valid response" - ) - host_1 = vms[0].hostid - self.debug("Host for network 1: %s" % vms[0].hostid) - - vms = VirtualMachine.list( - self.apiclient, - account=self.account.name, - domainid=self.account.domainid, - networkid=self.network_2.id, - listall=True - ) - self.assertEqual( - isinstance(vms, list), - True, - "List VMs shall return a valid response" - ) - host_2 = vms[0].hostid - self.debug("Host for network 2: %s" % vms[0].hostid) - - self.assertNotEqual( - host_1, - host_2, - "Both the virtual machines should be deployed on diff hosts " - ) - return - - @attr(tags=["advanced", "intervlan"]) - def test_list_pf_rules_for_vpc(self): - """ Test List Port Forwarding Rules & vms belonging to a VPC - """ - - # Validate the following - # 1. Create a VPC with cidr - 10.1.1.1/16 - # 2. Add network1(10.1.1.1/24) and network2(10.1.2.1/24) to this VPC. - # 3. Deploy vm1 and vm2 in network1 and vm3 and vm4 in network2. - # Make sure vm1 and vm3 are deployed on one host in the cluster - # while vm2 and vm4 are deployed on the other host in the cluster. - # This can be done using host's tags and service offerings with - # host tags. - # 4. Create a PF rule for vms in network1. - # 5. Create a PF rule for vms in network2. - # Steps: - # 1. List all the Port Forwarding Rules belonging to a VPC - # 2. Successfully List the Port Forwarding Rules belonging to the VPC - # 3. List the VMs on network1 for selection for the PF Rule - # 4. Successfully list the VMs for Port Forwarding Rule creation - - self.debug("Associating public IP for network: %s" % - self.network_1.name) - public_ip_1 = PublicIPAddress.create( - self.apiclient, - accountid=self.account.name, - zoneid=self.zone.id, - domainid=self.account.domainid, - networkid=self.network_1.id, - vpcid=self.vpc.id - ) - self.debug("Associated %s with network %s" % ( - public_ip_1.ipaddress.ipaddress, - self.network_1.id - )) - - nat_rule_1 = NATRule.create( - self.apiclient, - self.vm_1, - self.services["natrule"], - ipaddressid=public_ip_1.ipaddress.id, - openfirewall=False, - networkid=self.network_1.id, - vpcid=self.vpc.id - ) - - self.debug("Associating public IP for network: %s" % - self.network_2.name) - public_ip_2 = PublicIPAddress.create( - self.apiclient, - accountid=self.account.name, - zoneid=self.zone.id, - domainid=self.account.domainid, - networkid=self.network_2.id, - vpcid=self.vpc.id - ) - self.debug("Associated %s with network %s" % ( - public_ip_2.ipaddress.ipaddress, - self.network_2.id - )) - - nat_rule_2 = NATRule.create( - self.apiclient, - self.vm_3, - self.services["natrule"], - ipaddressid=public_ip_2.ipaddress.id, - openfirewall=False, - networkid=self.network_2.id, - vpcid=self.vpc.id - ) - - self.debug("Listing all the PF rules belonging to VPC") - nat_rules = NATRule.list( - self.apiclient, - vpcid=self.vpc.id, - listall=True - ) - self.assertEqual( - isinstance(nat_rules, list), - True, - "List NAT rules should return the valid list" - ) - self.assertEqual( - len(nat_rules), - 2, - "List NAT for VPC shall return all NAT rules belonging to VPC" - ) - for nat_rule in nat_rules: - self.assertEqual( - nat_rule.vpcid, - self.vpc.id, - "NAT rules should belong to VPC" - ) - - self.debug( - "Listing all the VMs belonging to VPC for network: %s" % - self.network_1.name) - vms = VirtualMachine.list( - self.apiclient, - networkid=self.network_1.id, - vpcid=self.vpc.id, - listall=True - ) - self.assertEqual( - isinstance(vms, list), - True, - "List virtual machines should return the valid list" - ) - for vm in vms: - self.assertEqual( - vm.networkid, - self.network_1.id, - "List VMs should return vms belonging to network_1" - ) - return - + return \ No newline at end of file diff --git a/test/integration/component/maint/test_vpc_on_host_maintenance.py b/test/integration/component/maint/test_vpc_on_host_maintenance.py new file mode 100644 index 00000000000..6630ee61e0a --- /dev/null +++ b/test/integration/component/maint/test_vpc_on_host_maintenance.py @@ -0,0 +1,323 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from nose.plugins.attrib import attr +from marvin.cloudstackTestCase import * +from marvin.cloudstackAPI import * +from marvin.integration.lib.utils import * +from marvin.integration.lib.base import * +from marvin.integration.lib.common import * + + +class Services: + """Test VPC services + """ + + def __init__(self): + self.services = { + "account": { + "email": "test@test.com", + "firstname": "Test", + "lastname": "User", + "username": "test", + # Random characters are appended for unique + # username + "password": "password", + }, + "service_offering": { + "name": "Tiny Instance", + "displaytext": "Tiny Instance", + "cpunumber": 1, + "cpuspeed": 100, + "memory": 128, + }, + "vpc_offering": { + "name": 'VPC off', + "displaytext": 'VPC off', + "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL', + }, + "vpc": { + "name": "TestVPC", + "displaytext": "TestVPC", + "cidr": '10.0.0.1/24' + }, + "virtual_machine": { + "displayname": "Test VM", + "username": "root", + "password": "password", + "ssh_port": 22, + "hypervisor": 'XenServer', + # Hypervisor type should be same as + # hypervisor type of cluster + "privateport": 22, + "publicport": 22, + "protocol": 'TCP', + }, + "ostype": 'CentOS 5.3 (64-bit)', + # Cent OS 5.3 (64 bit) + "sleep": 60, + "timeout": 10 + } + +class TestVPCHostMaintenance(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + cls.api_client = super( + TestVPCHostMaintenance, + cls + ).getClsTestClient().getApiClient() + cls.services = Services().services + # Get Zone, Domain and templates + cls.domain = get_domain(cls.api_client, cls.services) + cls.zone = get_zone(cls.api_client, cls.services) + cls.template = get_template( + cls.api_client, + cls.zone.id, + cls.services["ostype"] + ) + cls.services["virtual_machine"]["zoneid"] = cls.zone.id + cls.services["virtual_machine"]["template"] = cls.template.id + cls.services["mode"] = cls.zone.networktype + + cls.service_offering = ServiceOffering.create( + cls.api_client, + cls.services["service_offering"] + ) + cls.vpc_off = VpcOffering.create( + cls.api_client, + cls.services["vpc_offering"] + ) + cls.vpc_off.update(cls.api_client, state='Enabled') + hosts = Host.list( + cls.api_client, + zoneid=cls.zone.id, + listall=True, + type='Routing' + ) + + if isinstance(hosts, list): + for host in hosts: + Host.enableMaintenance( + cls.api_client, + id=host.id + ) + + timeout = cls.services["timeout"] + while True: + time.sleep(cls.services["sleep"]) + hosts_states = Host.list( + cls.api_client, + id=host.id, + listall=True + ) + if hosts_states[0].resourcestate == 'PrepareForMaintenance': + # Wait for sometimetill host goes in maintenance state + time.sleep(cls.services["sleep"]) + elif hosts_states[0].resourcestate == 'Maintenance': + time.sleep(cls.services["sleep"]) + break + elif timeout == 0: + raise unittest.SkipTest( + "Failed to enable maintenance mode on %s" % host.name) + timeout = timeout - 1 + + cls._cleanup = [ + cls.service_offering, + cls.vpc_off + ] + return + + @classmethod + def tearDownClass(cls): + try: + #Cleanup resources used + cleanup_resources(cls.api_client, cls._cleanup) + hosts = Host.list( + cls.api_client, + zoneid=cls.zone.id, + listall=True, + type='Routing' + ) + if isinstance(hosts, list): + for host in hosts: + Host.cancelMaintenance( + cls.api_client, + id=host.id + ) + hosts_states = Host.list( + cls.api_client, + id=host.id, + listall=True + ) + if hosts_states[0].resourcestate != 'Enabled': + raise Exception( + "Failed to cancel maintenance mode on %s" % (host.name)) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + def setUp(self): + self.apiclient = self.testClient.getApiClient() + self.dbclient = self.testClient.getDbConnection() + self.account = Account.create( + self.apiclient, + self.services["account"], + admin=True, + domainid=self.domain.id + ) + self.cleanup = [self.account] + return + + def tearDown(self): + try: + #Clean up, terminate the created network offerings + cleanup_resources(self.apiclient, self.cleanup) + interval = list_configurations( + self.apiclient, + name='network.gc.interval' + ) + wait = list_configurations( + self.apiclient, + name='network.gc.wait' + ) + # Sleep to ensure that all resources are deleted + time.sleep(int(interval[0].value) + int(wait[0].value)) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + def validate_vpc_offering(self, vpc_offering): + """Validates the VPC offering""" + + self.debug("Check if the VPC offering is created successfully?") + vpc_offs = VpcOffering.list( + self.apiclient, + id=vpc_offering.id + ) + self.assertEqual( + isinstance(vpc_offs, list), + True, + "List VPC offerings should return a valid list" + ) + self.assertEqual( + vpc_offering.name, + vpc_offs[0].name, + "Name of the VPC offering should match with listVPCOff data" + ) + self.debug( + "VPC offering is created successfully - %s" % + vpc_offering.name) + return + + def validate_vpc_network(self, network, state=None): + """Validates the VPC network""" + + self.debug("Check if the VPC network is created successfully?") + vpc_networks = VPC.list( + self.apiclient, + id=network.id + ) + self.assertEqual( + isinstance(vpc_networks, list), + True, + "List VPC network should return a valid list" + ) + self.assertEqual( + network.name, + vpc_networks[0].name, + "Name of the VPC network should match with listVPC data" + ) + if state: + self.assertEqual( + vpc_networks[0].state, + state, + "VPC state should be '%s'" % state + ) + self.debug("VPC network validated - %s" % network.name) + return + + @attr(tags=["advanced", "intervlan"]) + def test_01_create_vpc_host_maintenance(self): + """ Test VPC when host is in maintenance mode + """ + + # Validate the following + # 1. Put the host in maintenance mode. + # 2. Attempt to Create a VPC with cidr - 10.1.1.1/16 + # 3. VPC will be created but will be in "Disabled" state + + self.debug("creating a VPC network in the account: %s" % + self.account.name) + self.services["vpc"]["cidr"] = '10.1.1.1/16' + vpc = VPC.create( + self.apiclient, + self.services["vpc"], + vpcofferingid=self.vpc_off.id, + zoneid=self.zone.id, + account=self.account.name, + domainid=self.account.domainid + ) + self.validate_vpc_network(vpc, state='Disabled') + return + + @attr(tags=["advanced", "intervlan"]) + def test_02_create_vpc_wait_gc(self): + """ Test VPC when host is in maintenance mode and wait till nw gc + """ + + # Validate the following + # 1. Put the host in maintenance mode. + # 2. Attempt to Create a VPC with cidr - 10.1.1.1/16 + # 3. Wait for the VPC GC thread to run. + # 3. VPC will be created but will be in "Disabled" state and should + # get deleted + + self.debug("creating a VPC network in the account: %s" % + self.account.name) + self.services["vpc"]["cidr"] = '10.1.1.1/16' + vpc = VPC.create( + self.apiclient, + self.services["vpc"], + vpcofferingid=self.vpc_off.id, + zoneid=self.zone.id, + account=self.account.name, + domainid=self.account.domainid + ) + self.validate_vpc_network(vpc, state='Disabled') + interval = list_configurations( + self.apiclient, + name='network.gc.interval' + ) + wait = list_configurations( + self.apiclient, + name='network.gc.wait' + ) + self.debug("Sleep till network gc thread runs..") + # Sleep to ensure that all resources are deleted + time.sleep(int(interval[0].value) + int(wait[0].value)) + vpcs = VPC.list( + self.apiclient, + id=vpc.id, + listall=True + ) + self.assertEqual( + vpcs, + None, + "List VPC should not return anything after network gc" + ) + return diff --git a/test/integration/component/test_vpc.py b/test/integration/component/test_vpc.py index 3fc0cc5a7e2..acf7a8eb2e3 100644 --- a/test/integration/component/test_vpc.py +++ b/test/integration/component/test_vpc.py @@ -18,16 +18,12 @@ """ Component tests for VPC functionality """ #Import Local Modules -import marvin -import unittest from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * from marvin.integration.lib.utils import * from marvin.integration.lib.base import * from marvin.integration.lib.common import * -from marvin.remoteSSHClient import remoteSSHClient -import datetime class Services: @@ -331,7 +327,7 @@ class TestVPC(cloudstackTestCase): @attr(tags=["advanced", "intervlan"]) def test_02_restart_vpc_with_networks(self): - """ Test restart VPC having with networks + """ Test restart VPC having networks """ # Validate the following @@ -2474,250 +2470,4 @@ class TestVPC(cloudstackTestCase): "Updation of VPC display text failed.") -class TestVPCHostMaintenance(cloudstackTestCase): - @classmethod - def setUpClass(cls): - cls.api_client = super( - TestVPCHostMaintenance, - cls - ).getClsTestClient().getApiClient() - cls.services = Services().services - # Get Zone, Domain and templates - cls.domain = get_domain(cls.api_client, cls.services) - cls.zone = get_zone(cls.api_client, cls.services) - cls.template = get_template( - cls.api_client, - cls.zone.id, - cls.services["ostype"] - ) - cls.services["virtual_machine"]["zoneid"] = cls.zone.id - cls.services["virtual_machine"]["template"] = cls.template.id - - cls.service_offering = ServiceOffering.create( - cls.api_client, - cls.services["service_offering"] - ) - cls.vpc_off = VpcOffering.create( - cls.api_client, - cls.services["vpc_offering"] - ) - cls.vpc_off.update(cls.api_client, state='Enabled') - hosts = Host.list( - cls.api_client, - zoneid=cls.zone.id, - listall=True, - type='Routing' - ) - - if isinstance(hosts, list): - for host in hosts: - Host.enableMaintenance( - cls.api_client, - id=host.id - ) - - timeout = cls.services["timeout"] - while True: - time.sleep(cls.services["sleep"]) - hosts_states = Host.list( - cls.api_client, - id=host.id, - listall=True - ) - if hosts_states[0].resourcestate == 'PrepareForMaintenance': - # Wait for sometimetill host goes in maintenance state - time.sleep(cls.services["sleep"]) - elif hosts_states[0].resourcestate == 'Maintenance': - time.sleep(cls.services["sleep"]) - break - elif timeout == 0: - raise unittest.SkipTest( - "Failed to enable maintenance mode on %s" % host.name) - timeout = timeout - 1 - - cls._cleanup = [ - cls.service_offering, - cls.vpc_off - ] - return - - @classmethod - def tearDownClass(cls): - try: - #Cleanup resources used - cleanup_resources(cls.api_client, cls._cleanup) - hosts = Host.list( - cls.api_client, - zoneid=cls.zone.id, - listall=True, - type='Routing' - ) - if isinstance(hosts, list): - for host in hosts: - Host.cancelMaintenance( - cls.api_client, - id=host.id - ) - hosts_states = Host.list( - cls.api_client, - id=host.id, - listall=True - ) - if hosts_states[0].resourcestate != 'Enabled': - raise Exception( - "Failed to cancel maintenance mode on %s" % (host.name)) - except Exception as e: - raise Exception("Warning: Exception during cleanup : %s" % e) - return - - def setUp(self): - self.apiclient = self.testClient.getApiClient() - self.dbclient = self.testClient.getDbConnection() - self.account = Account.create( - self.apiclient, - self.services["account"], - admin=True, - domainid=self.domain.id - ) - self.cleanup = [self.account] - return - - def tearDown(self): - try: - #Clean up, terminate the created network offerings - cleanup_resources(self.apiclient, self.cleanup) - interval = list_configurations( - self.apiclient, - name='network.gc.interval' - ) - wait = list_configurations( - self.apiclient, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - except Exception as e: - raise Exception("Warning: Exception during cleanup : %s" % e) - return - - def validate_vpc_offering(self, vpc_offering): - """Validates the VPC offering""" - - self.debug("Check if the VPC offering is created successfully?") - vpc_offs = VpcOffering.list( - self.apiclient, - id=vpc_offering.id - ) - self.assertEqual( - isinstance(vpc_offs, list), - True, - "List VPC offerings should return a valid list" - ) - self.assertEqual( - vpc_offering.name, - vpc_offs[0].name, - "Name of the VPC offering should match with listVPCOff data" - ) - self.debug( - "VPC offering is created successfully - %s" % - vpc_offering.name) - return - - def validate_vpc_network(self, network, state=None): - """Validates the VPC network""" - - self.debug("Check if the VPC network is created successfully?") - vpc_networks = VPC.list( - self.apiclient, - id=network.id - ) - self.assertEqual( - isinstance(vpc_networks, list), - True, - "List VPC network should return a valid list" - ) - self.assertEqual( - network.name, - vpc_networks[0].name, - "Name of the VPC network should match with listVPC data" - ) - if state: - self.assertEqual( - vpc_networks[0].state, - state, - "VPC state should be '%s'" % state - ) - self.debug("VPC network validated - %s" % network.name) - return - - @attr(tags=["advanced", "intervlan"]) - def test_01_create_vpc_host_maintenance(self): - """ Test VPC when host is in maintenance mode - """ - - # Validate the following - # 1. Put the host in maintenance mode. - # 2. Attempt to Create a VPC with cidr - 10.1.1.1/16 - # 3. VPC will be created but will be in "Disabled" state - - self.debug("creating a VPC network in the account: %s" % - self.account.name) - self.services["vpc"]["cidr"] = '10.1.1.1/16' - vpc = VPC.create( - self.apiclient, - self.services["vpc"], - vpcofferingid=self.vpc_off.id, - zoneid=self.zone.id, - account=self.account.name, - domainid=self.account.domainid - ) - self.validate_vpc_network(vpc, state='Disabled') - return - - @attr(tags=["advanced", "intervlan"]) - def test_02_create_vpc_wait_gc(self): - """ Test VPC when host is in maintenance mode and wait till nw gc - """ - - # Validate the following - # 1. Put the host in maintenance mode. - # 2. Attempt to Create a VPC with cidr - 10.1.1.1/16 - # 3. Wait for the VPC GC thread to run. - # 3. VPC will be created but will be in "Disabled" state and should - # get deleted - - self.debug("creating a VPC network in the account: %s" % - self.account.name) - self.services["vpc"]["cidr"] = '10.1.1.1/16' - vpc = VPC.create( - self.apiclient, - self.services["vpc"], - vpcofferingid=self.vpc_off.id, - zoneid=self.zone.id, - account=self.account.name, - domainid=self.account.domainid - ) - self.validate_vpc_network(vpc, state='Disabled') - interval = list_configurations( - self.apiclient, - name='network.gc.interval' - ) - wait = list_configurations( - self.apiclient, - name='network.gc.wait' - ) - self.debug("Sleep till network gc thread runs..") - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) - vpcs = VPC.list( - self.apiclient, - id=vpc.id, - listall=True - ) - self.assertEqual( - vpcs, - None, - "List VPC should not return anything after network gc" - ) - return