Levi 
								
							 
						 
						
							
							
								
							
							
	e6ec14dfe7  
						 
						
							
							
								
								
								Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api  
							
							
							
							
						 
						
							2017-05-13 12:22:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	edab311d62  
						 
						
							
							
								
								
								Fix memory MB to GB  
							
							
							
							
						 
						
							2017-05-13 17:32:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	85d3158dbd  
						 
						
							
							
								
								
								Fix order price  
							
							
							
							
						 
						
							2017-05-13 17:02:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	cee507e34f  
						 
						
							
							
								
								
								Update open_api/vms to include ssh_key and specs  
							
							
							
							
						 
						
							2017-05-13 15:50:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Noe 
								
							 
						 
						
							
							
								
							
							
	beb0a8926c  
						 
						
							
							
								
								
								Merge pull request  #237  from ungleich/add_config  
							
							... 
							
							
							
							
							Add config 
							
						 
						
							2017-05-13 13:48:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	752e11bcea  
						 
						
							
							
								
								
								Readded hostingplans  
							
							
							
							
						 
						
							2017-05-13 13:47:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	8017fbb90f  
						 
						
							
							
								
								
								Work on configuration  
							
							
							
							
						 
						
							2017-05-13 10:00:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	d8c8804cc4  
						 
						
							
							
								
								
								Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api  
							
							
							
							
						 
						
							2017-05-13 00:31:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	07dc04018f  
						 
						
							
							
								
								
								cleaned code  
							
							
							
							
						 
						
							2017-05-13 00:31:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	68c0a6cec6  
						 
						
							
							
								
								
								Merge pull request  #236  from ungleich/add_config  
							
							... 
							
							
							
							
							Readd configuration 
							
						 
						
							2017-05-13 00:29:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	75d93b2aad  
						 
						
							
							
								
								
								Add images as configuration  
							
							
							
							
						 
						
							2017-05-13 06:59:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	c816d280ee  
						 
						
							
							
								
								
								Remove opennebula_functions.py  
							
							
							
							
						 
						
							2017-05-13 05:52:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	cfaf201064  
						 
						
							
							
								
								
								Handle ConnectionException, add change_user_password  
							
							
							
							
						 
						
							2017-05-13 05:50:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Noe 
								
							 
						 
						
							
							
								
							
							
	8f3125d2f7  
						 
						
							
							
								
								
								Merge pull request  #235  from levivm/opennebula_api  
							
							... 
							
							
							
							
							Opennebula api 
							
						 
						
							2017-05-13 05:07:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	8980f6b2fc  
						 
						
							
							
								
								
								merged opnnebula api changes  
							
							
							
							
						 
						
							2017-05-12 12:13:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	130c00c8ee  
						 
						
							
							
								
								
								API Integration  
							
							... 
							
							
							
							
							Please review carefully. 
							
						 
						
							2017-05-12 12:07:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	3873540849  
						 
						
							
							
								
								
								Force user to generate ssh key in order to create a VM  #3147 . As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app  #3149  
							
							
							
							
						 
						
							2017-05-12 00:56:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	b7e8eceb25  
						 
						
							
							
								
								
								Add opennebula api urls and add delete vm api  
							
							
							
							
						 
						
							2017-05-11 17:39:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	358d70570a  
						 
						
							
							
								
								
								Add authentication  
							
							
							
							
						 
						
							2017-05-11 12:45:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	1a6e1a44d8  
						 
						
							
							
								
								
								fixing formatting  
							
							
							
							
						 
						
							2017-05-11 00:38:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	22798e29bf  
						 
						
							
							
								
								
								Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api  
							
							
							
							
						 
						
							2017-05-11 00:11:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	1f10f04a9d  
						 
						
							
							
								
								
								Fixed ssh key error, Now an existing user is not ask for his credit card again  
							
							
							
							
						 
						
							2017-05-11 00:11:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	ef00d676f5  
						 
						
							
							
								
								
								Access VirtualMachine via api!  
							
							... 
							
							
							
							
							Serialization of VirtualMachine objects now fully works 
							
						 
						
							2017-05-11 05:51:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	cbc13de34f  
						 
						
							
							
								
								
								Access VirtualMachineTemplates via api!  
							
							... 
							
							
							
							
							Serialization of VirtualMachineTemplates now fully works 
							
						 
						
							2017-05-11 04:05:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	5ed72bf4bf  
						 
						
							
							
								
								
								Change to ungleich/python-oca  
							
							... 
							
							
							
							
							The offical python-oca repo does not (yet) support all the funcions we
need. 
							
						 
						
							2017-05-11 04:03:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	746dfaa40d  
						 
						
							
							
								
								
								Merge branch 'serialize' into opennebula_api  
							
							
							
							
						 
						
							2017-05-10 13:26:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	4016dcfea9  
						 
						
							
							
								
								
								Merge branch 'calculate_price' into opennebula_api  
							
							
							
							
						 
						
							2017-05-10 13:25:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	d36a83c8ac  
						 
						
							
							
								
								
								Merge branch 'create_template' into opennebula_api  
							
							
							
							
						 
						
							2017-05-10 13:22:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	5861bec4a6  
						 
						
							
							
								
								
								Merge pull request  #234  from Modulos/create_vm  
							
							... 
							
							
							
							
							Create vm 
							
						 
						
							2017-05-09 23:33:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	ba0cc137bc  
						 
						
							
							
								
								
								Start serialization  
							
							
							
							
						 
						
							2017-05-10 04:06:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	f2a7ac258d  
						 
						
							
							
								
								
								Fix typo and add function description  
							
							
							
							
						 
						
							2017-05-10 02:49:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	c1a3f7281f  
						 
						
							
							
								
								
								Add calculate price function to template  
							
							
							
							
						 
						
							2017-05-10 02:36:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	b62819ae79  
						 
						
							
							
								
								
								Add create vm function  
							
							
							
							
						 
						
							2017-05-10 01:31:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	b052507134  
						 
						
							
							
								
								
								Add create template function  
							
							
							
							
						 
						
							2017-05-10 01:11:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	ec945cc31b  
						 
						
							
							
								
								
								Add ConnectionRefusedError exception  
							
							
							
							
						 
						
							2017-05-10 00:39:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	714849fb49  
						 
						
							
							
								
								
								Fix test_model_can_create_user  
							
							
							
							
						 
						
							2017-05-09 17:15:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	78294cb6a3  
						 
						
							
							
								
								
								Add inital migration  
							
							
							
							
						 
						
							2017-05-09 16:37:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	df777f384d  
						 
						
							
							
								
								
								Initial commit  
							
							... 
							
							
							
							
							Please Note:
This app is going to be developed in a TDD style. Please add test first
and then the corresponding code. This way we can be sure everything
works and it should help us coordinate our work. 
							
						 
						
							2017-05-09 16:33:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	987bf7ae2e  
						 
						
							
							
								
								
								Merge pull request  #229  from Modulos/fix_create_user  
							
							... 
							
							
							
							
							Fix _get_or_create_user 
							
						 
						
							2017-05-08 22:57:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	f1ae7e1014  
						 
						
							
							
								
								
								Fix _get_or_create_user  
							
							
							
							
						 
						
							2017-05-09 05:54:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	7cd2f1884d  
						 
						
							
							
								
								
								Merge pull request  #220  from Modulos/vm_bill  
							
							... 
							
							
							
							
							Vm bill 
							
						 
						
							2017-05-08 22:10:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	63052df6c9  
						 
						
							
							
								
								
								Change to new OpenNebula functions  
							
							
							
							
						 
						
							2017-05-09 05:05:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	d0fc0144e5  
						 
						
							
							
								
								
								Merge branch 'opennebula-integration' into vm_bill  
							
							
							
							
						 
						
							2017-05-09 04:56:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi Velázquez 
								
							 
						 
						
							
							
								
							
							
	31b7b37eb9  
						 
						
							
							
								
								
								Merge pull request  #227  from levivm/opennebula-integration  
							
							... 
							
							
							
							
							Opennebula integration 
							
						 
						
							2017-05-08 21:55:07 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	9a34518457  
						 
						
							
							
								
								
								attached opennebula vm id to virtualmachine plan  
							
							
							
							
						 
						
							2017-05-08 21:54:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Levi 
								
							 
						 
						
							
							
								
							
							
	abf6dbddce  
						 
						
							
							
								
								
								added create vm feature from a normal user in opennebula  
							
							
							
							
						 
						
							2017-05-08 21:49:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	6dedf3693e  
						 
						
							
							
								
								
								Change to use OpenNebulaManager  
							
							
							
							
						 
						
							2017-05-09 04:41:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	7010c76c72  
						 
						
							
							
								
								
								Add floatformat  
							
							
							
							
						 
						
							2017-05-09 04:41:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	38b2aa8986  
						 
						
							
							
								
								
								Create HostingBill obj when payment's successful  
							
							
							
							
						 
						
							2017-05-09 04:40:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Modulos 
								
							 
						 
						
							
							
								
							
							
	3ee075fad9  
						 
						
							
							
								
								
								Merge branch 'opennebula-integration' into vm_bill  
							
							
							
							
						 
						
							2017-05-09 04:04:53 +02:00