OpenStack support #114

JHaydock-Pro · 2018-02-12T14:07:08Z

This pull request intends to finalize OpenStack support for the cloud interface.

This pull also resolves #117, resolves #116 and resolves #73

…ion)

…able, preventing unauthorised access errors

… instead of popup

… loaded

tofu-rocketry

See comments.

Indents need standardising to spaces (some use tabs).

tofu-rocketry · 2018-02-28T14:16:11Z

README.md

@@ -7,6 +7,9 @@ python-cherrypy | 3.2.2
 python-ldap | 2.3.10
 python-jinja2 | 2.2.1
 python-websockify | 0.5.1
+python-keystoneauth |


Any particular version for these?

tofu-rocketry · 2018-02-28T14:16:49Z

README.md

@@ -48,3 +51,5 @@ And then navigate to:
 When running the webfrontend without Apache, you might have to manually launch websockify.

 `/usr/bin/websockify -v PORT --cert=CERT --key=KEY --target-config=TOKENDIR`
+
+*NOTE: You may also need to create a `sessions/` directory*


Where? Why?

tofu-rocketry · 2018-02-28T14:17:53Z

assets/js/machines/openstack/listmachines.js

-        loadingCount++;
-        console.log(loadingCount);
+        incrementLoadingCount();
+//        console.log("loadingCount: " + loadingCount)


Should this be removed if it's not being used?

tofu-rocketry · 2018-02-28T14:19:19Z

assets/js/machines/openstack/manage/create/pick-resources.js

-    $('#memory-input').val(flavorList['data'][i]['ram']);
-    $('#disk-output').val(flavorList['data'][i]['disk']);
-    $('#disk-input').val(flavorList['data'][i]['disk']);
+//    $('#cpu-output').val(flavorList['data'][i]['cpu']);


Commented out lines not removed?

tofu-rocketry · 2018-02-28T14:20:02Z

assets/js/machines/openstack/manage/create/pick-template.js

-        loadingCount++;
-        console.log(loadingCount);
+        incrementLoadingCount();
+//        console.log("loadingCount: " + loadingCount)


tofu-rocketry · 2018-02-28T14:20:06Z

assets/js/machines/openstack/manage/create/pick-template.js

-        loadingCount++;
-        console.log(loadingCount);
+        incrementLoadingCount();
+//	console.log("loadingCount: " + loadingCount)


tofu-rocketry · 2018-02-28T14:21:27Z

controllers/api/openstack/templatelist.py

@@ -15,6 +15,10 @@ def GET(self):
        username = cherrypy.request.cookie.get('fedid').value
        auth_string = cherrypy.request.cookie.get('session').value

+#	osDistro = ""


What's point of these comments?

tofu-rocketry · 2018-02-28T14:22:37Z

controllers/api/openstack/vm.py

-                min_count = json['count']
+                min_count = json['count'],
+                aq_archetype = json['archetype'],
+		aq_personality = json['personality'],


Mixed tabs and spaces!!!!! 👿

Arg! There's more of them further on!

tofu-rocketry · 2018-02-28T14:23:40Z

controllers/api/openstack/vm.py

@@ -29,7 +29,8 @@ def PUT(self):
        try:
 	    keyname = novaClient.keypairs.list()[0].name
 	except IndexError:
-	    raise cherrypy.HTTPError('400 You haven\'t got a keypair, you must have a keypair to create a VM.')
+#	    raise cherrypy.HTTPError('400 You haven\'t got a keypair, you must have a keypair to create a VM.')


If this is commented out (not removed?) what stops bad things happening?

tofu-rocketry · 2018-02-28T14:24:36Z

views/machines/index.html

+        <span id="SearchBlock" style="float:right; height:auto;">
+<!--
+            Search:
+            Ideally the search box should go here but i can't seem find it anywhere in this repo


Was there a search box before?

So, what's happening here?

I believe the search bar element is created by jquery in one of the min.js files (this one i think). This is near impossible to read, even after de-minifying it.

The element also does not have any IDs or unique classes which makes it very difficult to modify with JQuery and CSS.

The search bar is functional but is placed in a different location and under different parents to the other elements next to it (ie.the filter button and projects drop down). I'm not sure why this is and it is awkward for CSS.

Ok, sounds like you should record that as an issue.

…ected projects loading after switch

tofu-rocketry · 2018-05-24T08:37:17Z

assets/js/machines/openstack/manage/machine-create.js

