projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8872: Fixups from code review.
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
computenode
/
driver
/
gce.py
diff --git
a/services/nodemanager/arvnodeman/computenode/driver/gce.py
b/services/nodemanager/arvnodeman/computenode/driver/gce.py
index c5bf0b8cda42d211adcfbb61ffb3d73f460a7830..b853f00a6728693cce4b855021e18bb35c869087 100644
(file)
--- a/
services/nodemanager/arvnodeman/computenode/driver/gce.py
+++ b/
services/nodemanager/arvnodeman/computenode/driver/gce.py
@@
-38,10
+38,6
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
self._disktype_links = {dt.name: self._object_link(dt)
for dt in self.real.ex_list_disktypes()}
self._disktype_links = {dt.name: self._object_link(dt)
for dt in self.real.ex_list_disktypes()}
- @staticmethod
- def _name_key(cloud_object):
- return cloud_object.name
-
@staticmethod
def _object_link(cloud_object):
return cloud_object.extra.get('selfLink')
@staticmethod
def _object_link(cloud_object):
return cloud_object.extra.get('selfLink')
@@
-64,9
+60,12
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
self.create_kwargs['ex_metadata']['sshKeys'] = (
'root:' + ssh_file.read().strip())
self.create_kwargs['ex_metadata']['sshKeys'] = (
'root:' + ssh_file.read().strip())
+ def create_cloud_name(self, arvados_node):
+ uuid_parts = arvados_node['uuid'].split('-', 2)
+ return 'compute-{parts[2]}-{parts[0]}'.format(parts=uuid_parts)
+
def arvados_create_kwargs(self, size, arvados_node):
def arvados_create_kwargs(self, size, arvados_node):
- cluster_id, _, node_id = arvados_node['uuid'].split('-')
- name = 'compute-{}-{}'.format(node_id, cluster_id)
+ name = self.create_cloud_name(arvados_node)
disks = [
{'autoDelete': True,
'boot': True,
disks = [
{'autoDelete': True,
'boot': True,
@@
-167,3
+166,7
@@
class ComputeNodeDriver(BaseComputeNodeDriver):
node.extra['metadata']['items'], 'booted_at'))
except KeyError:
return 0
node.extra['metadata']['items'], 'booted_at'))
except KeyError:
return 0
+
+ @classmethod
+ def node_id(cls, node):
+ return node.id