Removed OpenNebula code from the IndexView and code reformatted
This commit is contained in:
		
					parent
					
						
							
								f3cfe19e68
							
						
					
				
			
			
				commit
				
					
						1f58da70d4
					
				
			
		
					 1 changed files with 10 additions and 19 deletions
				
			
		|  | @ -1,7 +1,7 @@ | ||||||
| from django.views.generic import FormView, CreateView, TemplateView, DetailView | from django.views.generic import FormView, CreateView, TemplateView, DetailView | ||||||
| from django.http import HttpResponseRedirect | from django.http import HttpResponseRedirect | ||||||
| from .forms import BetaAccessForm | from .forms import BetaAccessForm | ||||||
| from .models import BetaAccess, BetaAccessVMType, BetaAccessVM | from .models import BetaAccess, BetaAccessVMType, BetaAccessVM, VMTemplate | ||||||
| from django.contrib import messages | from django.contrib import messages | ||||||
| from django.core.urlresolvers import reverse | from django.core.urlresolvers import reverse | ||||||
| from django.core.mail import EmailMessage | from django.core.mail import EmailMessage | ||||||
|  | @ -199,19 +199,10 @@ class IndexView(CreateView): | ||||||
|         for session_var in ['specs', 'user', 'billing_address_data']: |         for session_var in ['specs', 'user', 'billing_address_data']: | ||||||
|             if session_var in request.session: |             if session_var in request.session: | ||||||
|                 del request.session[session_var] |                 del request.session[session_var] | ||||||
|         try: | 
 | ||||||
|             manager = OpenNebulaManager() |         vm_templates = VMTemplate.objects.all() | ||||||
|             templates = manager.get_templates() |  | ||||||
|         context = { |         context = { | ||||||
|                 'templates': VirtualMachineTemplateSerializer(templates, many=True).data |             'templates': vm_templates | ||||||
|             } |  | ||||||
|         except: |  | ||||||
|             messages.error(request, |  | ||||||
|                            'We have a temporary problem to connect to our backend. \ |  | ||||||
|                            Please try again in a few minutes' |  | ||||||
|                            ) |  | ||||||
|             context = { |  | ||||||
|                 'error': 'connection' |  | ||||||
|         } |         } | ||||||
|         return render(request, self.template_name, context) |         return render(request, self.template_name, context) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue