Merging trunk
This commit is contained in:
		
							
								
								
									
										1
									
								
								nova/tests/public_key/dummy.fingerprint
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								nova/tests/public_key/dummy.fingerprint
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
1c:87:d1:d9:32:fd:62:3c:78:2b:c0:ad:c0:15:88:df
 | 
			
		||||
							
								
								
									
										1
									
								
								nova/tests/public_key/dummy.pub
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								nova/tests/public_key/dummy.pub
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
ssh-dss AAAAB3NzaC1kc3MAAACBAMGJlY9XEIm2X234pdO5yFWMp2JuOQx8U0E815IVXhmKxYCBK9ZakgZOIQmPbXoGYyV+mziDPp6HJ0wKYLQxkwLEFr51fAZjWQvRss0SinURRuLkockDfGFtD4pYJthekr/rlqMKlBSDUSpGq8jUWW60UJ18FGooFpxR7ESqQRx/AAAAFQC96LRglaUeeP+E8U/yblEJocuiWwAAAIA3XiMR8Skiz/0aBm5K50SeQznQuMJTyzt9S9uaz5QZWiFu69hOyGSFGw8fqgxEkXFJIuHobQQpGYQubLW0NdaYRqyE/Vud3JUJUb8Texld6dz8vGemyB5d1YvtSeHIo8/BGv2msOqR3u5AZTaGCBD9DhpSGOKHEdNjTtvpPd8S8gAAAIBociGZ5jf09iHLVENhyXujJbxfGRPsyNTyARJfCOGl0oFV6hEzcQyw8U/ePwjgvjc2UizMWLl8tsb2FXKHRdc2v+ND3Us+XqKQ33X3ADP4FZ/+Oj213gMyhCmvFTP0u5FmHog9My4CB7YcIWRuUR42WlhQ2IfPvKwUoTk3R+T6Og== www-data@mk
 | 
			
		||||
@@ -354,6 +354,36 @@ class CloudTestCase(test.TestCase):
 | 
			
		||||
        self.assertTrue(filter(lambda k: k['keyName'] == 'test1', keys))
 | 
			
		||||
        self.assertTrue(filter(lambda k: k['keyName'] == 'test2', keys))
 | 
			
		||||
 | 
			
		||||
    def test_import_public_key(self):
 | 
			
		||||
        # test when user provides all values
 | 
			
		||||
        result1 = self.cloud.import_public_key(self.context,
 | 
			
		||||
                                               'testimportkey1',
 | 
			
		||||
                                               'mytestpubkey',
 | 
			
		||||
                                               'mytestfprint')
 | 
			
		||||
        self.assertTrue(result1)
 | 
			
		||||
        keydata = db.key_pair_get(self.context,
 | 
			
		||||
                                  self.context.user.id,
 | 
			
		||||
                                  'testimportkey1')
 | 
			
		||||
        self.assertEqual('mytestpubkey', keydata['public_key'])
 | 
			
		||||
        self.assertEqual('mytestfprint', keydata['fingerprint'])
 | 
			
		||||
        # test when user omits fingerprint
 | 
			
		||||
        pubkey_path = os.path.join(os.path.dirname(__file__), 'public_key')
 | 
			
		||||
        f = open(pubkey_path + '/dummy.pub', 'r')
 | 
			
		||||
        dummypub = f.readline().rstrip()
 | 
			
		||||
        f.close
 | 
			
		||||
        f = open(pubkey_path + '/dummy.fingerprint', 'r')
 | 
			
		||||
        dummyfprint = f.readline().rstrip()
 | 
			
		||||
        f.close
 | 
			
		||||
        result2 = self.cloud.import_public_key(self.context,
 | 
			
		||||
                                               'testimportkey2',
 | 
			
		||||
                                               dummypub)
 | 
			
		||||
        self.assertTrue(result2)
 | 
			
		||||
        keydata = db.key_pair_get(self.context,
 | 
			
		||||
                                  self.context.user.id,
 | 
			
		||||
                                  'testimportkey2')
 | 
			
		||||
        self.assertEqual(dummypub, keydata['public_key'])
 | 
			
		||||
        self.assertEqual(dummyfprint, keydata['fingerprint'])
 | 
			
		||||
 | 
			
		||||
    def test_delete_key_pair(self):
 | 
			
		||||
        self._create_key('test')
 | 
			
		||||
        self.cloud.delete_key_pair(self.context, 'test')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user