diff --git a/docs/install.rst b/docs/install.rst index 0ab4d8549..cd08f7d98 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -139,12 +139,6 @@ tuskar-ui introduces one additional dependency - python-tuskarclient: pip install git+http://github.com/stackforge/python-tuskarclient.git -Finally, synchronize your local database: - -:: - - ./manage.py syncdb - Starting the app ---------------- diff --git a/local_settings.py.example b/local_settings.py.example index aa2922737..acc09d586 100644 --- a/local_settings.py.example +++ b/local_settings.py.example @@ -398,16 +398,3 @@ OVERCLOUD_CREDS = { 'tenant': 'admin', 'auth_url': 'http://localhost:5000/v2.0/', } - -# FIXME: configuration for dummy data -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': 'openstack_dashboard/dummydb.sqlite', - } -} - -# FIXME: configuration for dummy data -FIXTURE_DIRS = ( - 'openstack_dashboard/dashboards/infrastructure/fixtures/', -) diff --git a/tuskar_ui/api.py b/tuskar_ui/api.py index 610ac5b83..ced2cc669 100644 --- a/tuskar_ui/api.py +++ b/tuskar_ui/api.py @@ -30,8 +30,6 @@ from tuskarclient.v1 import client as tuskar_client from openstack_dashboard.api import base from openstack_dashboard.api import nova -import tuskar_ui.infrastructure.models as dummymodels - LOG = logging.getLogger(__name__) TUSKAR_ENDPOINT_URL = getattr(django.conf.settings, 'TUSKAR_ENDPOINT_URL') @@ -145,26 +143,6 @@ class Capacity(StringIdAPIResourceWrapper): """ _attrs = ['name', 'value', 'unit'] - @classmethod - def create(cls, request, **kwargs): - c = dummymodels.Capacity( - content_object=kwargs['content_object'], - name=kwargs['name'], - value=kwargs['value'], - unit=kwargs['unit']) - c.save() - return Capacity(c) - - @classmethod - def update(cls, request, **kwargs): - c = dummymodels.Capacity.objects.get(id=kwargs['capacity_id']) - c.content_object = kwargs['content_object'] - c.name = kwargs['name'] - c.value = kwargs['value'] - c.unit = kwargs['unit'] - c.save() - return cls(c) - # defines a random usage of capacity - API should probably be able to # determine usage of capacity based on capacity value and obejct_id @property @@ -290,25 +268,6 @@ class Node(StringIdAPIResourceWrapper): LOG.debug(exceptions.error_color(msg)) return None - @property - def vm_capacity(self): - if not hasattr(self, '_vm_capacity'): - try: - value = ( - dummymodels.ResourceClassFlavor.objects - .filter(resource_class__rack__node=self._apiresource) - .aggregate(django.db.models.Max("max_vms")) - ['max_vms__max'] - ) - except Exception: - value = _("Unable to retrieve vm capacity") - - vm_capacity = dummymodels.Capacity(name=_("Max VMs"), - value=value, - unit=_("VMs")) - self._vm_capacity = Capacity(vm_capacity) - return self._vm_capacity - @property # FIXME: just mock implementation, add proper one def running_instances(self): @@ -327,10 +286,7 @@ class Node(StringIdAPIResourceWrapper): @property def alerts(self): if not hasattr(self, '_alerts'): - self._alerts = [Alert(a) for a in - dummymodels.Alert.objects - .filter(object_type='node') - .filter(object_id=str(self.id))] + self._alerts = [] return self._alerts @property @@ -470,10 +426,7 @@ class Rack(StringIdAPIResourceWrapper): @property def alerts(self): if not hasattr(self, '_alerts'): - self._alerts = [Alert(a) for a in - dummymodels.Alert.objects - .filter(object_type='rack') - .filter(object_id=int(self.id))] + self._alerts = [] return self._alerts @property diff --git a/tuskar_ui/infrastructure/fixtures/initial_data.json b/tuskar_ui/infrastructure/fixtures/initial_data.json deleted file mode 100644 index ea529056c..000000000 --- a/tuskar_ui/infrastructure/fixtures/initial_data.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - {"pk": 1, "model": "infrastructure.alert", "fields": {"message": "Switch is not accessible.", "object_id": "1", "object_type": "rack", "time": "2011-09-01T13:20:30+03:00"}}, - {"pk": 2, "model": "infrastructure.alert", "fields": {"message": "Nova service is not running.", "object_id": "1", "object_type": "node", "time": "2011-09-01T13:20:30+03:00"}}, - {"pk": 3, "model": "infrastructure.alert", "fields": {"message": "Disk usage is over 90%.", "object_id": "1", "object_type": "node", "time": "2011-09-01T13:20:30+03:00"}} -] diff --git a/tuskar_ui/infrastructure/models.py b/tuskar_ui/infrastructure/models.py deleted file mode 100644 index 099183bdd..000000000 --- a/tuskar_ui/infrastructure/models.py +++ /dev/null @@ -1,26 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# FIXME: configuration for dummy data -from django.db import models - - -class Alert(models.Model): - class Meta: - db_table = 'infrastructure_alerts' - - object_id = models.CharField(max_length=50) - object_type = models.CharField(max_length=20) - message = models.CharField(max_length=250) - time = models.DateTimeField() diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html index 729727e26..efa0f2807 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html @@ -22,27 +22,3 @@ {% endblock breadcrumbs %} {% block name %}{{ node.name }}{% endblock %} - -{% block overall_usage %} - - - - - -
{% trans "Usage" %}: - {% if node.is_provisioned %} -
-
- {% else %} -
-
- {% endif %} -
-{% endblock %} diff --git a/tuskar_ui/test/api_tests/tuskar_tests.py b/tuskar_ui/test/api_tests/tuskar_tests.py index b65d0dbfe..ad900e80b 100644 --- a/tuskar_ui/test/api_tests/tuskar_tests.py +++ b/tuskar_ui/test/api_tests/tuskar_tests.py @@ -440,7 +440,7 @@ class TuskarApiTests(test.APITestCase): for rack in rc.aggregated_alerts: self.assertIsInstance(rack, api.Rack) - self.assertEquals(1, len(rc.aggregated_alerts)) + self.assertEquals(0, len(rc.aggregated_alerts)) def test_rack_list(self): racks = self.tuskarclient_racks.list() @@ -653,7 +653,7 @@ class TuskarApiTests(test.APITestCase): for node in rack.aggregated_alerts: self.assertIsInstance(node, api.Node) - self.assertEquals(1, len(rack.aggregated_alerts)) + self.assertEquals(0, len(rack.aggregated_alerts)) def test_flavor_create(self): flavor = self.tuskarclient_flavors.first()