Add delete cluster
This commit is contained in:
parent
2a02fe76a6
commit
8061914517
|
@ -16,19 +16,15 @@
|
|||
# Copyright [2014] Hewlett-Packard Development Company, L.P.
|
||||
# limitations under the License.
|
||||
|
||||
import logging
|
||||
|
||||
from django.conf import settings
|
||||
from cueclient.v1 import client
|
||||
from keystoneclient import session as ksc_session
|
||||
from keystoneclient.auth.identity import v2
|
||||
|
||||
from collections import namedtuple
|
||||
from openstack_dashboard.api import base
|
||||
|
||||
from horizon.utils.memoized import memoized # noqa
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@memoized
|
||||
def cueclient(request):
|
||||
|
@ -42,7 +38,16 @@ def cueclient(request):
|
|||
|
||||
|
||||
def clusters_list(request, marker=None):
|
||||
return cueclient(request).clusters.list()
|
||||
#todo
|
||||
#This is needed because the cue client returns a dict
|
||||
#instead of a cluster object.
|
||||
clusters = []
|
||||
clusters_dict = cueclient(request).clusters.list()
|
||||
for cluster_dict in clusters_dict:
|
||||
clusters.append(namedtuple('Cluster', cluster_dict)
|
||||
(**cluster_dict))
|
||||
return clusters
|
||||
|
||||
def delete_cluster(request, marker=None):
|
||||
return cueclient(request).clusters.list()
|
||||
|
||||
def delete_cluster(request, cluster_id):
|
||||
return cueclient(request).clusters.delete(cluster_id)
|
|
@ -16,16 +16,12 @@
|
|||
# Copyright [2014] Hewlett-Packard Development Company, L.P.
|
||||
# limitations under the License.
|
||||
|
||||
import logging
|
||||
from django.utils.translation import ungettext_lazy
|
||||
from django.utils.translation import ugettext as _
|
||||
from horizon import tables
|
||||
from cuedashboard import api
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class CreateQueue(tables.LinkAction):
|
||||
name = "create"
|
||||
verbose_name = _("Create Cluster")
|
||||
|
@ -56,7 +52,7 @@ class DeleteQueue(tables.BatchAction):
|
|||
icon = "off"
|
||||
|
||||
def action(self, request, obj_id):
|
||||
api.trove.instance_delete(request, obj_id)
|
||||
api.delete_cluster(request, obj_id)
|
||||
|
||||
|
||||
class QueuesTable(tables.DataTable):
|
||||
|
@ -67,13 +63,8 @@ class QueuesTable(tables.DataTable):
|
|||
flavor = tables.Column("flavor", verbose_name=_("Flavor"),)
|
||||
status = tables.Column("status", verbose_name=_("Status"))
|
||||
|
||||
def get_object_id(self, datum):
|
||||
LOG.info(type(datum))
|
||||
LOG.info(dir(datum))
|
||||
return None
|
||||
|
||||
class Meta:
|
||||
name = "queues"
|
||||
verbose_name = _("Queues")
|
||||
name = "clusters"
|
||||
verbose_name = _("Clusters")
|
||||
table_actions = (CreateQueue, DeleteQueue,)
|
||||
row_actions = (DeleteQueue,)
|
||||
|
|
Loading…
Reference in New Issue