Revision 83a61efa

b/kamaki/clients/tests.py
117 117
		self.servname2 = self.servname1+'_v2'
118 118
		self.flavorid = 1
119 119
		#servers have to be created at the begining...
120
		self.networks={}
121
		self.netname1 = 'net'+unicode(self.now)
120 122

  
121 123
		self.client = cyclades(url, token)
122 124
		pass
......
187 189
		self.networks[net['id']] = net
188 190
		return net
189 191

  
190
	def _delete_network(self, netid)
192
	def _delete_network(self, netid):
191 193
		self.client.delete_network(netid)
192 194

  
193 195
	def if_not_all(foo):
......
300 302
		self._test_set_firewall_profile()	
301 303
		print('...ok')
302 304

  
305
		sys.stdout.write(' test get_server_stats')
306
		self._test_get_server_stats()	
307
		print('...ok')
308

  
309
		self.network1 = self._create_network(self.netname1)
310

  
311
		sys.stdout.write(' test list_networks')
312
		self._test_list_networks()	
313
		print('...ok')
314

  
303 315
		sys.stdout.write(' test connect_server')
304 316
		self._test_connect_server()	
305 317
		print('...ok')
......
308 320
		self._test_list_server_nics()	
309 321
		print('...ok')
310 322

  
323

  
311 324
		"""Don't have auth for these:
312 325
		sys.stdout.write(' test delete_image')
313 326
		self._test_delete_image()
......
622 635
				print('\b ')
623 636
				fprofile = self.client.get_firewall_profile(self.server1['id'])
624 637

  
638
	@if_not_all
639
	def test_get_server_stats(self):
640
		self.server1 = self._create_server(self.servname1, self.flavorid, self.img)
641
		self._test_get_server_stats()
642

  
643
	def _test_get_server_stats(self):
644
		r = self.client.get_server_stats(self.server1['id'])
645
		for term in ('cpuBar', 'cpuTimeSeries', 'netBar', 'netTimeSeries', 'refresh'):
646
			self.assertTrue(r.has_key(term))
647

  
648
	@if_not_all
649
	def test_list_networks(self):
650
		self.network1 = self._create_network(self.netname1)
651
		self._test_list_networks()
652

  
653
	def _test_list_networks(self):
654
		r = self.client.list_networks()
655
		self.assertTrue(len(r)>1)
656
		ids = [net['id'] for net in r]
657
		names = [net['name'] for net in r]
658
		self.assertTrue('public' in ids)
659
		self.assertTrue('public' in names)
660
		self.assertTrue(self.network1['id'] in ids)
661
		self.assertTrue(self.network1['name'] in names)
662

  
663
		r = self.client.list_networks(detail=True)
664
		ids = [net['id'] for net in r]
665
		names = [net['name'] for net in r]
666
		for net in r:
667
			self.assertTrue(net['id'] in ids)
668
			self.assertTrue(net['name'] in names)
669
			for term in ('status', 'updated', 'created', 'servers'):
670
				self.assertTrue(term in net.keys())
671

  
625 672
	#untested tests from here:
626 673
	@if_not_all
627 674
	def test_connect_server(self):
628 675
		self.server1 = self._create_server(self.servname1, self.flavorid, self.img)
676
		self.network1 = self._create_network(self.netname1)
629 677
		self._test_connect_server()
630 678

  
631 679
	def _test_connect_server(self):
632
		newnet = self._create_network('mynet')
633
		self.client.connect_server(self.server1['id'], newnet['id'])
680
		self.client.connect_server(self.server1['id'], self.network1['id'])
634 681
		s1nics = self.list_server_nics(self.server1['id'])
635
		self.assertTrue(newnet['id'] in s1nics['id'])
682
		self.assertTrue(self.network1['id'] in s1nics['id'])
636 683

  
637 684
	@if_not_all
638 685
	def test_list_server_nics(self):
639 686
		"""Test list_server_nics"""
640 687
		self.server1 = self._create_server(self.servname1, self.flavorid, self.img)
688
		self.network1 = self._create_network(self.netname1)
641 689
		self._test_list_server_nics()
642 690

  
643 691
	def _test_list_server_nics(self):
......
646 694
		self.assertTrue(len0>0)
647 695
		self.assertTrue('public' in [net['id'] for net in r])
648 696

  
649
		newnet = self._create_network('mynet_list_nics')
650
		self.client.connect_server(self.server1['id'], newnet['id'])
697
		self.client.connect_server(self.server1['id'], self.network1['id'])
651 698
		r = self.client.list_server_nics(self.server1['id'])
652 699
		self.assertTrue(len(r)>len0)
653 700

  
654 701

  
702

  
655 703
	""" Don't have auth to test this
656 704
	@if_not_all
657 705
	def test_delete_image(self):

Also available in: Unified diff