From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 10 Mar 2015 16:28:18 +0000 (+0100)
Subject: allow self signed certificates
X-Git-Tag: myslice-1.3~58^2~7
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=c87f5c0a32a23075ba4da344da1a4c93095c24e7

allow self signed certificates
---

diff --git a/manifoldapi/manifoldapi.py b/manifoldapi/manifoldapi.py
index a8b2ab9a..c6eea10a 100644
--- a/manifoldapi/manifoldapi.py
+++ b/manifoldapi/manifoldapi.py
@@ -1,5 +1,5 @@
 # Manifold API Python interface
-import copy, xmlrpclib
+import copy, xmlrpclib, ssl
 
 from myslice.configengine import ConfigEngine
 
@@ -41,7 +41,11 @@ class ManifoldAPI:
         self.calls = {}
         self.multicall = False
         self.url = ConfigEngine().manifold_url()
-        self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
+        
+        # Manifold uses a self signed certificate
+        # https://www.python.org/dev/peps/pep-0476/
+        context = ssl._create_unverified_context()
+        self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True, context=context)
 
     def __repr__ (self): return "ManifoldAPI[%s]"%self.url
 
diff --git a/portal/migrations/0012_initial.py b/portal/migrations/0012_initial.py
deleted file mode 100644
index 9b58fae3..00000000
--- a/portal/migrations/0012_initial.py
+++ /dev/null
@@ -1,189 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Institution'
-        db.create_table(u'portal_institution', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.TextField')()),
-        ))
-        db.send_create_signal(u'portal', ['Institution'])
-
-        # Adding model 'PendingUser'
-        db.create_table(u'portal_pendinguser', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('first_name', self.gf('django.db.models.fields.TextField')()),
-            ('last_name', self.gf('django.db.models.fields.TextField')()),
-            ('email', self.gf('django.db.models.fields.EmailField')(max_length=75)),
-            ('password', self.gf('django.db.models.fields.TextField')()),
-            ('user_hrn', self.gf('django.db.models.fields.TextField')()),
-            ('public_key', self.gf('django.db.models.fields.TextField')()),
-            ('private_key', self.gf('django.db.models.fields.TextField')()),
-            ('authority_hrn', self.gf('django.db.models.fields.TextField')()),
-            ('login', self.gf('django.db.models.fields.TextField')()),
-            ('pi', self.gf('django.db.models.fields.TextField')()),
-            ('email_hash', self.gf('django.db.models.fields.TextField')()),
-            ('status', self.gf('django.db.models.fields.TextField')()),
-            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'portal', ['PendingUser'])
-
-        # Adding model 'PendingAuthority'
-        db.create_table(u'portal_pendingauthority', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('site_name', self.gf('django.db.models.fields.TextField')()),
-            ('site_authority', self.gf('django.db.models.fields.TextField')()),
-            ('site_abbreviated_name', self.gf('django.db.models.fields.TextField')()),
-            ('site_url', self.gf('django.db.models.fields.TextField')()),
-            ('site_latitude', self.gf('django.db.models.fields.TextField')()),
-            ('site_longitude', self.gf('django.db.models.fields.TextField')()),
-            ('address_line1', self.gf('django.db.models.fields.TextField')()),
-            ('address_line2', self.gf('django.db.models.fields.TextField')()),
-            ('address_line3', self.gf('django.db.models.fields.TextField')()),
-            ('address_city', self.gf('django.db.models.fields.TextField')()),
-            ('address_postalcode', self.gf('django.db.models.fields.TextField')()),
-            ('address_state', self.gf('django.db.models.fields.TextField')()),
-            ('address_country', self.gf('django.db.models.fields.TextField')()),
-            ('authority_hrn', self.gf('django.db.models.fields.TextField')()),
-            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'portal', ['PendingAuthority'])
-
-        # Adding model 'PendingSlice'
-        db.create_table(u'portal_pendingslice', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('slice_name', self.gf('django.db.models.fields.TextField')()),
-            ('user_hrn', self.gf('django.db.models.fields.TextField')()),
-            ('authority_hrn', self.gf('django.db.models.fields.TextField')(null=True)),
-            ('number_of_nodes', self.gf('django.db.models.fields.TextField')(default=0)),
-            ('type_of_nodes', self.gf('django.db.models.fields.TextField')(default='NA')),
-            ('purpose', self.gf('django.db.models.fields.TextField')(default='NA')),
-            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'portal', ['PendingSlice'])
-
-        # Adding model 'PendingProject'
-        db.create_table(u'portal_pendingproject', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('project_name', self.gf('django.db.models.fields.TextField')()),
-            ('user_hrn', self.gf('django.db.models.fields.TextField')()),
-            ('email', self.gf('django.db.models.fields.TextField')()),
-            ('authority_hrn', self.gf('django.db.models.fields.TextField')(null=True)),
-            ('purpose', self.gf('django.db.models.fields.TextField')(default='NA')),
-            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'portal', ['PendingProject'])
-
-        # Adding model 'PendingJoin'
-        db.create_table(u'portal_pendingjoin', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user_hrn', self.gf('django.db.models.fields.TextField')()),
-            ('email', self.gf('django.db.models.fields.TextField')()),
-            ('project_name', self.gf('django.db.models.fields.TextField')(null=True)),
-            ('authority_hrn', self.gf('django.db.models.fields.TextField')()),
-            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'portal', ['PendingJoin'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Institution'
-        db.delete_table(u'portal_institution')
-
-        # Deleting model 'PendingUser'
-        db.delete_table(u'portal_pendinguser')
-
-        # Deleting model 'PendingAuthority'
-        db.delete_table(u'portal_pendingauthority')
-
-        # Deleting model 'PendingSlice'
-        db.delete_table(u'portal_pendingslice')
-
-        # Deleting model 'PendingProject'
-        db.delete_table(u'portal_pendingproject')
-
-        # Deleting model 'PendingJoin'
-        db.delete_table(u'portal_pendingjoin')
-
-
-    models = {
-        u'portal.institution': {
-            'Meta': {'object_name': 'Institution'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.TextField', [], {})
-        },
-        u'portal.pendingauthority': {
-            'Meta': {'object_name': 'PendingAuthority'},
-            'address_city': ('django.db.models.fields.TextField', [], {}),
-            'address_country': ('django.db.models.fields.TextField', [], {}),
-            'address_line1': ('django.db.models.fields.TextField', [], {}),
-            'address_line2': ('django.db.models.fields.TextField', [], {}),
-            'address_line3': ('django.db.models.fields.TextField', [], {}),
-            'address_postalcode': ('django.db.models.fields.TextField', [], {}),
-            'address_state': ('django.db.models.fields.TextField', [], {}),
-            'authority_hrn': ('django.db.models.fields.TextField', [], {}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'site_abbreviated_name': ('django.db.models.fields.TextField', [], {}),
-            'site_authority': ('django.db.models.fields.TextField', [], {}),
-            'site_latitude': ('django.db.models.fields.TextField', [], {}),
-            'site_longitude': ('django.db.models.fields.TextField', [], {}),
-            'site_name': ('django.db.models.fields.TextField', [], {}),
-            'site_url': ('django.db.models.fields.TextField', [], {})
-        },
-        u'portal.pendingjoin': {
-            'Meta': {'object_name': 'PendingJoin'},
-            'authority_hrn': ('django.db.models.fields.TextField', [], {}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.TextField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'project_name': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'user_hrn': ('django.db.models.fields.TextField', [], {})
-        },
-        u'portal.pendingproject': {
-            'Meta': {'object_name': 'PendingProject'},
-            'authority_hrn': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.TextField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'project_name': ('django.db.models.fields.TextField', [], {}),
-            'purpose': ('django.db.models.fields.TextField', [], {'default': "'NA'"}),
-            'user_hrn': ('django.db.models.fields.TextField', [], {})
-        },
-        u'portal.pendingslice': {
-            'Meta': {'object_name': 'PendingSlice'},
-            'authority_hrn': ('django.db.models.fields.TextField', [], {'null': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'number_of_nodes': ('django.db.models.fields.TextField', [], {'default': '0'}),
-            'purpose': ('django.db.models.fields.TextField', [], {'default': "'NA'"}),
-            'slice_name': ('django.db.models.fields.TextField', [], {}),
-            'type_of_nodes': ('django.db.models.fields.TextField', [], {'default': "'NA'"}),
-            'user_hrn': ('django.db.models.fields.TextField', [], {})
-        },
-        u'portal.pendinguser': {
-            'Meta': {'object_name': 'PendingUser'},
-            'authority_hrn': ('django.db.models.fields.TextField', [], {}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'email_hash': ('django.db.models.fields.TextField', [], {}),
-            'first_name': ('django.db.models.fields.TextField', [], {}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_name': ('django.db.models.fields.TextField', [], {}),
-            'login': ('django.db.models.fields.TextField', [], {}),
-            'password': ('django.db.models.fields.TextField', [], {}),
-            'pi': ('django.db.models.fields.TextField', [], {}),
-            'private_key': ('django.db.models.fields.TextField', [], {}),
-            'public_key': ('django.db.models.fields.TextField', [], {}),
-            'status': ('django.db.models.fields.TextField', [], {}),
-            'user_hrn': ('django.db.models.fields.TextField', [], {})
-        }
-    }
-
-    complete_apps = ['portal']
\ No newline at end of file