+        } 
+
+        // Limit numbers of VMs created at once in unlimited quotas
+        if (data['count'] > count_limit && groupquotavm === -1) {


Shouldn't this be checked whether your group has an unlimited quota or not? You want to stop people from flooding the system accidentally.

The number of VMs is still limited by quota. I asked Alex about it, he was fine with people filling up their quotas in one go.

tofu-rocketry · 2018-05-24T08:40:59Z

controllers/api/openstack/quota.py

        if quotaData['groupquotacpu'] > -1:
            quotaData['availablequotacpu'] = quotaData['groupquotacpu'] - quotaData['groupusedcpu']
-        else:
-            quotaDataKeys.append('biggestCPUAmount')
+
        if quotaData['groupquotavm'] > -1:
            quotaData['availablequotavm'] = quotaData['groupquotavm'] - quotaData['groupusedvm']

        # Always appended as there's no disk quota - biggest disk size will always be required


This comment has drifted away from the line it applies to.

tofu-rocketry · 2018-05-24T08:46:36Z

controllers/api/openstack/vm.py


 	for flavor in novaClient.flavors.list(detailed = True):
-	    flavorInfo[flavor.name] = [flavor.vcpus, flavor.ram]
+	    flavorList[flavor.id] = {'name':str(flavor.name), 'vcpus':flavor.vcpus, 'ram':flavor.ram}
+        print flavorList


Why is there a sprinkling of print statements in this file rather than proper logging?

tofu-rocketry · 2018-05-24T08:47:30Z

controllers/api/openstack/vm.py

-                cherrypy.log(server.name + ' - NotFound Error for name matching FlavorID: ' + server.flavor[u'id'])
+                flavorName = flavorList[server.flavor['id']]['name']
+	    except Exception as ex:	
+                cherrypy.log('- ' + str(type(ex)) + ' when getting flavorName for VM: ' + str(server.name), username)


When logging, string substitution should be used rather than concatenation and should be done the way that is recommended for the Python logging module.

tofu-rocketry · 2018-05-24T08:55:27Z

controllers/api/openstack/vnc.py

+from getFunctions import getNovaInstance
+
+class VNC(object):
+    '''


Triple double quotes should be used around doctrings rather than single.

tofu-rocketry · 2018-05-24T09:06:43Z

views/home/faq.html

+    'id': 'pakiti',
+    'q':  'Why are Pakiti and rsyslog running on my VM?',
+    'a':  'These services are used for monitoring and security.
+           Please refrain from stopping or changing the behaviour of either of these service.


Should probably use a phrase that is stronger than just "refrain".

Maybe: "You must not stop or change the behaviour of..."

tofu-rocketry · 2018-05-24T09:09:44Z

views/machines/index.html

+        <span id="projectChoiceBlock" class="pull-right">
+            Current Project:
+            <select style="height:34px" id="projectChoice" class="btn btn-default btn-xs" onchange="makeAjaxCalls()"></select>
+           <!-- <div id="loading-project" class="loader"></div> -->


Why's this commented out?

tofu-rocketry · 2018-05-24T09:13:17Z

views/machines/index.html

-            <button type="button" class="btn btn-default" id="filter-button" title="Table Filters" onclick="filterTableDialog()"><span class="glyphicon glyphicon-cog"></span></button>
+<div style="height: 34px">
+        <button id="newMachine" type="button" class="btn btn-green" onclick="createVMdialog()" title="Create New Machine"
+        {% if cloudPlatform == "openstack" %}disabled=""{% endif %}>


This should probably be indented and the closing angle bracket dropped onto a newline to make it clear this is all one HTML tag.

tofu-rocketry · 2018-05-24T09:14:22Z

views/machines/index.html

+            <span>
+
+            <span id="loading-quota" style="display:none;">
+            &nbsp; Loading Quota: <div class="loader"></div>


The contents of all these span tags should be indented.

tofu-rocketry · 2018-05-24T09:15:21Z

views/machines/manage/rename.html

-            <div class="modal-body" style="text-align:center; margin-bottom:18px;">
-
+            <div class="modal-body">
+            <form id="renamevm" class="form-horizontal" role="form" action"/">


Can you sort the indentation out please?

gregcorbett · 2018-05-31T09:06:57Z

controllers/api/openstack/vm.py

+            # Aquilon
+            meta = {}
+
+            if (json['archetype'] != None) and (json['archetype'] != ''):


According to PEP8 (the style guide for Python code)

Comparisons to singletons like None should always be done with is or is not, never the equality operators.

gregcorbett · 2018-05-31T09:07:06Z

controllers/api/openstack/vm.py

+                meta['AQ_ARCHETYPE'] = json['archetype']
+                meta['AQ_PERSONALITY'] = json['personality']
+
+            if (json['sandbox'] != None) and (json['sandbox'] != ''):


gregcorbett · 2018-05-31T09:09:03Z

controllers/api/openstack/vm.py


 	for server in novaClient.servers.list(detailed = True):
-	    print server.name + " - " + server.status
+            cherrypy.log('- ' + server.name + ' - ' + server.status, username)


is there a mix of tabs and spaces around this line? The indentation looks 1 space to many to me in a side by side comparison but not when viewing the file as a whole.

gregcorbett · 2018-05-31T09:11:07Z

controllers/api/openstack/vm.py

@@ -158,6 +208,7 @@ def GET(self, action):
                'type'     : imageName,
                'candelete': True,
 		'keypair'  : server.key_name,
+                'aquilon'  : aquilon,


again, this indentation looks 'wonky' in a side by side comparison view but not when viewing the file as a whole...

gregcorbett · 2018-05-31T09:17:13Z

I echo Adrian's comments about logging and string substitution.

MRichards99 and others added 26 commits February 5, 2018 17:09

Fixed 'cloudPlatform' variable on home page

5f322df

Fixed TOS page crash

f1fc202

Fixed '$ is not defined error'

5b49aa1

Fixed Loading Status on Machines Page, also added openstack img to git

141dcab

4 or more buttons will now display as vertical list (eg. image select…

48f90e5

…ion)

projectChoice selection preserved on refresh

643affb

Keypair no longer required

b654396

Session preserved project will only autoload if it's in the data vari…

0e12384

…able, preventing unauthorised access errors

Removed or commented out leftover console.logs

d388021

Fixed history

943fc98

AQ metadata now imported

5e907b3

Log invalid image/flavour IDs instead of throwing exceptions and errors

170bbf9

Slightly improved README

65c0c28

Fixed UnboundLocalError in some projects

2776ede

Fixed template list

2104d05

Fixed template list, added loading wheel, GUI button opens in new tab…

9f17486

… instead of popup

Fixed faulty merge

1607cc7

Added Loading wheel to quota box

bee980b

Fixed ssh page errors caused by previous 'fix'

0fd5adc

Replaced Flavor slider with non-interactable bars, not perfect

0b9bbe2

Platform and CEPH links now open in new tab

74e5c1f

Slightly modified padding on flavor bars...I don't have much to do.

781c975

Search bar now aligins with project selector

098c07d

Made changes compatible with opennebula, just-in-case

2e6df4b

Resized loading wheel and disabled 'new machine' button until project…

081194b

… loaded

Realigned vnc icons and fixed newmachine remaining enabled on refresh

844b9a9

apdibbo requested review from jrha, gc-code and tofu-rocketry February 28, 2018 13:31

tofu-rocketry requested changes Feb 28, 2018

View reviewed changes

JHaydock-Pro added 14 commits May 10, 2018 13:31

Modified resource bars to include number of vms requested

e5853d6

Disabled create button until allowed flavor selected

a26452f

Removed old log line

9ad7101

Get selected project from cookies instead of session file

b6f22b9

improved loading functions

e381d02

Hide vmlist when switching projects

5a13592

Moved 500/504 errors into function

eab0358

reload vnc urls periodically

6f0352c

corrections to vnc refresh

2583f33

Renamed loading wheels

6c12b1e

Tooltip on newMachine button explaining when it will be enabled

4e0a8da

Set some GET requests to abort one a new one, stopping previously sel…

a4b9a4c

…ected projects loading after switch

Only run GET aborts on project switch

c458244

Tidied template descriptions

6c1d052

tofu-rocketry requested changes May 24, 2018

View reviewed changes

JHaydock-Pro added 3 commits May 30, 2018 16:45

Fixed Aquilon Metadata Upload & Added Metadata Download

13d23f7

Get AQ metadata from profile

f3ec569

Replaced tabs with spaces in python files

b655282

gregcorbett reviewed May 31, 2018

View reviewed changes

Minor style fixes

f1480ab

tofu-rocketry requested a review from frazzleuk May 31, 2018 09:48

Improved logging

6564ae6

tofu-rocketry approved these changes May 31, 2018

View reviewed changes

tofu-rocketry assigned apdibbo May 31, 2018

gregcorbett approved these changes May 31, 2018

View reviewed changes

jrha merged commit 295a8dd into stfc:master Jun 1, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OpenStack support #114

OpenStack support #114

JHaydock-Pro commented Feb 12, 2018 •

edited

Loading

tofu-rocketry left a comment

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Feb 28, 2018

tofu-rocketry Mar 26, 2018

JHaydock-Pro Apr 12, 2018

tofu-rocketry Apr 16, 2018

tofu-rocketry May 24, 2018

JHaydock-Pro May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

tofu-rocketry May 24, 2018

gregcorbett May 31, 2018

gregcorbett May 31, 2018

gregcorbett May 31, 2018 •

edited

Loading

gregcorbett May 31, 2018

gregcorbett commented May 31, 2018

OpenStack support #114

OpenStack support #114

Conversation

JHaydock-Pro commented Feb 12, 2018 • edited Loading

tofu-rocketry left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gregcorbett May 31, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gregcorbett commented May 31, 2018

JHaydock-Pro commented Feb 12, 2018 •

edited

Loading

gregcorbett May 31, 2018 •

edited

Loading