From 1e80bfc7bd1f238a2e28a67e03fcab62e7ddc6df Mon Sep 17 00:00:00 2001 From: Dmitry Pyzhov Date: Thu, 29 Aug 2013 21:26:17 +0400 Subject: [PATCH] Update makesystem for fuel-main repo --- .gitmodules | 6 - Makefile | 1 + Vagrantfile | 80 - astute | 1 - bin/agent | 463 - bin/nailgun-agent.cron | 1 - bin/send2syslog.py | 498 - bootstrap/module.mk | 5 +- config.mk | 26 +- docs/.gitignore | 2 - docs/Makefile | 159 - docs/_templates/bootstrap/globaltoc.html | 4 - docs/_templates/bootstrap/layout.html | 134 - docs/_templates/bootstrap/localtoc.html | 5 - docs/_templates/bootstrap/relations.html | 8 - docs/_templates/bootstrap/searchbox.html | 7 - docs/_templates/bootstrap/sourcelink.html | 4 - .../bootstrap/static/bootstrap-responsive.css | 9 - .../bootstrap/static/bootstrap-sphinx.css_t | 24 - .../_templates/bootstrap/static/bootstrap.css | 9 - docs/_templates/bootstrap/static/bootstrap.js | 6 - .../static/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../static/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes docs/_templates/bootstrap/static/jquery.js | 4 - docs/_templates/bootstrap/theme.conf | 5 - docs/common_conf.py | 98 - docs/conf.py | 254 - docs/develop.rst | 14 - docs/develop/alternatives.rst | 121 - docs/develop/api_doc.rst | 70 - docs/develop/env.rst | 273 - docs/develop/logical_arch.rst | 87 - docs/develop/nailgun.rst | 9 - docs/develop/nailgun/partitions.rst | 176 - docs/develop/nailgun/reliability.rst | 66 - docs/develop/sequence.rst | 119 - docs/index.rst | 11 - docs/make.bat | 199 - docs/user.rst | 4 - fuel | 1 - gnupg/keyphrase | 1 - gnupg/pubring.gpg | Bin 1198 -> 0 bytes gnupg/random_seed | Bin 600 -> 0 bytes gnupg/secring.gpg | Bin 2575 -> 0 bytes gnupg/trustdb.gpg | Bin 1280 -> 0 bytes iso/module.mk | 18 +- mirror/eggs/module.mk | 7 +- mirror/gems/module.mk | 40 +- mirror/rhel/repo.mk | 14 +- mirror/src/module.mk | 13 +- nailgun/MANIFEST.in | 4 - nailgun/build.js | 24 - nailgun/examples/README | 2 - nailgun/examples/fake-target-mcollective.log | 309 - nailgun/fuel-cli/fuel | 1087 -- nailgun/manage.py | 164 - nailgun/module.mk | 25 - nailgun/nailgun/__init__.py | 13 - nailgun/nailgun/api/__init__.py | 13 - nailgun/nailgun/api/fields.py | 34 - nailgun/nailgun/api/handlers/__init__.py | 16 - nailgun/nailgun/api/handlers/base.py | 140 - nailgun/nailgun/api/handlers/cluster.py | 386 - nailgun/nailgun/api/handlers/disks.py | 119 - nailgun/nailgun/api/handlers/logs.py | 351 - .../api/handlers/network_configuration.py | 128 - nailgun/nailgun/api/handlers/node.py | 567 - nailgun/nailgun/api/handlers/notifications.py | 124 - nailgun/nailgun/api/handlers/orchestrator.py | 126 - nailgun/nailgun/api/handlers/plugin.py | 58 - nailgun/nailgun/api/handlers/redhat.py | 139 - nailgun/nailgun/api/handlers/registration.py | 46 - nailgun/nailgun/api/handlers/release.py | 122 - nailgun/nailgun/api/handlers/tasks.py | 98 - nailgun/nailgun/api/handlers/version.py | 39 - nailgun/nailgun/api/models.py | 850 -- nailgun/nailgun/api/serializers/__init__.py | 13 - nailgun/nailgun/api/serializers/base.py | 75 - .../api/serializers/network_configuration.py | 51 - nailgun/nailgun/api/urls.py | 162 - nailgun/nailgun/api/validators/__init__.py | 13 - nailgun/nailgun/api/validators/base.py | 50 - nailgun/nailgun/api/validators/cluster.py | 70 - .../api/validators/json_schema/__init__.py | 13 - .../api/validators/json_schema/disks.py | 55 - nailgun/nailgun/api/validators/network.py | 204 - nailgun/nailgun/api/validators/node.py | 227 - .../nailgun/api/validators/notification.py | 74 - nailgun/nailgun/api/validators/redhat.py | 46 - nailgun/nailgun/api/validators/release.py | 72 - nailgun/nailgun/autoapidoc.py | 75 - nailgun/nailgun/db.py | 106 - nailgun/nailgun/errors/__init__.py | 84 - nailgun/nailgun/errors/base.py | 66 - nailgun/nailgun/fixtures/__init__.py | 13 - nailgun/nailgun/fixtures/admin_network.json | 40 - nailgun/nailgun/fixtures/fixman.py | 203 - nailgun/nailgun/fixtures/openstack.json | 1081 -- .../nailgun/fixtures/sample_environment.json | 1146 -- .../nailgun/fixtures/start_notification.json | 11 - nailgun/nailgun/fsm/__init__.py | 13 - nailgun/nailgun/fsm/state_list.py | 26 - nailgun/nailgun/keepalive/__init__.py | 18 - nailgun/nailgun/keepalive/watcher.py | 84 - nailgun/nailgun/logger.py | 99 - nailgun/nailgun/network/__init__.py | 13 - nailgun/nailgun/network/manager.py | 850 -- nailgun/nailgun/network/topology.py | 49 - nailgun/nailgun/notifier.py | 56 - nailgun/nailgun/orchestrator/__init__.py | 13 - .../orchestrator/deployment_serializers.py | 467 - .../orchestrator/provisioning_serializers.py | 163 - nailgun/nailgun/plugin/__init__.py | 13 - nailgun/nailgun/plugin/fsm.py | 129 - nailgun/nailgun/plugin/manager.py | 65 - nailgun/nailgun/plugin/thread.py | 76 - nailgun/nailgun/rpc/__init__.py | 72 - nailgun/nailgun/rpc/receiver.py | 826 -- nailgun/nailgun/rpc/threaded.py | 70 - nailgun/nailgun/settings.py | 87 - nailgun/nailgun/settings.yaml | 327 - nailgun/nailgun/task/__init__.py | 13 - nailgun/nailgun/task/fake.py | 499 - nailgun/nailgun/task/helpers.py | 271 - nailgun/nailgun/task/manager.py | 541 - nailgun/nailgun/task/task.py | 713 -- nailgun/nailgun/test/__init__.py | 13 - nailgun/nailgun/test/base.py | 770 -- nailgun/nailgun/test/integration/__init__.py | 15 - .../test/integration/test_attributes.py | 199 - .../test/integration/test_changes_model.py | 192 - .../test/integration/test_charset_issues.py | 92 - .../test_cluster_changes_handler.py | 558 - .../test_cluster_collection_handlers.py | 237 - .../test/integration/test_cluster_handler.py | 229 - .../test/integration/test_db_refresh.py | 61 - .../test_deployment_error_handling.py | 139 - .../integration/test_fixture_uploading.py | 55 - .../test/integration/test_horizon_url.py | 60 - .../test/integration/test_keepalive.py | 60 - .../integration/test_network_configuration.py | 166 - .../test/integration/test_network_manager.py | 391 - .../test/integration/test_network_models.py | 197 - .../integration/test_network_validation.py | 166 - .../test_node_allocation_stats_handler.py | 48 - .../test_node_collection_handlers.py | 279 - .../test/integration/test_node_handler.py | 131 - .../integration/test_node_nic_assignment.py | 191 - .../test_node_nic_collection_handler.py | 53 - .../test/integration/test_notification.py | 165 - .../integration/test_orchestrator_handlers.py | 102 - .../test_orchestrator_serializer.py | 348 - .../nailgun/test/integration/test_plugin.py | 47 - .../test/integration/test_provisioning.py | 76 - .../nailgun/test/integration/test_redhat.py | 43 - .../test/integration/test_rpc_consumer.py | 701 -- .../test/integration/test_task_managers.py | 446 - .../test_verify_networks_task_manager.py | 104 - nailgun/nailgun/test/unit/__init__.py | 13 - .../test/unit/test_attributes_validator.py | 41 - .../test/unit/test_checknetworkstask.py | 42 - .../test/unit/test_cluster_validator.py | 59 - .../test/unit/test_fuel_key_handler.py | 43 - nailgun/nailgun/test/unit/test_handlers.py | 38 - .../nailgun/test/unit/test_logs_handlers.py | 452 - .../nailgun/test/unit/test_node_deletion.py | 70 - nailgun/nailgun/test/unit/test_node_disks.py | 535 - .../test/unit/test_node_nic_handler.py | 267 - .../test_notification_collection_handler.py | 109 - .../test/unit/test_notification_handler.py | 106 - .../unit/test_red_hat_account_validator.py | 57 - nailgun/nailgun/test/unit/test_redhat.py | 146 - .../unit/test_release_collection_handlers.py | 125 - .../nailgun/test/unit/test_release_handler.py | 50 - .../nailgun/test/unit/test_version_handler.py | 37 - nailgun/nailgun/unit_test.py | 36 - nailgun/nailgun/urls.py | 23 - nailgun/nailgun/volumes/__init__.py | 13 - nailgun/nailgun/volumes/manager.py | 805 -- nailgun/nailgun/webui/__init__.py | 13 - nailgun/nailgun/webui/handlers.py | 41 - nailgun/nailgun/webui/urls.py | 27 - nailgun/nailgun/wsgi.py | 112 - nailgun/run_tests.sh | 251 - nailgun/setup.py | 94 - nailgun/static/css/bootstrap.css | 6168 ----------- nailgun/static/css/fonticon.css | 87 - nailgun/static/css/main.css | 4436 -------- nailgun/static/favicon.ico | Bin 1150 -> 0 bytes nailgun/static/font/fontello.eot | Bin 12312 -> 0 bytes nailgun/static/font/fontello.svg | 44 - nailgun/static/font/fontello.ttf | Bin 12144 -> 0 bytes nailgun/static/font/fontello.woff | Bin 7664 -> 0 bytes nailgun/static/img/._icons.png | Bin 4096 -> 0 bytes nailgun/static/img/bg-main.png | Bin 4961 -> 0 bytes nailgun/static/img/cloud-loader.gif | Bin 23522 -> 0 bytes nailgun/static/img/cluster_logos.png | Bin 1749 -> 0 bytes nailgun/static/img/cogwheel_icon.png | Bin 982 -> 0 bytes nailgun/static/img/connect_1.png | Bin 1071 -> 0 bytes nailgun/static/img/connect_1_anim.gif | Bin 15596 -> 0 bytes nailgun/static/img/connect_2_anim.gif | Bin 10529 -> 0 bytes nailgun/static/img/connect_3.png | Bin 1072 -> 0 bytes nailgun/static/img/connect_3_anim.gif | Bin 16180 -> 0 bytes nailgun/static/img/create_cluster_icon.png | Bin 2730 -> 0 bytes nailgun/static/img/icons.png | Bin 1911 -> 0 bytes nailgun/static/img/mirantis-logo-small.png | Bin 9228 -> 0 bytes nailgun/static/img/mirantis-logo-small2.png | Bin 5321 -> 0 bytes nailgun/static/img/nav_bg.png | Bin 13113 -> 0 bytes nailgun/static/img/node-settings-icon.png | Bin 613 -> 0 bytes nailgun/static/img/node-small.png | Bin 2250 -> 0 bytes nailgun/static/img/node_image_outline.png | Bin 2316 -> 0 bytes .../static/img/node_manufacturer_logos.png | Bin 12226 -> 0 bytes nailgun/static/img/pending-flags.png | Bin 1347 -> 0 bytes nailgun/static/img/product-logo.png | Bin 2097 -> 0 bytes nailgun/static/img/radio_checkbox.png | Bin 1552 -> 0 bytes nailgun/static/img/router.png | Bin 2577 -> 0 bytes nailgun/static/img/support_icons.png | Bin 18878 -> 0 bytes nailgun/static/img/tab_icons.png | Bin 11285 -> 0 bytes nailgun/static/img/tab_icons@2x.png | Bin 28424 -> 0 bytes nailgun/static/img/texture.png | Bin 4867 -> 0 bytes nailgun/static/index.html | 30 - nailgun/static/js/app.js | 166 - nailgun/static/js/libs/autoNumeric.js | 1242 --- nailgun/static/js/libs/backbone.js | 1573 --- nailgun/static/js/libs/bootstrap.min.js | 6 - nailgun/static/js/libs/coccyx.js | 131 - nailgun/static/js/libs/jquery-1.9.1.js | 9597 ----------------- .../static/js/libs/jquery-ui-1.10.2.custom.js | 3523 ------ nailgun/static/js/libs/jquery.checkbox.js | 55 - nailgun/static/js/libs/jquery.timeout.js | 49 - nailgun/static/js/libs/lodash.js | 5217 --------- nailgun/static/js/libs/require.js | 35 - nailgun/static/js/libs/text.js | 332 - nailgun/static/js/main.js | 72 - nailgun/static/js/models.js | 590 - nailgun/static/js/utils.js | 107 - nailgun/static/js/views/cluster_page.js | 317 - .../js/views/cluster_page_tabs/actions_tab.js | 75 - .../cluster_page_tabs/healthcheck_tab.js | 222 - .../js/views/cluster_page_tabs/logs_tab.js | 306 - .../js/views/cluster_page_tabs/network_tab.js | 368 - .../js/views/cluster_page_tabs/nodes_tab.js | 1052 -- .../views/cluster_page_tabs/settings_tab.js | 154 - nailgun/static/js/views/clusters_page.js | 138 - nailgun/static/js/views/common.js | 295 - nailgun/static/js/views/dialogs.js | 699 -- nailgun/static/js/views/notifications_page.js | 68 - nailgun/static/js/views/releases_page.js | 120 - nailgun/static/js/views/support_page.js | 81 - .../templates/cluster/actions_popover.html | 37 - .../static/templates/cluster/actions_tab.html | 28 - .../templates/cluster/assign_roles_panel.html | 12 - .../templates/cluster/deployment_control.html | 19 - .../templates/cluster/deployment_result.html | 24 - .../templates/cluster/edit_node_disks.html | 27 - .../cluster/edit_node_interfaces.html | 28 - .../templates/cluster/healthcheck_tab.html | 33 - .../templates/cluster/healthcheck_tests.html | 50 - .../cluster/healthcheck_testset.html | 23 - .../static/templates/cluster/log_entry.html | 5 - .../static/templates/cluster/logs_tab.html | 82 - nailgun/static/templates/cluster/network.html | 110 - .../static/templates/cluster/network_tab.html | 48 - nailgun/static/templates/cluster/node.html | 58 - .../static/templates/cluster/node_disk.html | 60 - .../static/templates/cluster/node_group.html | 7 - .../templates/cluster/node_interface.html | 37 - .../static/templates/cluster/node_list.html | 31 - .../static/templates/cluster/node_status.html | 56 - .../cluster/nodes_management_panel.html | 35 - nailgun/static/templates/cluster/page.html | 19 - .../templates/cluster/settings_group.html | 49 - .../templates/cluster/settings_tab.html | 29 - .../cluster/verify_network_control.html | 64 - .../templates/cluster/volume_style.html | 8 - .../static/templates/clusters/cluster.html | 30 - nailgun/static/templates/clusters/new.html | 4 - nailgun/static/templates/clusters/page.html | 2 - .../static/templates/common/breadcrumb.html | 11 - nailgun/static/templates/common/footer.html | 7 - nailgun/static/templates/common/navbar.html | 16 - .../static/templates/common/nodes_stats.html | 14 - .../templates/common/notifications.html | 5 - .../common/notifications_popover.html | 21 - .../templates/common/rhel_credentials.html | 69 - .../dialogs/create_cluster_wizard.html | 25 - .../create_cluster_wizard/additional.html | 1 - .../create_cluster_wizard/compute.html | 23 - .../dialogs/create_cluster_wizard/mode.html | 28 - .../name_and_release.html | 24 - .../create_cluster_wizard/network.html | 23 - .../dialogs/create_cluster_wizard/ready.html | 1 - .../create_cluster_wizard/storage.html | 23 - .../templates/dialogs/delete_nodes.html | 11 - .../templates/dialogs/discard_changes.html | 24 - .../templates/dialogs/dismiss_settings.html | 16 - .../templates/dialogs/display_changes.html | 75 - .../templates/dialogs/error_message.html | 8 - .../templates/dialogs/remove_cluster.html | 18 - .../templates/dialogs/rhel_license.html | 14 - .../static/templates/dialogs/show_node.html | 84 - .../templates/dialogs/simple_message.html | 10 - .../templates/dialogs/update_interfaces.html | 46 - .../static/templates/notifications/list.html | 28 - nailgun/static/templates/release/list.html | 27 - nailgun/static/templates/release/release.html | 22 - nailgun/static/templates/support/page.html | 61 - nailgun/ui_tests/helpers.js | 134 - nailgun/ui_tests/sinon-server.js | 1550 --- nailgun/ui_tests/test_cluster_logs.js | 54 - nailgun/ui_tests/test_cluster_network.js | 364 - nailgun/ui_tests/test_cluster_settings.js | 72 - nailgun/ui_tests/test_clusters.js | 53 - nailgun/ui_tests/test_node_disk.js | 153 - nailgun/ui_tests/test_releases.js | 49 - naily/Gemfile | 3 - naily/Gemfile.lock | 43 - naily/bin/nailyd | 89 - naily/lib/naily.rb | 38 - naily/lib/naily/config.rb | 67 - naily/lib/naily/dispatcher.rb | 143 - naily/lib/naily/producer.rb | 33 - naily/lib/naily/reporter.rb | 49 - naily/lib/naily/server.rb | 139 - naily/lib/naily/version.rb | 17 - naily/lib/naily/worker.rb | 98 - naily/module.mk | 9 - naily/naily.gemspec | 24 - packages/eggs/module.mk | 64 +- packages/gems/module.mk | 42 +- packages/rpm/dhcp-checker/MANIFEST.in | 1 - packages/rpm/dhcp-checker/README.md | 23 - packages/rpm/dhcp-checker/Vagrantfile | 46 - .../rpm/dhcp-checker/dhcp_checker/__init__.py | 1 - packages/rpm/dhcp-checker/dhcp_checker/api.py | 106 - packages/rpm/dhcp-checker/dhcp_checker/cli.py | 49 - .../rpm/dhcp-checker/dhcp_checker/commands.py | 98 - .../rpm/dhcp-checker/dhcp_checker/utils.py | 140 - .../dhcp-checker/dhcp_checker/vlans_utils.py | 34 - packages/rpm/dhcp-checker/setup.py | 54 - .../rpm/dhcp-checker/test_env/dhcp_relay.conf | 6 - .../dhcp-checker/test_env/dhcpd.conf.sample | 12 - .../dhcp-checker/test_env/dhcpd.conf.sample2 | 12 - packages/rpm/dhcp-checker/test_env/epel.sh | 3 - .../rpm/dhcp-checker/test_env/epel_scapy.sh | 15 - .../rpm/dhcp-checker/test_env/mirantis.repo | 4 - .../rpm/dhcp-checker/test_env/test-requires | 1 - packages/rpm/dhcp-checker/test_env/tests.py | 87 - packages/rpm/dhcp-checker/tox.ini | 11 - packages/rpm/module.mk | 15 +- repos.mk | 32 + requirements-gems.txt | 67 +- rules.mk | 2 +- run_tests.sh | 3 + shotgun/bin/example.json | 56 - shotgun/bin/example.py | 33 - shotgun/draft/testing.py | 22 - shotgun/module.mk | 6 - shotgun/setup.py | 62 - shotgun/shotgun/__init__.py | 13 - shotgun/shotgun/config.py | 48 - shotgun/shotgun/driver.py | 196 - shotgun/shotgun/logger.py | 18 - shotgun/shotgun/manager.py | 42 - shotgun/shotgun/settings.py | 17 - shotgun/shotgun/test/__init__.py | 13 - shotgun/shotgun/test/test_config.py | 51 - shotgun/shotgun/utils.py | 72 - utils/git-helper/README.md | 33 + utils/git-helper/git_api.py | 232 + utils/git-helper/review.conf.template | 6 + utils/git-helper/review.py | 145 + utils/jenkins/common.sh | 8 +- utils/jenkins/fuelweb_fakeui.sh | 10 +- utils/jenkins/nailgun-docs.sh | 10 +- utils/jenkins/review-accept.sh | 13 +- utils/jenkins/review-request.sh | 14 +- rename.sh => utils/rename.sh | 0 378 files changed, 650 insertions(+), 71166 deletions(-) delete mode 100644 .gitmodules delete mode 100644 Vagrantfile delete mode 160000 astute delete mode 100755 bin/agent delete mode 100644 bin/nailgun-agent.cron delete mode 100755 bin/send2syslog.py delete mode 100644 docs/.gitignore delete mode 100644 docs/Makefile delete mode 100644 docs/_templates/bootstrap/globaltoc.html delete mode 100644 docs/_templates/bootstrap/layout.html delete mode 100644 docs/_templates/bootstrap/localtoc.html delete mode 100644 docs/_templates/bootstrap/relations.html delete mode 100644 docs/_templates/bootstrap/searchbox.html delete mode 100644 docs/_templates/bootstrap/sourcelink.html delete mode 100644 docs/_templates/bootstrap/static/bootstrap-responsive.css delete mode 100644 docs/_templates/bootstrap/static/bootstrap-sphinx.css_t delete mode 100644 docs/_templates/bootstrap/static/bootstrap.css delete mode 100644 docs/_templates/bootstrap/static/bootstrap.js delete mode 100644 docs/_templates/bootstrap/static/img/glyphicons-halflings-white.png delete mode 100644 docs/_templates/bootstrap/static/img/glyphicons-halflings.png delete mode 100644 docs/_templates/bootstrap/static/jquery.js delete mode 100644 docs/_templates/bootstrap/theme.conf delete mode 100644 docs/common_conf.py delete mode 100644 docs/conf.py delete mode 100644 docs/develop.rst delete mode 100644 docs/develop/alternatives.rst delete mode 100644 docs/develop/api_doc.rst delete mode 100644 docs/develop/env.rst delete mode 100644 docs/develop/logical_arch.rst delete mode 100644 docs/develop/nailgun.rst delete mode 100644 docs/develop/nailgun/partitions.rst delete mode 100644 docs/develop/nailgun/reliability.rst delete mode 100644 docs/develop/sequence.rst delete mode 100644 docs/index.rst delete mode 100644 docs/make.bat delete mode 100644 docs/user.rst delete mode 160000 fuel delete mode 100644 gnupg/keyphrase delete mode 100644 gnupg/pubring.gpg delete mode 100644 gnupg/random_seed delete mode 100644 gnupg/secring.gpg delete mode 100644 gnupg/trustdb.gpg delete mode 100644 nailgun/MANIFEST.in delete mode 100644 nailgun/build.js delete mode 100644 nailgun/examples/README delete mode 100644 nailgun/examples/fake-target-mcollective.log delete mode 100755 nailgun/fuel-cli/fuel delete mode 100755 nailgun/manage.py delete mode 100644 nailgun/module.mk delete mode 100644 nailgun/nailgun/__init__.py delete mode 100644 nailgun/nailgun/api/__init__.py delete mode 100644 nailgun/nailgun/api/fields.py delete mode 100644 nailgun/nailgun/api/handlers/__init__.py delete mode 100644 nailgun/nailgun/api/handlers/base.py delete mode 100644 nailgun/nailgun/api/handlers/cluster.py delete mode 100644 nailgun/nailgun/api/handlers/disks.py delete mode 100644 nailgun/nailgun/api/handlers/logs.py delete mode 100644 nailgun/nailgun/api/handlers/network_configuration.py delete mode 100644 nailgun/nailgun/api/handlers/node.py delete mode 100644 nailgun/nailgun/api/handlers/notifications.py delete mode 100644 nailgun/nailgun/api/handlers/orchestrator.py delete mode 100644 nailgun/nailgun/api/handlers/plugin.py delete mode 100644 nailgun/nailgun/api/handlers/redhat.py delete mode 100644 nailgun/nailgun/api/handlers/registration.py delete mode 100644 nailgun/nailgun/api/handlers/release.py delete mode 100644 nailgun/nailgun/api/handlers/tasks.py delete mode 100644 nailgun/nailgun/api/handlers/version.py delete mode 100644 nailgun/nailgun/api/models.py delete mode 100644 nailgun/nailgun/api/serializers/__init__.py delete mode 100644 nailgun/nailgun/api/serializers/base.py delete mode 100644 nailgun/nailgun/api/serializers/network_configuration.py delete mode 100644 nailgun/nailgun/api/urls.py delete mode 100644 nailgun/nailgun/api/validators/__init__.py delete mode 100644 nailgun/nailgun/api/validators/base.py delete mode 100644 nailgun/nailgun/api/validators/cluster.py delete mode 100644 nailgun/nailgun/api/validators/json_schema/__init__.py delete mode 100644 nailgun/nailgun/api/validators/json_schema/disks.py delete mode 100644 nailgun/nailgun/api/validators/network.py delete mode 100644 nailgun/nailgun/api/validators/node.py delete mode 100644 nailgun/nailgun/api/validators/notification.py delete mode 100644 nailgun/nailgun/api/validators/redhat.py delete mode 100644 nailgun/nailgun/api/validators/release.py delete mode 100644 nailgun/nailgun/autoapidoc.py delete mode 100644 nailgun/nailgun/db.py delete mode 100644 nailgun/nailgun/errors/__init__.py delete mode 100644 nailgun/nailgun/errors/base.py delete mode 100644 nailgun/nailgun/fixtures/__init__.py delete mode 100644 nailgun/nailgun/fixtures/admin_network.json delete mode 100644 nailgun/nailgun/fixtures/fixman.py delete mode 100644 nailgun/nailgun/fixtures/openstack.json delete mode 100644 nailgun/nailgun/fixtures/sample_environment.json delete mode 100644 nailgun/nailgun/fixtures/start_notification.json delete mode 100644 nailgun/nailgun/fsm/__init__.py delete mode 100644 nailgun/nailgun/fsm/state_list.py delete mode 100644 nailgun/nailgun/keepalive/__init__.py delete mode 100644 nailgun/nailgun/keepalive/watcher.py delete mode 100644 nailgun/nailgun/logger.py delete mode 100644 nailgun/nailgun/network/__init__.py delete mode 100644 nailgun/nailgun/network/manager.py delete mode 100644 nailgun/nailgun/network/topology.py delete mode 100644 nailgun/nailgun/notifier.py delete mode 100644 nailgun/nailgun/orchestrator/__init__.py delete mode 100644 nailgun/nailgun/orchestrator/deployment_serializers.py delete mode 100644 nailgun/nailgun/orchestrator/provisioning_serializers.py delete mode 100644 nailgun/nailgun/plugin/__init__.py delete mode 100644 nailgun/nailgun/plugin/fsm.py delete mode 100644 nailgun/nailgun/plugin/manager.py delete mode 100644 nailgun/nailgun/plugin/thread.py delete mode 100644 nailgun/nailgun/rpc/__init__.py delete mode 100644 nailgun/nailgun/rpc/receiver.py delete mode 100644 nailgun/nailgun/rpc/threaded.py delete mode 100644 nailgun/nailgun/settings.py delete mode 100644 nailgun/nailgun/settings.yaml delete mode 100644 nailgun/nailgun/task/__init__.py delete mode 100644 nailgun/nailgun/task/fake.py delete mode 100644 nailgun/nailgun/task/helpers.py delete mode 100644 nailgun/nailgun/task/manager.py delete mode 100644 nailgun/nailgun/task/task.py delete mode 100644 nailgun/nailgun/test/__init__.py delete mode 100644 nailgun/nailgun/test/base.py delete mode 100644 nailgun/nailgun/test/integration/__init__.py delete mode 100644 nailgun/nailgun/test/integration/test_attributes.py delete mode 100644 nailgun/nailgun/test/integration/test_changes_model.py delete mode 100644 nailgun/nailgun/test/integration/test_charset_issues.py delete mode 100644 nailgun/nailgun/test/integration/test_cluster_changes_handler.py delete mode 100644 nailgun/nailgun/test/integration/test_cluster_collection_handlers.py delete mode 100644 nailgun/nailgun/test/integration/test_cluster_handler.py delete mode 100644 nailgun/nailgun/test/integration/test_db_refresh.py delete mode 100644 nailgun/nailgun/test/integration/test_deployment_error_handling.py delete mode 100644 nailgun/nailgun/test/integration/test_fixture_uploading.py delete mode 100644 nailgun/nailgun/test/integration/test_horizon_url.py delete mode 100644 nailgun/nailgun/test/integration/test_keepalive.py delete mode 100644 nailgun/nailgun/test/integration/test_network_configuration.py delete mode 100644 nailgun/nailgun/test/integration/test_network_manager.py delete mode 100644 nailgun/nailgun/test/integration/test_network_models.py delete mode 100644 nailgun/nailgun/test/integration/test_network_validation.py delete mode 100644 nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py delete mode 100644 nailgun/nailgun/test/integration/test_node_collection_handlers.py delete mode 100644 nailgun/nailgun/test/integration/test_node_handler.py delete mode 100644 nailgun/nailgun/test/integration/test_node_nic_assignment.py delete mode 100644 nailgun/nailgun/test/integration/test_node_nic_collection_handler.py delete mode 100644 nailgun/nailgun/test/integration/test_notification.py delete mode 100644 nailgun/nailgun/test/integration/test_orchestrator_handlers.py delete mode 100644 nailgun/nailgun/test/integration/test_orchestrator_serializer.py delete mode 100644 nailgun/nailgun/test/integration/test_plugin.py delete mode 100644 nailgun/nailgun/test/integration/test_provisioning.py delete mode 100644 nailgun/nailgun/test/integration/test_redhat.py delete mode 100644 nailgun/nailgun/test/integration/test_rpc_consumer.py delete mode 100644 nailgun/nailgun/test/integration/test_task_managers.py delete mode 100644 nailgun/nailgun/test/integration/test_verify_networks_task_manager.py delete mode 100644 nailgun/nailgun/test/unit/__init__.py delete mode 100644 nailgun/nailgun/test/unit/test_attributes_validator.py delete mode 100644 nailgun/nailgun/test/unit/test_checknetworkstask.py delete mode 100644 nailgun/nailgun/test/unit/test_cluster_validator.py delete mode 100644 nailgun/nailgun/test/unit/test_fuel_key_handler.py delete mode 100644 nailgun/nailgun/test/unit/test_handlers.py delete mode 100644 nailgun/nailgun/test/unit/test_logs_handlers.py delete mode 100644 nailgun/nailgun/test/unit/test_node_deletion.py delete mode 100644 nailgun/nailgun/test/unit/test_node_disks.py delete mode 100644 nailgun/nailgun/test/unit/test_node_nic_handler.py delete mode 100644 nailgun/nailgun/test/unit/test_notification_collection_handler.py delete mode 100644 nailgun/nailgun/test/unit/test_notification_handler.py delete mode 100644 nailgun/nailgun/test/unit/test_red_hat_account_validator.py delete mode 100644 nailgun/nailgun/test/unit/test_redhat.py delete mode 100644 nailgun/nailgun/test/unit/test_release_collection_handlers.py delete mode 100644 nailgun/nailgun/test/unit/test_release_handler.py delete mode 100644 nailgun/nailgun/test/unit/test_version_handler.py delete mode 100644 nailgun/nailgun/unit_test.py delete mode 100644 nailgun/nailgun/urls.py delete mode 100644 nailgun/nailgun/volumes/__init__.py delete mode 100644 nailgun/nailgun/volumes/manager.py delete mode 100644 nailgun/nailgun/webui/__init__.py delete mode 100644 nailgun/nailgun/webui/handlers.py delete mode 100644 nailgun/nailgun/webui/urls.py delete mode 100644 nailgun/nailgun/wsgi.py delete mode 100755 nailgun/run_tests.sh delete mode 100644 nailgun/setup.py delete mode 100755 nailgun/static/css/bootstrap.css delete mode 100644 nailgun/static/css/fonticon.css delete mode 100755 nailgun/static/css/main.css delete mode 100755 nailgun/static/favicon.ico delete mode 100644 nailgun/static/font/fontello.eot delete mode 100644 nailgun/static/font/fontello.svg delete mode 100644 nailgun/static/font/fontello.ttf delete mode 100644 nailgun/static/font/fontello.woff delete mode 100755 nailgun/static/img/._icons.png delete mode 100644 nailgun/static/img/bg-main.png delete mode 100644 nailgun/static/img/cloud-loader.gif delete mode 100644 nailgun/static/img/cluster_logos.png delete mode 100755 nailgun/static/img/cogwheel_icon.png delete mode 100644 nailgun/static/img/connect_1.png delete mode 100644 nailgun/static/img/connect_1_anim.gif delete mode 100644 nailgun/static/img/connect_2_anim.gif delete mode 100644 nailgun/static/img/connect_3.png delete mode 100644 nailgun/static/img/connect_3_anim.gif delete mode 100644 nailgun/static/img/create_cluster_icon.png delete mode 100755 nailgun/static/img/icons.png delete mode 100644 nailgun/static/img/mirantis-logo-small.png delete mode 100755 nailgun/static/img/mirantis-logo-small2.png delete mode 100644 nailgun/static/img/nav_bg.png delete mode 100755 nailgun/static/img/node-settings-icon.png delete mode 100644 nailgun/static/img/node-small.png delete mode 100644 nailgun/static/img/node_image_outline.png delete mode 100644 nailgun/static/img/node_manufacturer_logos.png delete mode 100644 nailgun/static/img/pending-flags.png delete mode 100644 nailgun/static/img/product-logo.png delete mode 100644 nailgun/static/img/radio_checkbox.png delete mode 100644 nailgun/static/img/router.png delete mode 100755 nailgun/static/img/support_icons.png delete mode 100644 nailgun/static/img/tab_icons.png delete mode 100755 nailgun/static/img/tab_icons@2x.png delete mode 100755 nailgun/static/img/texture.png delete mode 100755 nailgun/static/index.html delete mode 100644 nailgun/static/js/app.js delete mode 100644 nailgun/static/js/libs/autoNumeric.js delete mode 100644 nailgun/static/js/libs/backbone.js delete mode 100644 nailgun/static/js/libs/bootstrap.min.js delete mode 100644 nailgun/static/js/libs/coccyx.js delete mode 100644 nailgun/static/js/libs/jquery-1.9.1.js delete mode 100644 nailgun/static/js/libs/jquery-ui-1.10.2.custom.js delete mode 100644 nailgun/static/js/libs/jquery.checkbox.js delete mode 100644 nailgun/static/js/libs/jquery.timeout.js delete mode 100644 nailgun/static/js/libs/lodash.js delete mode 100644 nailgun/static/js/libs/require.js delete mode 100644 nailgun/static/js/libs/text.js delete mode 100644 nailgun/static/js/main.js delete mode 100644 nailgun/static/js/models.js delete mode 100644 nailgun/static/js/utils.js delete mode 100644 nailgun/static/js/views/cluster_page.js delete mode 100644 nailgun/static/js/views/cluster_page_tabs/actions_tab.js delete mode 100644 nailgun/static/js/views/cluster_page_tabs/healthcheck_tab.js delete mode 100644 nailgun/static/js/views/cluster_page_tabs/logs_tab.js delete mode 100644 nailgun/static/js/views/cluster_page_tabs/network_tab.js delete mode 100644 nailgun/static/js/views/cluster_page_tabs/nodes_tab.js delete mode 100644 nailgun/static/js/views/cluster_page_tabs/settings_tab.js delete mode 100644 nailgun/static/js/views/clusters_page.js delete mode 100644 nailgun/static/js/views/common.js delete mode 100644 nailgun/static/js/views/dialogs.js delete mode 100644 nailgun/static/js/views/notifications_page.js delete mode 100644 nailgun/static/js/views/releases_page.js delete mode 100644 nailgun/static/js/views/support_page.js delete mode 100644 nailgun/static/templates/cluster/actions_popover.html delete mode 100755 nailgun/static/templates/cluster/actions_tab.html delete mode 100755 nailgun/static/templates/cluster/assign_roles_panel.html delete mode 100755 nailgun/static/templates/cluster/deployment_control.html delete mode 100644 nailgun/static/templates/cluster/deployment_result.html delete mode 100644 nailgun/static/templates/cluster/edit_node_disks.html delete mode 100644 nailgun/static/templates/cluster/edit_node_interfaces.html delete mode 100755 nailgun/static/templates/cluster/healthcheck_tab.html delete mode 100644 nailgun/static/templates/cluster/healthcheck_tests.html delete mode 100644 nailgun/static/templates/cluster/healthcheck_testset.html delete mode 100644 nailgun/static/templates/cluster/log_entry.html delete mode 100644 nailgun/static/templates/cluster/logs_tab.html delete mode 100644 nailgun/static/templates/cluster/network.html delete mode 100644 nailgun/static/templates/cluster/network_tab.html delete mode 100755 nailgun/static/templates/cluster/node.html delete mode 100644 nailgun/static/templates/cluster/node_disk.html delete mode 100644 nailgun/static/templates/cluster/node_group.html delete mode 100644 nailgun/static/templates/cluster/node_interface.html delete mode 100755 nailgun/static/templates/cluster/node_list.html delete mode 100644 nailgun/static/templates/cluster/node_status.html delete mode 100644 nailgun/static/templates/cluster/nodes_management_panel.html delete mode 100755 nailgun/static/templates/cluster/page.html delete mode 100644 nailgun/static/templates/cluster/settings_group.html delete mode 100755 nailgun/static/templates/cluster/settings_tab.html delete mode 100644 nailgun/static/templates/cluster/verify_network_control.html delete mode 100644 nailgun/static/templates/cluster/volume_style.html delete mode 100755 nailgun/static/templates/clusters/cluster.html delete mode 100644 nailgun/static/templates/clusters/new.html delete mode 100755 nailgun/static/templates/clusters/page.html delete mode 100644 nailgun/static/templates/common/breadcrumb.html delete mode 100644 nailgun/static/templates/common/footer.html delete mode 100755 nailgun/static/templates/common/navbar.html delete mode 100644 nailgun/static/templates/common/nodes_stats.html delete mode 100755 nailgun/static/templates/common/notifications.html delete mode 100755 nailgun/static/templates/common/notifications_popover.html delete mode 100644 nailgun/static/templates/common/rhel_credentials.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard/additional.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard/compute.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard/mode.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard/name_and_release.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard/network.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard/ready.html delete mode 100644 nailgun/static/templates/dialogs/create_cluster_wizard/storage.html delete mode 100644 nailgun/static/templates/dialogs/delete_nodes.html delete mode 100644 nailgun/static/templates/dialogs/discard_changes.html delete mode 100644 nailgun/static/templates/dialogs/dismiss_settings.html delete mode 100644 nailgun/static/templates/dialogs/display_changes.html delete mode 100644 nailgun/static/templates/dialogs/error_message.html delete mode 100644 nailgun/static/templates/dialogs/remove_cluster.html delete mode 100755 nailgun/static/templates/dialogs/rhel_license.html delete mode 100644 nailgun/static/templates/dialogs/show_node.html delete mode 100644 nailgun/static/templates/dialogs/simple_message.html delete mode 100644 nailgun/static/templates/dialogs/update_interfaces.html delete mode 100755 nailgun/static/templates/notifications/list.html delete mode 100644 nailgun/static/templates/release/list.html delete mode 100755 nailgun/static/templates/release/release.html delete mode 100755 nailgun/static/templates/support/page.html delete mode 100644 nailgun/ui_tests/helpers.js delete mode 100644 nailgun/ui_tests/sinon-server.js delete mode 100644 nailgun/ui_tests/test_cluster_logs.js delete mode 100644 nailgun/ui_tests/test_cluster_network.js delete mode 100644 nailgun/ui_tests/test_cluster_settings.js delete mode 100644 nailgun/ui_tests/test_clusters.js delete mode 100644 nailgun/ui_tests/test_node_disk.js delete mode 100644 nailgun/ui_tests/test_releases.js delete mode 100644 naily/Gemfile delete mode 100644 naily/Gemfile.lock delete mode 100755 naily/bin/nailyd delete mode 100644 naily/lib/naily.rb delete mode 100644 naily/lib/naily/config.rb delete mode 100644 naily/lib/naily/dispatcher.rb delete mode 100644 naily/lib/naily/producer.rb delete mode 100644 naily/lib/naily/reporter.rb delete mode 100644 naily/lib/naily/server.rb delete mode 100644 naily/lib/naily/version.rb delete mode 100644 naily/lib/naily/worker.rb delete mode 100644 naily/module.mk delete mode 100644 naily/naily.gemspec delete mode 100644 packages/rpm/dhcp-checker/MANIFEST.in delete mode 100644 packages/rpm/dhcp-checker/README.md delete mode 100644 packages/rpm/dhcp-checker/Vagrantfile delete mode 100644 packages/rpm/dhcp-checker/dhcp_checker/__init__.py delete mode 100644 packages/rpm/dhcp-checker/dhcp_checker/api.py delete mode 100644 packages/rpm/dhcp-checker/dhcp_checker/cli.py delete mode 100644 packages/rpm/dhcp-checker/dhcp_checker/commands.py delete mode 100644 packages/rpm/dhcp-checker/dhcp_checker/utils.py delete mode 100644 packages/rpm/dhcp-checker/dhcp_checker/vlans_utils.py delete mode 100644 packages/rpm/dhcp-checker/setup.py delete mode 100644 packages/rpm/dhcp-checker/test_env/dhcp_relay.conf delete mode 100644 packages/rpm/dhcp-checker/test_env/dhcpd.conf.sample delete mode 100644 packages/rpm/dhcp-checker/test_env/dhcpd.conf.sample2 delete mode 100644 packages/rpm/dhcp-checker/test_env/epel.sh delete mode 100644 packages/rpm/dhcp-checker/test_env/epel_scapy.sh delete mode 100644 packages/rpm/dhcp-checker/test_env/mirantis.repo delete mode 100644 packages/rpm/dhcp-checker/test_env/test-requires delete mode 100644 packages/rpm/dhcp-checker/test_env/tests.py delete mode 100644 packages/rpm/dhcp-checker/tox.ini create mode 100644 repos.mk create mode 100755 run_tests.sh delete mode 100644 shotgun/bin/example.json delete mode 100644 shotgun/bin/example.py delete mode 100644 shotgun/draft/testing.py delete mode 100644 shotgun/module.mk delete mode 100644 shotgun/setup.py delete mode 100644 shotgun/shotgun/__init__.py delete mode 100644 shotgun/shotgun/config.py delete mode 100644 shotgun/shotgun/driver.py delete mode 100644 shotgun/shotgun/logger.py delete mode 100644 shotgun/shotgun/manager.py delete mode 100644 shotgun/shotgun/settings.py delete mode 100644 shotgun/shotgun/test/__init__.py delete mode 100644 shotgun/shotgun/test/test_config.py delete mode 100644 shotgun/shotgun/utils.py create mode 100644 utils/git-helper/README.md create mode 100644 utils/git-helper/git_api.py create mode 100644 utils/git-helper/review.conf.template create mode 100755 utils/git-helper/review.py rename rename.sh => utils/rename.sh (100%) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d7f698d9c..000000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "fuel"] - path = fuel - url = https://github.com/Mirantis/fuel.git -[submodule "astute"] - path = astute - url = https://github.com/Mirantis/astute.git diff --git a/Makefile b/Makefile index eab5dba74..6e0998f36 100644 --- a/Makefile +++ b/Makefile @@ -72,6 +72,7 @@ include $(SOURCE_DIR)/rules.mk include $(SOURCE_DIR)/sandbox.mk # Modules +include $(SOURCE_DIR)/repos.mk include $(SOURCE_DIR)/mirror/module.mk include $(SOURCE_DIR)/packages/module.mk include $(SOURCE_DIR)/bootstrap/module.mk diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index f6e8d2a9c..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,80 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - - -ENVIRONMENT_SETUP_SCRIPT = <<-EOS -# To use this script, you must fetch fuel submodule: -# git submodule update -#!/bin/bash -grep -q devnailgun /etc/hosts || echo "10.0.2.15 devnailgun.mirantis.com devnailgun" >> /etc/hosts -sed 's/HOSTNAME=.*/HOSTNAME=devnailgun.mirantis.com/' -i /etc/sysconfig/network - -echo "Installing puppet..." -rpm -Uhv http://fedora-mirror02.rbc.ru/pub/epel/6/i386/epel-release-6-8.noarch.rpm -rpm -ivh http://yum.puppetlabs.com/el/6/products/i386/puppetlabs-release-6-6.noarch.rpm -for pkg in `grep puppet /vagrant/requirements-rpm.txt`; do yum -y install $pkg; done - -echo "Configuring puppet..." -grep -q devnailgun /etc/puppet/puppet.conf || echo " server = devnailgun.mirantis.com" >> /etc/puppet/puppet.conf -grep -q autosign /etc/puppet/puppet.conf || echo "\n[master]\n autosign = true" >> /etc/puppet/puppet.conf -chkconfig puppetmaster on; service puppetmaster restart - -echo "Use fuel puppet modules to install mcollective&rabbitmq" -rm -f /etc/puppet/modules.old || : -mv /etc/puppet/modules /etc/puppet/modules.old || : -ln -sfT /fuel/deployment/puppet /etc/puppet/modules -mv /etc/puppet/manifests/site.pp /etc/puppet/manifests/site.pp.old || : -cat > /etc/puppet/manifests/site.pp << EOF -node default { - - Exec {path => '/usr/bin:/bin:/usr/sbin:/sbin'} - - class { mcollective::rabbitmq: - user => "mcollective", - password => "marionette", - } - - class { mcollective::client: - pskey => "unset", - user => "mcollective", - password => "marionette", - host => "127.0.0.1", - port => "61613" - } - -} -EOF -puppet agent --test - -echo "Restoring site.pp and modules to previously set.." -mv /etc/puppet/modules.old /etc/puppet/modules || : -mv /etc/puppet/manifests/site.pp.old /etc/puppet/manifests/site.pp || : - -echo "Installing mcollective..." -for pkg in `grep mcollective /vagrant/requirements-rpm.txt`; do yum -y install $pkg; done -chkconfig mcollective on -service mcollective start - -# Debug tools -yum -y install strace bind-utils - -yum -y install httpd -EOS - -Vagrant::Config.run do |config| - config.vm.define :centos63 do |vm_config| - vm_config.vm.box = "centos63" - vm_config.vm.box_url = "http://srv08-srt.srt.mirantis.net/CentOS-6.3-x86_64-minimal.box" - vm_config.vm.customize ["modifyvm", :id, "--memory", 1024] - - # Boot with a GUI so you can see the screen. (Default is headless) - #config.vm.boot_mode = :gui - - config.vm.share_folder "v-data", "/fuel", "./fuel" - - # extra network for testing - vm_config.vm.network :hostonly, '10.1.1.2', :adapter => 2 - - vm_config.vm.provision :shell, :inline => ENVIRONMENT_SETUP_SCRIPT - end -end diff --git a/astute b/astute deleted file mode 160000 index 861af62ba..000000000 --- a/astute +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 861af62ba2c56a389bda9893e30d2a084c10d746 diff --git a/bin/agent b/bin/agent deleted file mode 100755 index a3c3aefe2..000000000 --- a/bin/agent +++ /dev/null @@ -1,463 +0,0 @@ -#!/usr/bin/env ruby - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -begin - require 'rubygems' -rescue LoadError -end -require 'ohai/system' -require 'json' -require 'httpclient' -require 'logger' -require 'optparse' -require 'yaml' -require 'ipaddr' -require 'rethtool' - -unless Process.euid == 0 - puts "You must be root" - exit 1 -end - -ENV['PATH'] = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin" - -AGENT_CONFIG = "/etc/nailgun-agent/config.yaml" - -class McollectiveConfig - def initialize(logger) - @logger = logger - @configfile = '/etc/mcollective/server.cfg' - end - - def get_config_by_key(find_key) - found_key = nil - found_value = nil - # This code is from mcollective's sources - File.open(@configfile, "r").each do |line| - # strip blank spaces, tabs etc off the end of all lines - line.gsub!(/\s*$/, "") - unless line =~ /^#|^$/ - if line =~ /(.+?)\s*=\s*(.+)/ - key = $1 - val = $2 - if key == find_key - found_key = key - found_value = val - end - end - end - end - - found_value if found_key - end - - def replace_identity(new_id) - # check if id complies reqs - raise 'Identities can only match /\w\.\-/' unless new_id.to_s.match(/^[\w\.\-]+$/) - - value_from_config = get_config_by_key('identity') - - if value_from_config == new_id.to_s - @logger.info "MCollective is up to date with identity = #{new_id}" - else - config = File.open(@configfile, "rb").read - if value_from_config - # Key found, but it has other value - @logger.info "Replacing identity in mcollective server.cfg to new value = '#{new_id}'" - config.gsub!(/^identity[ =].*$/, "identity = #{new_id}") - File.open(@configfile, "w") { |f| f.write(config) } - else # if key was not found - config += "\nidentity = #{new_id}\n" - @logger.info "Identity in mcollective server.cfg has not been found. Setting to '#{new_id}'" - File.open(@configfile, "w") { |f| f.write(config) } - end - # Generally because generic init script for - # mcollective is broken at least in Ubuntu and - # altering restart in such way seems better - # than shipping our own package. - puts `/etc/init.d/mcollective stop; /etc/init.d/mcollective start` - end - end -end - - -class NodeAgent - def initialize(logger, url=nil) - @logger = logger - - @api_default_address = "localhost" - @api_default_port = "8000" - - @api_url = url - - if @api_url - @api_url.chomp!('/') - @api_ip = @api_url.match(/\bhttp:\/\/((\d{1,3}\.){3}\d{1,3})/)[1] - else - begin - cmdline = ::File.read("/proc/cmdline") - @api_ip = cmdline.match(/\burl=http:\/\/((\d{1,3}\.){3}\d{1,3})/)[1] - @logger.info("Found admin node IP address in kernel cmdline: #{@api_ip}") - rescue - @logger.info("Can't get API url from /proc/cmdline. Will use localhost.") - @api_ip = "127.0.0.1" - end - @api_url = "http://#{@api_ip}:#{@api_default_port}/api" - end - - @os = Ohai::System.new() - @os.all_plugins - end - - def put - headers = {"Content-Type" => "application/json"} - @logger.debug("Trying to put host info into #{@api_url}") - res = htclient.put("#{@api_url}/nodes/", [_data].to_json, headers) - if res.status < 200 or res.status >= 300 - @logger.error("HTTP PUT failed: #{res.inspect}") - end - res - end - - def post - headers = {"Content-Type" => "application/json"} - @logger.debug("Trying to create host using #{@api_url}") - res = htclient.post("#{@api_url}/nodes/", _data.to_json, headers) - res - end - - def htclient - client = HTTPClient.new - client.connect_timeout = 10 - client.send_timeout = 10 - client.receive_timeout = 10 # (mihgen): Nailgun may hang for a while, but 10sec should be enough for him to respond - client - end - - def _interfaces - interfaces = @os[:network][:interfaces].inject([]) do |result, elm| - result << { :name => elm[0], :addresses => elm[1]["addresses"] } - end - interfaces << { "default_interface" => @os["network"]["default_interface"] } - interfaces << { "default_gateway" => @os["network"]["default_gateway"] } - interfaces - end - - def _detailed - detailed_meta = { - :system => _system_info, - :interfaces => [], - :cpu => { - :total => (@os[:cpu][:total].to_i rescue nil), - :real => (@os[:cpu][:real].to_i rescue nil), - :spec => [], - }, - :disks => [], - :memory => (_dmi_memory or _ohai_memory), - } - - begin - (@os[:network][:interfaces] or {} rescue {}).each do |int, intinfo| - next if int =~ /^lo[:]?/ - next if int =~ /^vir/ - next if int =~ /^vnet/ - next if int =~ /^br/ - next if int =~ /\d+\.\d+$/ - int_meta = {:name => int} - (intinfo[:addresses] or {} rescue {}).each do |addr, addrinfo| - if (addrinfo[:family] rescue nil) =~ /lladdr/ - int_meta[:mac] = addr - begin - int_info = Rethtool::InterfaceSettings.new(int) - int_meta[:max_speed] = int_info.best_mode.speed - if int_info.current_mode.speed == :unknown - int_meta[:current_speed] = nil - else - int_meta[:current_speed] = int_info.current_mode.speed - end - rescue - int_meta[:current_speed] = nil - end - elsif (addrinfo[:family] rescue nil) =~ /^inet$/ - int_meta[:ip] = addr - int_meta[:netmask] = addrinfo[:netmask] if addrinfo[:netmask] - end - end - detailed_meta[:interfaces] << int_meta - end - rescue Exception => e - @logger.error("Error '#{e.message}' in gathering interfaces metadata: #{e.backtrace}") - end - - begin - (@os[:cpu] or {} rescue {}).each do |cpu, cpuinfo| - if cpu =~ /^[\d]+/ and cpuinfo - frequency = cpuinfo[:mhz].to_i rescue nil - begin - # ohai returns current frequency, try to get max if possible - max_frequency = `cat /sys/devices/system/cpu/cpu#{cpu}/cpufreq/cpuinfo_max_freq 2>/dev/null`.to_i / 1000 - frequency = max_frequency if max_frequency > 0 - rescue - end - detailed_meta[:cpu][:spec] << { - :frequency => frequency, - :model => (cpuinfo[:model_name].gsub(/ +/, " ") rescue nil) - } - end - end - rescue Exception => e - @logger.error("Error '#{e.message}' in gathering cpu metadata: #{e.backtrace}") - end - - begin - (@os[:block_device] or {} rescue {}).each do |bname, binfo| - if /^(sd|vd|hd|cciss).+$/ =~ bname and binfo - dname = bname.gsub(/!/, '/') - # 512 bytes is the size of one sector by default - block_size = 512 - fn = "/sys/block/#{bname}/queue/logical_block_size" - block_size = File.read(fn).to_i if File.exist? fn - block_size = 512 if block_size == 0 - detailed_meta[:disks] << { - :name => dname, - :model => binfo[:model], - :size => (binfo[:size].to_i * block_size), - :disk => _disk_path_by_name(dname) || dname - } - end - end - rescue Exception => e - @logger.error("Error '#{e.message}' in gathering disks metadata: #{e.backtrace}") - end - - detailed_meta - end - - def _disk_path_by_name(name) - dn = "/dev/disk/by-path" - basepath = Dir["#{dn}/**?"].find{|f| /\/#{name}$/.match(File.readlink(f))} - basepath.split("/")[2..-1].join("/") if basepath - end - - def _is_virtualbox - @os[:dmi][:system][:product_name] == "VirtualBox" rescue false - end - - def _is_virtual - _is_virtualbox or @os[:virtualization][:role] == "guest" rescue false - end - - def _manufacturer - if _is_virtualbox - @os[:dmi][:system][:product_name] rescue nil - elsif _is_virtual - @os[:virtualization][:system].upcase.strip rescue nil - else - @os[:dmi][:system][:manufacturer].strip rescue nil - end - end - - def _product_name - unless _is_virtual - @os[:dmi][:system][:product_name].strip rescue nil - end - end - - def _serial - @os[:dmi][:system][:serial_number].strip rescue nil - end - - def _system_info - { - :manufacturer => _manufacturer, - :serial => _serial, - :product => _product_name, - :family => (@os[:dmi][:system][:family].strip rescue nil), - :version => (@os[:dmi][:system][:version].strip rescue nil), - :fqdn => (@os[:fqdn].strip rescue @os[:hostname].strip rescue nil), - }.delete_if { |key, value| value.nil? or value.empty? or value == "Not Specified" } - end - - def _size(size, unit) - case unit - when /^kb$/i - size * 1024 - when /^mb$/i - size * 1048576 - when /^gb$/i - size * 1073741824 - end - end - - def _dmi_memory - dmi = `/usr/sbin/dmidecode` - info = {:devices => [], :total => 0, :maximum_capacity => 0, :slots => 0} - return nil if $?.to_i != 0 - dmi.split(/\n\n/).each do |group| - if /^Physical Memory Array$/.match(group) - if /^\s*Maximum Capacity:\s+(\d+)\s+(mb|gb|kb)/i.match(group) - info[:maximum_capacity] += _size($1.to_i, $2) - end - if /^\s*Number Of Devices:\s+(\d+)/i.match(group) - info[:slots] += $1.to_i - end - elsif /^Memory Device$/.match(group) - device_info = {} - if /^\s*Size:\s+(\d+)\s+(mb|gb|kb)/i.match(group) - size = _size($1.to_i, $2) - device_info[:size] = size - info[:total] += size - else - next - end - if /^\s*Speed:\s+(\d+)\s+MHz/i.match(group) - device_info[:frequency] = $1.to_i - end - if /^\s*Type:\s+(.*?)$/i.match(group) - device_info[:type] = $1 - end - #if /^\s*Locator:\s+(.*?)$/i.match(group) - # device_info[:locator] = $1 - #end - info[:devices].push(device_info) - end - end - if info[:total] == 0 - nil - else - info - end - end - - def _ohai_memory - info = {} - size = @os['memory']['total'].gsub(/(kb|mb|gb)$/i, "").to_i rescue (return nil) - info[:total] = _size(size, $1) - info - end - - def _master_ip detailed_data - detailed_data.each do |k, v| - if k.to_s =~ /^interfaces$/ - detailed_data[k].each do |i| - begin - net = IPAddr.new "#{i[:ip]}/#{i[:netmask]}" - return i[:ip] if net.include? @api_ip - rescue - end - end - end - end - nil - end - - def _data - res = { - :mac => (@os[:macaddress] rescue nil), - :ip => (@os[:ipaddress] rescue nil), - :os_platform => (@os[:platform] rescue nil) - } - begin - detailed_data = _detailed - res.merge!({ - :ip => ((_master_ip detailed_data or @os[:ipaddress]) rescue nil), - :manufacturer => _manufacturer, - :platform_name => _product_name, - :meta => detailed_data - }) - rescue Exception => e - @logger.error("Error '#{e.message}' in metadata calculation: #{e.backtrace}") - end - - res[:status] = @node_state if @node_state - res[:is_agent] = true - res - end - - def update_state - @node_state = nil - if File.exist?("/etc/nailgun_systemtype") - fl = File.open("/etc/nailgun_systemtype", "r") - system_type = fl.readline.rstrip - @node_state = "discover" if system_type == "bootstrap" - end - end - - def prevent_discover? - File.exist?('/var/run/nodiscover') - end -end - -def write_data_to_file(logger, filename, data) - if File.exist?(filename) - File.open(filename, 'r') do |fo| - text = fo.read - end - else - text = '' - end - - if text != data - begin - File.open(filename, 'w') do |fo| - fo.write(data) - end - logger.info("Wrote data to file '#{filename}'. Data: #{data}") - rescue Exception => e - logger.warning("Can't write data to file '#{filename}'. Reason: #{e.message}") - end - else - logger.info("File '#{filename}' is up to date.") - end -end - - -logger = Logger.new(STDOUT) -logger.level = Logger::DEBUG - -begin - logger.info("Trying to load agent config #{AGENT_CONFIG}") - url = YAML.load_file(AGENT_CONFIG)['url'] - logger.info("Obtained service url from config file: '#{url}'") -rescue Exception => e - logger.info("Could not get url from configuration file: #{e.message}, trying other ways..") -end - -agent = NodeAgent.new(logger, url) -if agent.prevent_discover? - logger.info("Discover prevented by /var/run/nodiscover presence.") - exit 1 -end -agent.update_state - -begin - post_res = agent.post - if post_res.status == 409 - put_res = agent.put - new_id = JSON.parse(put_res.body)[0]['id'] - elsif post_res.status == 201 - new_id = JSON.parse(post_res.body)['id'] - else - logger.error post_res.body - exit 1 - end - mc_config = McollectiveConfig.new(logger) - mc_config.replace_identity(new_id) - write_data_to_file(logger, '/etc/nailgun_uid', new_id.to_s) -rescue => ex - # NOTE(mihgen): There is no need to retry - cron will do it for us - logger.error "#{ex.message}\n#{ex.backtrace}" -end diff --git a/bin/nailgun-agent.cron b/bin/nailgun-agent.cron deleted file mode 100644 index 27f2a9d71..000000000 --- a/bin/nailgun-agent.cron +++ /dev/null @@ -1 +0,0 @@ -* * * * * root flock -w 0 -o /var/lock/agent.lock -c "/opt/nailgun/bin/agent >> /var/log/nailgun-agent.log 2>&1" diff --git a/bin/send2syslog.py b/bin/send2syslog.py deleted file mode 100755 index 972d5a8d7..000000000 --- a/bin/send2syslog.py +++ /dev/null @@ -1,498 +0,0 @@ -#!/usr/bin/python - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import os -import sys -import signal -import string -import re -import json -import time -import logging -from logging.handlers import SysLogHandler -from optparse import OptionParser, OptionGroup - - -# Add syslog levels to logging module. -logging.NOTICE = 25 -logging.ALERT = 60 -logging.EMERG = 70 -logging.addLevelName(logging.NOTICE, 'NOTICE') -logging.addLevelName(logging.ALERT, 'ALERT') -logging.addLevelName(logging.EMERG, 'EMERG') -SysLogHandler.priority_map['NOTICE'] = 'notice' -SysLogHandler.priority_map['ALERT'] = 'alert' -SysLogHandler.priority_map['EMERG'] = 'emerg' -# Define data and message format according to RFC 5424. -rfc5424_format = '{version} {timestamp} {hostname} {appname} {procid}'\ - ' {msgid} {structured_data} {msg}' -date_format = '%Y-%m-%dT%H:%M:%SZ' -# Define global semaphore. -sending_in_progress = 0 -# Define file types. -msg_levels = {'ruby': {'regex': '(?P[DIWEF]), \[[0-9-]{10}T', - 'levels': {'D': logging.DEBUG, - 'I': logging.INFO, - 'W': logging.WARNING, - 'E': logging.ERROR, - 'F': logging.FATAL - } - }, - 'syslog': {'regex': ('[0-9-]{10}T[0-9:]{8}Z (?P' - 'debug|info|notice|warning|err|crit|' - 'alert|emerg)'), - 'levels': {'debug': logging.DEBUG, - 'info': logging.INFO, - 'notice': logging.NOTICE, - 'warning': logging.WARNING, - 'err': logging.ERROR, - 'crit': logging.CRITICAL, - 'alert': logging.ALERT, - 'emerg': logging.EMERG - } - }, - 'anaconda': {'regex': ('[0-9:]{8},[0-9]+ (?P' - 'DEBUG|INFO|WARNING|ERROR|CRITICAL)'), - 'levels': {'DEBUG': logging.DEBUG, - 'INFO': logging.INFO, - 'WARNING': logging.WARNING, - 'ERROR': logging.ERROR, - 'CRITICAL': logging.CRITICAL - } - } - } -relevel_errors = { - 'anaconda': [ - { - 'regex': 'Error downloading \ -http://.*/images/(product|updates).img: HTTP response code said error', - 'levelfrom': logging.ERROR, - 'levelto': logging.WARNING - }, - { - 'regex': 'got to setupCdrom without a CD device', - 'levelfrom': logging.ERROR, - 'levelto': logging.WARNING - } - ] -} -# Create a main logger. -logging.basicConfig(format='%(levelname)s: %(message)s') -main_logger = logging.getLogger() -main_logger.setLevel(logging.NOTSET) - - -class WatchedFile: - """ WatchedFile(filename) => Object that read lines from file if exist. """ - - def __init__(self, name): - self.name = name - self.fo = None - self.where = 0 - - def reset(self): - if self.fo: - self.fo.close() - self.fo = None - self.where = 0 - - def _checkRewrite(self): - try: - if os.stat(self.name)[6] < self.where: - self.reset() - except OSError: - self.close() - - def readLines(self): - """Return list of last append lines from file if exist. """ - - self._checkRewrite() - if not self.fo: - try: - self.fo = open(self.name, 'r') - except IOError: - return () - lines = self.fo.readlines() - self.where = self.fo.tell() - return lines - - def close(self): - self.reset() - - -class WatchedGroup: - """ Can send data from group of specified files to specified servers. """ - - def __init__(self, servers, files, name): - self.servers = servers - self.files = files - self.log_type = files.get('log_type', 'syslog') - self.name = name - self._createLogger() - - def _createLogger(self): - self.watchedfiles = [] - logger = logging.getLogger(self.name) - logger.setLevel(logging.NOTSET) - logger.propagate = False - # Create log formatter. - format_dict = {'version': '1', - 'timestamp': '%(asctime)s', - 'hostname': config['hostname'], - 'appname': self.files['tag'], - 'procid': '-', - 'msgid': '-', - 'structured_data': '-', - 'msg': '%(message)s' - } - log_format = rfc5424_format.format(**format_dict) - formatter = logging.Formatter(log_format, date_format) - # Add log handler for each server. - for server in self.servers: - port = 'port' in server and server['port'] or 514 - syslog = SysLogHandler((server["host"], port)) - syslog.setFormatter(formatter) - logger.addHandler(syslog) - self.logger = logger - # Create WatchedFile objects from list of files. - for name in self.files['files']: - self.watchedfiles.append(WatchedFile(name)) - - def send(self): - """ Send append data from files to servers. """ - - for watchedfile in self.watchedfiles: - for line in watchedfile.readLines(): - line = line.strip() - level = self._get_msg_level(line, self.log_type) - # Get rid of duplicated information in anaconda logs - line = re.sub( - msg_levels[self.log_type]['regex'] + "\s*:?\s?", - "", - line - ) - # Ignore meaningless errors - try: - for r in relevel_errors[self.log_type]: - if level == r['levelfrom'] and \ - re.match(r['regex'], line): - level = r['levelto'] - except KeyError: - pass - self.logger.log(level, line) - main_logger and main_logger.log( - level, - 'From file "%s" send: %s' % (watchedfile.name, line) - ) - - @staticmethod - def _get_msg_level(line, log_type): - if log_type in msg_levels: - msg_type = msg_levels[log_type] - regex = re.match(msg_type['regex'], line) - if regex: - return msg_type['levels'][regex.group('level')] - return logging.INFO - - -def sig_handler(signum, frame): - """ Send all new data when signal arrived. """ - - if not sending_in_progress: - send_all() - exit(signum) - else: - config['run_once'] = True - - -def send_all(): - """ Send any updates. """ - - sending_in_progress = 1 - for group in watchlist: - group.send() - sending_in_progress = 0 - - -def main_loop(): - """ Periodicaly call sendlogs() for each group in watchlist. """ - - signal.signal(signal.SIGINT, sig_handler) - signal.signal(signal.SIGTERM, sig_handler) - while watchlist: - time.sleep(0.5) - send_all() - # If asked to run_once, exit now - if config['run_once']: - break - - -class Config: - """ Collection of config generation methods. - Usage: config = Config.getConfig() - """ - - @classmethod - def getConfig(cls): - """ Generate config from command line arguments and config file. """ - - # example_config = { - # "daemon": True, - # "run_once": False, - # "debug": False, - # "watchlist": [ - # {"servers": [ {"host": "localhost", "port": 514} ], - # "watchfiles": [ - # {"tag": "anaconda", - # "log_type": "anaconda", - # "files": ["/tmp/anaconda.log", - # "/mnt/sysimage/root/install.log"] - # } - # ] - # } - # ] - # } - - default_config = {"daemon": True, - "run_once": False, - "debug": False, - "hostname": cls._getHostname(), - "watchlist": [] - } - # First use default config as running config. - config = dict(default_config) - # Get command line options and validate it. - cmdline = cls.cmdlineParse()[0] - # Check config file source and read it. - if cmdline.config_file or cmdline.stdin_config: - try: - if cmdline.stdin_config is True: - fo = sys.stdin - else: - fo = open(cmdline.config_file, 'r') - parsed_config = json.load(fo) - if cmdline.debug: - print parsed_config - except IOError: # Raised if IO operations failed. - main_logger.error("Can not read config file %s\n" % - cmdline.config_file) - exit(1) - except ValueError as e: # Raised if json parsing failed. - main_logger.error("Can not parse config file. %s\n" % - e.message) - exit(1) - # Validate config from config file. - cls.configValidate(parsed_config) - # Copy gathered config from config file to running config - # structure. - for key, value in parsed_config.items(): - config[key] = value - else: - # If no config file specified use watchlist setting from - # command line. - watchlist = {"servers": [{"host": cmdline.host, - "port": cmdline.port}], - "watchfiles": [{"tag": cmdline.tag, - "log_type": cmdline.log_type, - "files": cmdline.watchfiles}]} - config['watchlist'].append(watchlist) - - # Apply behavioural command line options to running config. - if cmdline.no_daemon: - config["daemon"] = False - if cmdline.run_once: - config["run_once"] = True - if cmdline.debug: - config["debug"] = True - return config - - @staticmethod - def _getHostname(): - """ Generate hostname by BOOTIF kernel option or use os.uname().""" - - with open('/proc/cmdline') as fo: - cpu_cmdline = fo.readline().strip() - regex = re.search('(?<=BOOTIF=)([0-9a-fA-F-]*)', cpu_cmdline) - if regex: - mac = regex.group(0).upper() - return ''.join(mac.split('-')) - return os.uname()[1] - - @staticmethod - def cmdlineParse(): - """ Parse command line config options. """ - - parser = OptionParser() - parser.add_option("-c", "--config", dest="config_file", metavar="FILE", - help="Read config from FILE.") - parser.add_option("-i", "--stdin", dest="stdin_config", default=False, - action="store_true", help="Read config from Stdin.") - # FIXIT Add optionGroups. - parser.add_option("-r", "--run-once", dest="run_once", - action="store_true", help="Send all data and exit.") - parser.add_option("-n", "--no-daemon", dest="no_daemon", - action="store_true", help="Do not daemonize.") - parser.add_option("-d", "--debug", dest="debug", - action="store_true", help="Print debug messages.") - - parser.add_option("-t", "--tag", dest="tag", metavar="TAG", - help="Set tag of sending messages as TAG.") - parser.add_option("-T", "--type", dest="log_type", metavar="TYPE", - default='syslog', - help="Set type of files as TYPE" - "(default: %default).") - parser.add_option("-f", "--watchfile", dest="watchfiles", - action="append", - metavar="FILE", help="Add FILE to watchlist.") - parser.add_option("-s", "--host", dest="host", metavar="HOSTNAME", - help="Set destination as HOSTNAME.") - parser.add_option("-p", "--port", dest="port", type="int", default=514, - metavar="PORT", - help="Set remote port as PORT (default: %default).") - - options, args = parser.parse_args() - # Validate gathered options. - if options.config_file and options.stdin_config: - parser.error("You must not set both options --config" - " and --stdin at the same time.") - exit(1) - if ((options.config_file or options.stdin_config) and - (options.tag or options.watchfiles or options.host)): - main_logger.warning("If --config or --stdin is set up options" - " --tag, --watchfile, --type," - " --host and --port will be ignored.") - if (not (options.config_file or options.stdin_config) and - not (options.tag and options.watchfiles and options.host)): - parser.error("Options --tag, --watchfile and --host" - " must be set up at the same time.") - exit(1) - return options, args - - @staticmethod - def _checkType(value, value_type, value_name='', msg=None): - """ Check correctness of type of value and exit if not. """ - - if not isinstance(value, value_type): - message = msg or "Value %r in config have type %r but"\ - " %r is expected." %\ - (value_name, type(value).__name__, value_type.__name__) - main_logger.error(message) - exit(1) - - @classmethod - def configValidate(cls, config): - """ Validate types and names of data items in config. """ - - cls._checkType(config, dict, msg='Config must be a dict.') - for key in ("daemon", "run_once", "debug"): - if key in config: - cls._checkType(config[key], bool, key) - key = "hostname" - if key in config: - cls._checkType(config[key], basestring, key) - - key = "watchlist" - if key in config: - cls._checkType(config[key], list, key) - else: - main_logger.error("There must be key %r in config." % key) - exit(1) - - for item in config["watchlist"]: - cls._checkType(item, dict, "watchlist[n]") - key, name = "servers", "watchlist[n] => servers" - if key in item: - cls._checkType(item[key], list, name) - else: - main_logger.error("There must be key %r in %s in config." % - (key, '"watchlist[n]" item')) - exit(1) - key, name = "watchfiles", "watchlist[n] => watchfiles" - if key in item: - cls._checkType(item[key], list, name) - else: - main_logger.error("There must be key %r in %s in config." % - (key, '"watchlist[n]" item')) - exit(1) - - for item2 in item["servers"]: - cls._checkType(item2, dict, "watchlist[n] => servers[n]") - key, name = "host", "watchlist[n] => servers[n] => host" - if key in item2: - cls._checkType(item2[key], basestring, name) - else: - main_logger.error("There must be key %r in %s in config." % - (key, - '"watchlist[n] => servers[n]" item')) - exit(1) - key, name = "port", "watchlist[n] => servers[n] => port" - if key in item2: - cls._checkType(item2[key], int, name) - - for item2 in item["watchfiles"]: - cls._checkType(item2, dict, "watchlist[n] => watchfiles[n]") - key, name = "tag", "watchlist[n] => watchfiles[n] => tag" - if key in item2: - cls._checkType(item2[key], basestring, name) - else: - main_logger.error("There must be key %r in %s in config." % - (key, - '"watchlist[n] => watchfiles[n]" item')) - exit(1) - key = "log_type" - name = "watchlist[n] => watchfiles[n] => log_type" - if key in item2: - cls._checkType(item2[key], basestring, name) - key, name = "files", "watchlist[n] => watchfiles[n] => files" - if key in item2: - cls._checkType(item2[key], list, name) - else: - main_logger.error("There must be key %r in %s in config." % - (key, - '"watchlist[n] => watchfiles[n]" item')) - exit(1) - for item3 in item2["files"]: - name = "watchlist[n] => watchfiles[n] => files[n]" - cls._checkType(item3, basestring, name) - - -# Create global config. -config = Config.getConfig() -# Create list of WatchedGroup objects with different log names. -watchlist = [] -i = 0 -for item in config["watchlist"]: - for files in item['watchfiles']: - watchlist.append(WatchedGroup(item['servers'], files, str(i))) - i = i + 1 - -# Fork and loop -if config["daemon"]: - if not os.fork(): - # Redirect the standard I/O file descriptors to the specified file. - main_logger = None - DEVNULL = getattr(os, "devnull", "/dev/null") - os.open(DEVNULL, os.O_RDWR) # standard input (0) - os.dup2(0, 1) # Duplicate standard input to standard output (1) - os.dup2(0, 2) # Duplicate standard input to standard error (2) - - main_loop() - sys.exit(1) - sys.exit(0) -else: - if not config['debug']: - main_logger = None - main_loop() diff --git a/bootstrap/module.mk b/bootstrap/module.mk index 3512c0a43..1ba4f9842 100644 --- a/bootstrap/module.mk +++ b/bootstrap/module.mk @@ -105,7 +105,8 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \ $(BUILD_DIR)/packages/rpm/build.done \ $(BUILD_DIR)/bootstrap/prepare-initram-root.done \ $(call find-files,$(SOURCE_DIR)/bootstrap/sync) \ - $(SOURCE_DIR)/bin/send2syslog.py \ + $(BUILD_DIR)/repos/nailgun.done \ + $(call find-files,$(BUILD_DIR)/repos/nailgun/bin/send2syslog.py) \ $(SOURCE_DIR)/bootstrap/ssh/id_rsa.pub \ $(BUILD_DIR)/bootstrap/etc/yum.conf \ $(BUILD_DIR)/bootstrap/etc/yum.repos.d/base.repo @@ -118,7 +119,7 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \ # Copying custom files sudo rsync -aK $(SOURCE_DIR)/bootstrap/sync/ $(INITRAMROOT) - sudo cp -r $(SOURCE_DIR)/bin/send2syslog.py $(INITRAMROOT)/usr/bin + sudo cp -r $(BUILD_DIR)/repos/nailgun/bin/send2syslog.py $(INITRAMROOT)/usr/bin # Enabling pre-init boot interface discovery sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on diff --git a/config.mk b/config.mk index 35bcfc4cf..dc6c5fd6d 100644 --- a/config.mk +++ b/config.mk @@ -18,9 +18,7 @@ MASTER_DNS?=10.20.0.1 MASTER_NETMASK?=255.255.255.0 MASTER_GW?=10.20.0.1 -COMMIT_SHA:=$(shell git rev-parse --verify HEAD) PRODUCT_VERSION:=3.2 -FUEL_COMMIT_SHA:=$(shell cd fuel && git rev-parse --verify HEAD) CENTOS_MAJOR:=6 CENTOS_MINOR:=4 @@ -40,6 +38,20 @@ NO_UI_OPTIMIZE:=0 # Do not copy RHEL repo to the iso CACHE_RHEL:=0 +# Repos and versions +NAILGUN_COMMIT?=origin/master +ASTUTE_COMMIT?=origin/master +FUELLIB_COMMIT?=origin/master +OSTF_TESTS_COMMIT?=92b4e5e8d10f1a45f7433d06eb3a5936adb4050e +OSTF_PLUGIN_COMMIT?=f1c7870793a3aa724673c30391d3255a0d9465d5 + +NAILGUN_REPO?=https://github.com/Mirantis/fuelweb.git +ASTUTE_REPO?=https://github.com/Mirantis/astute.git +FUELLIB_REPO?=https://github.com/Mirantis/fuel.git +OSTF_TESTS_REPO?=https://github.com/Mirantis/fuel-ostf-tests.git +OSTF_PLUGIN_REPO?=https://github.com/Mirantis/fuel-ostf-plugin.git + + LOCAL_MIRROR_SRC:=$(LOCAL_MIRROR)/src LOCAL_MIRROR_EGGS:=$(LOCAL_MIRROR)/eggs LOCAL_MIRROR_GEMS:=$(LOCAL_MIRROR)/gems @@ -129,18 +141,12 @@ MIRROR_EGGS?=http://pypi.python.org/simple # NOTE(mihgen): removed gemcutter - it redirects to rubygems.org and has issues w/certificate now MIRROR_GEMS?=http://rubygems.org +# FYI: For rhel cache we parse fuel/deployment/puppet/rpmcache/files/required-rpms.txt REQUIRED_RPMS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/requirements-rpm.txt) REQUIRED_DEBS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/requirements-deb.txt) +# FYI: Also we get eggs for ostf from fuel/deployment/puppet/nailgun/files/venv-ostf.txt file REQUIRED_EGGS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/requirements-eggs.txt) -OSTF_EGGS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/fuel/deployment/puppet/nailgun/files/venv-ostf.txt) REQUIRED_SRCS:=$(shell grep -v ^\\s*\# $(SOURCE_DIR)/requirements-src.txt) -REQ_RHEL_RPMS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/fuel/deployment/puppet/rpmcache/files/required-rpms.txt) -REQ_FUEL_RHEL_RPMS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/fuel/deployment/puppet/rpmcache/files/req-fuel-rhel.txt) - -OSTF_PLUGIN_SHA?=f1c7870793a3aa724673c30391d3255a0d9465d5 -OSTF_PLUGIN_VER?=0.2 -OSTF_TESTS_SHA?=92b4e5e8d10f1a45f7433d06eb3a5936adb4050e -OSTF_TESTS_VER?=0.1 # Which repositories to use for making local centos mirror. # Possible values you can find out from mirror/centos/yum_repos.mk file. diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 482d09e29..000000000 --- a/docs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -_build/ -plantuml.jar diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 0867e53d6..000000000 --- a/docs/Makefile +++ /dev/null @@ -1,159 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = _build -PLANTUML = plantuml.jar - - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - -rm -rf $(BUILDDIR)/* - -$(PLANTUML): - wget http://downloads.sourceforge.net/project/plantuml/plantuml.jar -O $(PLANTUML) - $(ACTION.TOUCH) - -html: $(PLANTUML) - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/scaffold.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/scaffold.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/scaffold" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/scaffold" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." diff --git a/docs/_templates/bootstrap/globaltoc.html b/docs/_templates/bootstrap/globaltoc.html deleted file mode 100644 index cb9f38fb6..000000000 --- a/docs/_templates/bootstrap/globaltoc.html +++ /dev/null @@ -1,4 +0,0 @@ -
  • - {{ _('Site') }} -
      {{ toctree(maxdepth=1) }}
    -
    • diff --git a/docs/_templates/bootstrap/layout.html b/docs/_templates/bootstrap/layout.html deleted file mode 100644 index 8bc387f2e..000000000 --- a/docs/_templates/bootstrap/layout.html +++ /dev/null @@ -1,134 +0,0 @@ -{% extends "basic/layout.html" %} -{% set script_files = script_files + ['_static/bootstrap.js'] %} -{% set css_files = ['_static/bootstrap.css', '_static/bootstrap-sphinx.css'] + css_files %} - -{# Sidebar: Rework into our Boostrap nav section. #} -{% macro navBar() %} - - -{% endmacro %} - -{%- block extrahead %} - -{% endblock %} - -{% block header %}{{ navBar() }}{% endblock %} - -{# Silence the sidebar's, relbar's #} -{% block sidebar1 %}{% endblock %} -{% block sidebar2 %}{% endblock %} -{% block relbar1 %}{% endblock %} -{% block relbar2 %}{% endblock %} - -{%- block content %} -
    - {% block body %} {% endblock %} -
    -{%- endblock %} - -{%- block footer %} -
    -
    -

    Back to top

    -

    - {%- if show_copyright %} - {%- if hasdoc('copyright') %} - {% trans path=pathto('copyright'), copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %}
    - {%- else %} - {% trans copyright=copyright|e %}© Copyright {{ copyright }}.{% endtrans %}
    - {%- endif %} - {%- endif %} - {%- if last_updated %} - {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
    - {%- endif %} - {%- if show_sphinx %} - {% trans sphinx_version=sphinx_version|e %}Created using Sphinx {{ sphinx_version }}.{% endtrans %}
    - {%- endif %} -

    -
    -
    -{%- endblock %} - diff --git a/docs/_templates/bootstrap/localtoc.html b/docs/_templates/bootstrap/localtoc.html deleted file mode 100644 index c47d98801..000000000 --- a/docs/_templates/bootstrap/localtoc.html +++ /dev/null @@ -1,5 +0,0 @@ -
  • - {{ _('Page') }} -
      {{ toc }}
    - -
    • diff --git a/docs/_templates/bootstrap/relations.html b/docs/_templates/bootstrap/relations.html deleted file mode 100644 index b3df68e3b..000000000 --- a/docs/_templates/bootstrap/relations.html +++ /dev/null @@ -1,8 +0,0 @@ -{%- if prev %} -
  • {{ "«"|safe }} {{ prev.title }}
    • -{%- endif %} -{%- if next %} -
  • {{ next.title }} {{ "»"|safe }}
    • -{%- endif %} diff --git a/docs/_templates/bootstrap/searchbox.html b/docs/_templates/bootstrap/searchbox.html deleted file mode 100644 index 67852e6f8..000000000 --- a/docs/_templates/bootstrap/searchbox.html +++ /dev/null @@ -1,7 +0,0 @@ -{%- if pagename != "search" %} -
    - - - -
    -{%- endif %} diff --git a/docs/_templates/bootstrap/sourcelink.html b/docs/_templates/bootstrap/sourcelink.html deleted file mode 100644 index 21ae2d8fe..000000000 --- a/docs/_templates/bootstrap/sourcelink.html +++ /dev/null @@ -1,4 +0,0 @@ -{%- if show_source and has_source and sourcename %} -
  • {{ _('Source') }}
    • -{%- endif %} diff --git a/docs/_templates/bootstrap/static/bootstrap-responsive.css b/docs/_templates/bootstrap/static/bootstrap-responsive.css deleted file mode 100644 index dd134a1bd..000000000 --- a/docs/_templates/bootstrap/static/bootstrap-responsive.css +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Bootstrap Responsive v2.0.3 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}@media(max-width:767px){.visible-phone{display:inherit!important}.hidden-phone{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(min-width:768px) and (max-width:979px){.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:18px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.modal{position:absolute;top:10px;right:10px;left:10px;width:auto;margin:0}.modal.fade.in{top:auto}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:auto;margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:20px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.762430939%;*margin-left:2.709239449638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:99.999999993%;*width:99.9468085036383%}.row-fluid .span11{width:91.436464082%;*width:91.38327259263829%}.row-fluid .span10{width:82.87292817100001%;*width:82.8197366816383%}.row-fluid .span9{width:74.30939226%;*width:74.25620077063829%}.row-fluid .span8{width:65.74585634900001%;*width:65.6926648596383%}.row-fluid .span7{width:57.182320438000005%;*width:57.129128948638304%}.row-fluid .span6{width:48.618784527%;*width:48.5655930376383%}.row-fluid .span5{width:40.055248616%;*width:40.0020571266383%}.row-fluid .span4{width:31.491712705%;*width:31.4385212156383%}.row-fluid .span3{width:22.928176794%;*width:22.874985304638297%}.row-fluid .span2{width:14.364640883%;*width:14.311449393638298%}.row-fluid .span1{width:5.801104972%;*width:5.747913482638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:714px}input.span11,textarea.span11,.uneditable-input.span11{width:652px}input.span10,textarea.span10,.uneditable-input.span10{width:590px}input.span9,textarea.span9,.uneditable-input.span9{width:528px}input.span8,textarea.span8,.uneditable-input.span8{width:466px}input.span7,textarea.span7,.uneditable-input.span7{width:404px}input.span6,textarea.span6,.uneditable-input.span6{width:342px}input.span5,textarea.span5,.uneditable-input.span5{width:280px}input.span4,textarea.span4,.uneditable-input.span4{width:218px}input.span3,textarea.span3,.uneditable-input.span3{width:156px}input.span2,textarea.span2,.uneditable-input.span2{width:94px}input.span1,textarea.span1,.uneditable-input.span1{width:32px}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:30px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.564102564%;*margin-left:2.510911074638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145300001%;*width:91.3997999636383%}.row-fluid .span10{width:82.905982906%;*width:82.8527914166383%}.row-fluid .span9{width:74.358974359%;*width:74.30578286963829%}.row-fluid .span8{width:65.81196581200001%;*width:65.7587743226383%}.row-fluid .span7{width:57.264957265%;*width:57.2117657756383%}.row-fluid .span6{width:48.717948718%;*width:48.6647572286383%}.row-fluid .span5{width:40.170940171000005%;*width:40.117748681638304%}.row-fluid .span4{width:31.623931624%;*width:31.5707401346383%}.row-fluid .span3{width:23.076923077%;*width:23.0237315876383%}.row-fluid .span2{width:14.529914530000001%;*width:14.4767230406383%}.row-fluid .span1{width:5.982905983%;*width:5.929714493638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:1160px}input.span11,textarea.span11,.uneditable-input.span11{width:1060px}input.span10,textarea.span10,.uneditable-input.span10{width:960px}input.span9,textarea.span9,.uneditable-input.span9{width:860px}input.span8,textarea.span8,.uneditable-input.span8{width:760px}input.span7,textarea.span7,.uneditable-input.span7{width:660px}input.span6,textarea.span6,.uneditable-input.span6{width:560px}input.span5,textarea.span5,.uneditable-input.span5{width:460px}input.span4,textarea.span4,.uneditable-input.span4{width:360px}input.span3,textarea.span3,.uneditable-input.span3{width:260px}input.span2,textarea.span2,.uneditable-input.span2{width:160px}input.span1,textarea.span1,.uneditable-input.span1{width:60px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top{position:static;margin-bottom:18px}.navbar-fixed-top .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 9px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#999;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#222}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:block;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222;border-bottom:1px solid #222;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}} diff --git a/docs/_templates/bootstrap/static/bootstrap-sphinx.css_t b/docs/_templates/bootstrap/static/bootstrap-sphinx.css_t deleted file mode 100644 index 965aa9ecf..000000000 --- a/docs/_templates/bootstrap/static/bootstrap-sphinx.css_t +++ /dev/null @@ -1,24 +0,0 @@ -/* -* bootstrap-sphinx.css -* ~~~~~~~~~~~~~~~~~~~~ -* -* Sphinx stylesheet -- Twitter Bootstrap theme. -*/ - -body { - padding-top: 52px; -} - -.navbar .brand { - color: #FFF; - text-shadow: #777 2px 2px 3px; -} - -{%- block sidebarlogo %} - {%- if logo %} -.navbar h3 a, .navbar .brand { - background: transparent url("{{ logo }}") no-repeat 22px 3px; - padding-left: 62px; -} - {%- endif %} -{%- endblock %} diff --git a/docs/_templates/bootstrap/static/bootstrap.css b/docs/_templates/bootstrap/static/bootstrap.css deleted file mode 100644 index 1c75d0c07..000000000 --- a/docs/_templates/bootstrap/static/bootstrap.css +++ /dev/null @@ -1,9 +0,0 @@ -/*! - * Bootstrap v2.0.3 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:20px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.127659574%;*margin-left:2.0744680846382977%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:99.99999998999999%;*width:99.94680850063828%}.row-fluid .span11{width:91.489361693%;*width:91.4361702036383%}.row-fluid .span10{width:82.97872339599999%;*width:82.92553190663828%}.row-fluid .span9{width:74.468085099%;*width:74.4148936096383%}.row-fluid .span8{width:65.95744680199999%;*width:65.90425531263828%}.row-fluid .span7{width:57.446808505%;*width:57.3936170156383%}.row-fluid .span6{width:48.93617020799999%;*width:48.88297871863829%}.row-fluid .span5{width:40.425531911%;*width:40.3723404216383%}.row-fluid .span4{width:31.914893614%;*width:31.8617021246383%}.row-fluid .span3{width:23.404255317%;*width:23.3510638276383%}.row-fluid .span2{width:14.89361702%;*width:14.8404255306383%}.row-fluid .span1{width:6.382978723%;*width:6.329787233638298%}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;content:""}.container-fluid:after{clear:both}p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px}p small{font-size:11px;color:#999}.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px}h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999}h1{font-size:30px;line-height:36px}h1 small{font-size:18px}h2{font-size:24px;line-height:36px}h2 small{font-size:18px}h3{font-size:18px;line-height:27px}h3 small{font-size:14px}h4,h5,h6{line-height:18px}h4{font-size:14px}h4 small{font-size:12px}h5{font-size:12px}h6{font-size:11px;color:#999;text-transform:uppercase}.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eee}.page-header h1{line-height:1}ul,ol{padding:0;margin:0 0 9px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}ul{list-style:disc}ol{list-style:decimal}li{line-height:18px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}dl{margin-bottom:18px}dt,dd{line-height:18px}dt{font-weight:bold;line-height:17px}dd{margin-left:9px}.dl-horizontal dt{float:left;width:120px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:130px}hr{margin:18px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}strong{font-weight:bold}em{font-style:italic}.muted{color:#999}abbr[title]{cursor:help;border-bottom:1px dotted #ddd}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px}blockquote small{display:block;line-height:18px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:18px;font-style:normal;line-height:18px}small{font-size:100%}cite{font-style:normal}code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:18px}pre code{padding:0;color:inherit;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 18px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333;border:0;border-bottom:1px solid #eee}legend small{font-size:13.5px;color:#999}label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px;color:#333}input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555;background-color:#fff;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.uneditable-textarea{width:auto;height:auto}label input,label textarea,label select{display:block}input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;background-color:transparent;border:0 \9;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}input[type="image"]{border:0}input[type="file"]{width:auto;padding:initial;line-height:initial;background-color:#fff;background-color:initial;border:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto}select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px}input[type="file"]{line-height:18px \9}select{width:220px;background-color:#fff}select[multiple],select[size]{height:auto}input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}textarea{height:auto}input[type="hidden"]{display:none}.radio,.checkbox{min-height:18px;padding-left:18px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-ms-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}input:focus,textarea:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:930px}input.span11,textarea.span11,.uneditable-input.span11{width:850px}input.span10,textarea.span10,.uneditable-input.span10{width:770px}input.span9,textarea.span9,.uneditable-input.span9{width:690px}input.span8,textarea.span8,.uneditable-input.span8{width:610px}input.span7,textarea.span7,.uneditable-input.span7{width:530px}input.span6,textarea.span6,.uneditable-input.span6{width:450px}input.span5,textarea.span5,.uneditable-input.span5{width:370px}input.span4,textarea.span4,.uneditable-input.span4{width:290px}input.span3,textarea.span3,.uneditable-input.span3{width:210px}input.span2,textarea.span2,.uneditable-input.span2{width:130px}input.span1,textarea.span1,.uneditable-input.span1{width:50px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee;border-color:#ddd}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;*zoom:1}.form-actions:before,.form-actions:after{display:table;content:""}.form-actions:after{clear:both}.uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#fff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}:-moz-placeholder{color:#999}::-webkit-input-placeholder{color:#999}.help-block,.help-inline{color:#555}.help-block{display:block;margin-bottom:9px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-prepend,.input-append{margin-bottom:5px}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:middle;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{z-index:2}.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc}.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;height:18px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #fff;vertical-align:middle;background-color:#eee;border:1px solid #ccc}.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append .uneditable-input{border-right-color:#ccc;border-left-color:#eee}.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:9px}legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:18px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:160px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:160px}.form-horizontal .help-block{margin-top:9px;margin-bottom:0}.form-horizontal .form-actions{padding-left:160px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:18px}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9}.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5}table .span1{float:none;width:44px;margin-left:0}table .span2{float:none;width:124px;margin-left:0}table .span3{float:none;width:204px;margin-left:0}table .span4{float:none;width:284px;margin-left:0}table .span5{float:none;width:364px;margin-left:0}table .span6{float:none;width:444px;margin-left:0}table .span7{float:none;width:524px;margin-left:0}table .span8{float:none;width:604px;margin-left:0}table .span9{float:none;width:684px;margin-left:0}table .span10{float:none;width:764px;margin-left:0}table .span11{float:none;width:844px;margin-left:0}table .span12{float:none;width:924px;margin-left:0}table .span13{float:none;width:1004px;margin-left:0}table .span14{float:none;width:1084px;margin-left:0}table .span15{float:none;width:1164px;margin-left:0}table .span16{float:none;width:1244px;margin-left:0}table .span17{float:none;width:1324px;margin-left:0}table .span18{float:none;width:1404px;margin-left:0}table .span19{float:none;width:1484px;margin-left:0}table .span20{float:none;width:1564px;margin-left:0}table .span21{float:none;width:1644px;margin-left:0}table .span22{float:none;width:1724px;margin-left:0}table .span23{float:none;width:1804px;margin-left:0}table .span24{float:none;width:1884px;margin-left:0}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0}.icon-white{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";opacity:.3;filter:alpha(opacity=30)}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown:hover .caret,.open .caret{opacity:1;filter:alpha(opacity=100)}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:4px 0;margin:1px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333;white-space:nowrap}.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#08c}.open{*z-index:1000}.open .dropdown-menu{display:block}.pull-right .dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:"\2191"}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0,0,0,0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-ms-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1;filter:alpha(opacity=100)}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-ms-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 10px 4px;margin-bottom:0;*margin-left:.3em;font-size:13px;line-height:18px;*line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(top,#fff,#e6e6e6);background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#e6e6e6',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover{color:#333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.btn-large [class^="icon-"]{margin-top:1px}.btn-small{padding:5px 9px;font-size:11px;line-height:16px}.btn-small [class^="icon-"]{margin-top:-1px}.btn-mini{padding:2px 6px;font-size:11px;line-height:14px}.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn{border-color:#ccc;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.btn-primary{background-color:#0074cc;*background-color:#05c;background-image:-ms-linear-gradient(top,#08c,#05c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#05c));background-image:-webkit-linear-gradient(top,#08c,#05c);background-image:-o-linear-gradient(top,#08c,#05c);background-image:-moz-linear-gradient(top,#08c,#05c);background-image:linear-gradient(top,#08c,#05c);background-repeat:repeat-x;border-color:#05c #05c #003580;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc',endColorstr='#0055cc',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#05c;*background-color:#004ab3}.btn-primary:active,.btn-primary.active{background-color:#004099 \9}.btn-warning{background-color:#faa732;*background-color:#f89406;background-image:-ms-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(top,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450',endColorstr='#f89406',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{background-color:#da4f49;*background-color:#bd362f;background-image:-ms-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(top,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#bd362f',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{background-color:#5bb75b;*background-color:#51a351;background-image:-ms-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(top,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#62c462',endColorstr='#51a351',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{background-color:#49afcd;*background-color:#2f96b4;background-image:-ms-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(top,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de',endColorstr='#2f96b4',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{background-color:#414141;*background-color:#222;background-image:-ms-linear-gradient(top,#555,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#555),to(#222));background-image:-webkit-linear-gradient(top,#555,#222);background-image:-o-linear-gradient(top,#555,#222);background-image:-moz-linear-gradient(top,#555,#222);background-image:linear-gradient(top,#555,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#555555',endColorstr='#222222',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-group{position:relative;*margin-left:.3em;*zoom:1}.btn-group:before,.btn-group:after{display:table;content:""}.btn-group:after{clear:both}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:9px;margin-bottom:9px}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1}.btn-group>.btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.dropdown-toggle{*padding-top:4px;padding-right:8px;*padding-bottom:4px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini.dropdown-toggle{padding-right:5px;padding-left:5px}.btn-group>.btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px}.btn-group>.btn-large.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#05c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:7px;margin-left:0}.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100)}.btn-mini .caret{margin-top:5px}.btn-small .caret{margin-top:6px}.btn-large .caret{margin-top:6px;border-top-width:5px;border-right-width:5px;border-left-width:5px}.dropup .btn-large .caret{border-top:0;border-bottom:5px solid #000}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:.75;filter:alpha(opacity=75)}.alert{padding:8px 35px 8px 14px;margin-bottom:18px;color:#c09853;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert-heading{color:inherit}.alert .close{position:relative;top:-2px;right:-21px;line-height:18px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:18px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>.pull-right{float:right}.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.nav-tabs.nav-stacked>li>a:hover{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px}.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333;border-bottom-color:#333}.nav>.dropdown.active>a:hover{color:#000;cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.navbar{*position:relative;*z-index:2;margin-bottom:18px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top,#333,#222);background-image:-ms-linear-gradient(top,#333,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#333),to(#222));background-image:-webkit-linear-gradient(top,#333,#222);background-image:-o-linear-gradient(top,#333,#222);background-image:linear-gradient(top,#333,#222);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1)}.navbar .container{width:auto}.nav-collapse.collapse{height:auto}.navbar{color:#999}.navbar .brand:hover{text-decoration:none}.navbar .brand{display:block;float:left;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#999}.navbar .navbar-text{margin-bottom:0;line-height:40px}.navbar .navbar-link{color:#999}.navbar .navbar-link:hover{color:#fff}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn{margin:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#fff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none}.navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-bottom{bottom:0}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right}.navbar .nav>li{display:block;float:left}.navbar .nav>li>a{float:none;padding:9px 10px 11px;line-height:19px;color:#999;text-decoration:none;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:18px}.navbar .btn-group{padding:5px 5px 6px;margin:0}.navbar .nav>li>a:hover{color:#fff;text-decoration:none;background-color:transparent}.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#fff;text-decoration:none;background-color:#222}.navbar .divider-vertical{width:1px;height:40px;margin:0 9px;overflow:hidden;background-color:#222;border-right:1px solid #333}.navbar .nav.pull-right{margin-right:0;margin-left:10px}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;background-color:#2c2c2c;*background-color:#222;background-image:-ms-linear-gradient(top,#333,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#333),to(#222));background-image:-webkit-linear-gradient(top,#333,#222);background-image:-o-linear-gradient(top,#333,#222);background-image:linear-gradient(top,#333,#222);background-image:-moz-linear-gradient(top,#333,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{background-color:#222;*background-color:#151515}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#080808 \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.dropdown.open .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar .nav li.dropdown.active .caret{opacity:1;filter:alpha(opacity=100)}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent}.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#fff}.navbar .pull-right .dropdown-menu,.navbar .dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right .dropdown-menu:before,.navbar .dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right .dropdown-menu:after,.navbar .dropdown-menu.pull-right:after{right:13px;left:auto}.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top,#fff,#f5f5f5);background-image:-ms-linear-gradient(top,#fff,#f5f5f5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#fff,#f5f5f5);background-image:-o-linear-gradient(top,#fff,#f5f5f5);background-image:linear-gradient(top,#fff,#f5f5f5);background-repeat:repeat-x;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#f5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.breadcrumb li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb .divider{padding:0 5px;color:#999}.breadcrumb .active a{color:#333}.pagination{height:36px;margin:18px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination li{display:inline}.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0}.pagination a:hover,.pagination .active a{background-color:#f5f5f5}.pagination .active a{color:#999;cursor:default}.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999;cursor:default;background-color:transparent}.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pager{margin-bottom:18px;margin-left:0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;content:""}.pager:after{clear:both}.pager li{display:inline}.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager a:hover{text-decoration:none;background-color:#f5f5f5}.pager .next a{float:right}.pager .previous a{float:left}.pager .disabled a,.pager .disabled a:hover{color:#999;cursor:default;background-color:#fff}.modal-open .dropdown-menu{z-index:2050}.modal-open .dropdown.open{*z-index:2050}.modal-open .popover{z-index:2060}.modal-open .tooltip{z-index:2070}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:50%;left:50%;z-index:1050;width:560px;margin:-250px 0 0 -280px;overflow:auto;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-ms-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:50%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-body{max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.tooltip{position:absolute;z-index:1020;display:block;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-2px}.tooltip.right{margin-left:2px}.tooltip.bottom{margin-top:2px}.tooltip.left{margin-left:-2px}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top:5px solid #000;border-right:5px solid transparent;border-left:5px solid transparent}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-right:5px solid transparent;border-bottom:5px solid #000;border-left:5px solid transparent}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-right:5px solid #000;border-bottom:5px solid transparent}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px}.popover.top{margin-top:-5px}.popover.right{margin-left:5px}.popover.bottom{margin-top:5px}.popover.left{margin-left:-5px}.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-top:5px solid #000;border-right:5px solid transparent;border-left:5px solid transparent}.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-right:5px solid #000;border-bottom:5px solid transparent}.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-right:5px solid transparent;border-bottom:5px solid #000;border-left:5px solid transparent}.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000}.popover .arrow{position:absolute;width:0;height:0}.popover-inner{width:280px;padding:3px;overflow:hidden;background:#000;background:rgba(0,0,0,0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3)}.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0}.popover-content{padding:14px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:18px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:0 1px 1px rgba(0,0,0,0.075);box-shadow:0 1px 1px rgba(0,0,0,0.075)}a.thumbnail:hover{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px}.label,.badge{font-size:10.998px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}a.label:hover,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:18px;margin-bottom:18px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-ms-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(top,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5',endColorstr='#f9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{width:0;height:18px;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(top,#149bdf,#0480be);background-image:-ms-linear-gradient(top,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf',endColorstr='#0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-ms-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-striped .bar{background-color:#149bdf;background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-ms-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(top,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#c43c35',GradientType=0)}.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-ms-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(top,#62c462,#57a957);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#62c462',endColorstr='#57a957',GradientType=0)}.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-ms-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(top,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de',endColorstr='#339bb9',GradientType=0)}.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-ms-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(top,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450',endColorstr='#f89406',GradientType=0)}.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:18px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:18px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel .item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-ms-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel .item>img{display:block;line-height:1}.carousel .active,.carousel .next,.carousel .prev{display:block}.carousel .active{left:0}.carousel .next,.carousel .prev{position:absolute;top:0;width:100%}.carousel .next{left:100%}.carousel .prev{left:-100%}.carousel .next.left,.carousel .prev.right{left:0}.carousel .active.left{left:-100%}.carousel .active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:10px 15px 5px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{color:#fff}.hero-unit{padding:60px;margin-bottom:30px;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden} diff --git a/docs/_templates/bootstrap/static/bootstrap.js b/docs/_templates/bootstrap/static/bootstrap.js deleted file mode 100644 index 1f87730a3..000000000 --- a/docs/_templates/bootstrap/static/bootstrap.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! -* Bootstrap.js by @fat & @mdo -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
    ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var e=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.hide)return c.hide();clearTimeout(this.timeout),c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},isHTML:function(a){return typeof a!="string"||a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3||/^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(a)},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.isHTML(b)?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover",title:"",delay:0}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.isHTML(b)?"html":"text"](b),a.find(".popover-content > *")[this.isHTML(c)?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

    '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&c.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu")&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){return c.matcher(a)}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.type!="keydown")break;a.preventDefault(),this.prev();break;case 40:if(a.type!="keydown")break;a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); \ No newline at end of file diff --git a/docs/_templates/bootstrap/static/img/glyphicons-halflings-white.png b/docs/_templates/bootstrap/static/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8777 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 B7G?kd diff --git a/docs/_templates/bootstrap/static/img/glyphicons-halflings.png b/docs/_templates/bootstrap/static/img/glyphicons-halflings.png deleted file mode 100644 index 79bc568c21395d5a5ceab62fadb04457094b2ac7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13826 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 diff --git a/docs/_templates/bootstrap/static/jquery.js b/docs/_templates/bootstrap/static/jquery.js deleted file mode 100644 index 16ad06c5a..000000000 --- a/docs/_templates/bootstrap/static/jquery.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.7.2 jquery.com | jquery.org/license */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"":"")+""),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;e=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
      a",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="
      "+""+"
      ",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="
      t
      ",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="
      ",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function( -a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&j.push({elem:this,matches:d.slice(e)});for(k=0;k0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

      ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
      ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*",""],legend:[1,"
      ","
      "],thead:[1,"","
      "],tr:[2,"","
      "],td:[3,"","
      "],col:[2,"","
      "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
      ","
      "]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f -.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]===""&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
      ").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/docs/_templates/bootstrap/theme.conf b/docs/_templates/bootstrap/theme.conf deleted file mode 100644 index 64f9efd56..000000000 --- a/docs/_templates/bootstrap/theme.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Twitter Bootstrap Theme -[theme] -inherit = basic -stylesheet = basic.css -pygments_style = tango diff --git a/docs/common_conf.py b/docs/common_conf.py deleted file mode 100644 index aeeb6a18e..000000000 --- a/docs/common_conf.py +++ /dev/null @@ -1,98 +0,0 @@ -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions += ['sphinx.ext.inheritance_diagram', 'sphinxcontrib.blockdiag', 'sphinxcontrib.actdiag', 'sphinxcontrib.seqdiag', 'sphinxcontrib.nwdiag'] - -# The encoding of source files. -source_encoding = 'utf-8-sig' -#source_encoding = 'shift_jis' - -# The language for content autogenerated by Sphinx. -language = 'en' -#language = 'ja' - -# The theme to use for HTML and HTML Help pages. -#html_theme = 'default' -#html_theme = 'sphinxdoc' -#html_theme = 'scrolls' -#html_theme = 'agogo' -#html_theme = 'traditional' -#html_theme = 'nature' -#html_theme = 'haiku' - -# If this is not the empty string, a 'Last updated on:' timestamp -# is inserted at every page bottom, using the given strftime() format. -# Default is '%b %d, %Y' (or a locale-dependent equivalent). -html_last_updated_fmt = '%Y/%m/%d' - -# Enable Antialiasing -blockdiag_antialias = True -acttdiag_antialias = True -seqdiag_antialias = True -nwdiag_antialias = True - -extensions += ['rst2pdf.pdfbuilder'] -pdf_documents = [ - (master_doc, project, project, copyright), -] -pdf_stylesheets = ['sphinx','kerning','a4','en'] -pdf_language = "en" -# Mode for literal blocks wider than the frame. Can be -# overflow, shrink or truncate -#pdf_fit_mode = "shrink" - -# Section level that forces a break page. -# For example: 1 means top-level sections start in a new page -# 0 means disabled -#pdf_break_level = 0 - -# When a section starts in a new page, force it to be 'even', 'odd', -# or just use 'any' -pdf_breakside = 'any' - -# Insert footnotes where they are defined instead of -# at the end. -pdf_inline_footnotes = True - -# verbosity level. 0 1 or 2 -pdf_verbosity = 0 - -# If false, no index is generated. -pdf_use_index = True - -# If false, no modindex is generated. -pdf_use_modindex = True - -# If false, no coverpage is generated. -pdf_use_coverpage = True - -# Name of the cover page template to use -#pdf_cover_template = 'sphinxcover.tmpl' - -# Documents to append as an appendix to all manuals. -#pdf_appendices = [] - -# Enable experimental feature to split table cells. Use it -# if you get "DelayedTable too big" errors -#pdf_splittables = False - -# Set the default DPI for images -#pdf_default_dpi = 72 - -# Enable rst2pdf extension modules (default is only vectorpdf) -# you need vectorpdf if you want to use sphinx's graphviz support -#pdf_extensions = ['vectorpdf'] - -# Page template name for "regular" pages -#pdf_page_template = 'cutePage' - -# Show Table Of Contents at the beginning? -pdf_use_toc = True - -# How many levels deep should the table of contents be? -pdf_toc_depth = 2 - -# Add section number to section references -pdf_use_numbered_links = False - -# Background images fitting mode -pdf_fit_background_mode = 'scale' \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py deleted file mode 100644 index 642c45e6f..000000000 --- a/docs/conf.py +++ /dev/null @@ -1,254 +0,0 @@ -# -*- coding: utf-8 -*- -# -# scaffold documentation build configuration file, created by -# sphinx-quickstart on Tue Sep 25 14:02:29 2012. -# -# This file is execfile()d with the current directory set to its containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys, os - -sys.path.insert(0, os.path.join(os.path.abspath('.'), "..", "nailgun")) -autodoc_default_flags = ['members'] -autodoc_member_order = 'bysource' - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ----------------------------------------------------- - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = [ - 'sphinx.ext.autodoc', - 'rst2pdf.pdfbuilder', - 'sphinxcontrib.plantuml', - 'nailgun.autoapidoc' -] -plantuml = ['java','-jar','plantuml.jar'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'Fuel' -copyright = u'2012, Mirantis' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '0' -# The full version, including alpha/beta/rc tags. -release = '3.2' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - - -# -- Options for HTML output --------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'sphinxdoc' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -html_theme_path = ["_templates"] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'scaffolddoc' - - -# -- Options for LaTeX output -------------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'scaffold.tex', u'scaffold Documentation', - u'Mike Scherbakov', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output -------------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'scaffold', u'scaffold Documentation', - [u'Mike Scherbakov'], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------------ - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'scaffold', u'scaffold Documentation', - u'Mike Scherbakov', 'scaffold', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' -# -- Additional Settings ------------------------------------------------------- -execfile('./common_conf.py') diff --git a/docs/develop.rst b/docs/develop.rst deleted file mode 100644 index 07b4c6fc7..000000000 --- a/docs/develop.rst +++ /dev/null @@ -1,14 +0,0 @@ -.. _develop: - -Development Documentation -========================= - -.. toctree:: - :maxdepth: 2 - - develop/logical_arch - develop/sequence - develop/env - develop/nailgun - develop/alternatives - develop/api_doc diff --git a/docs/develop/alternatives.rst b/docs/develop/alternatives.rst deleted file mode 100644 index cf9017517..000000000 --- a/docs/develop/alternatives.rst +++ /dev/null @@ -1,121 +0,0 @@ -Alternatives -============ - -Metadata via Puppet ENC (part of architecture) ----------------------------------------------- - -This is alternative possible architecture. -See corresponding sequence diagram and more information here: :ref:`deploy_via_enc_sequence`. - - .. uml:: - package "Master Node" { - [Async RPC consumer(Naily)] --> [Orchestrator] - [Orchestrator] --> [MCollective] - [Orchestrator] <-- [YAML data source] - [Puppet Master] --> [ENC Script] - [ENC Script] --> [YAML data source] - } - package "Target Node" { - [MCollective Agent] --> [Puppet] - } - actor CLI_User - CLI_User --> [YAML data source] - CLI_User --> [Orchestrator] - - [MCollective] --> [MCollective Agent] - [Puppet] --> [Puppet Master] - -.. _deploy_via_enc_sequence: - -Alternative Implementation for deployment via ENC -------------------------------------------------- - .. uml:: - title Diagram of ALTERNATIVE Implementation of Cluster Deployment - autonumber - actor WebUser - - Nailgun -> Naily: Deploy cluster - Naily -> YAML_file: Store configuration - Naily -> Orchestrator: Deploy - Orchestrator -> YAML_file: get data - YAML_file --> Orchestrator: data - Orchestrator -> MC: nodes ready? - MC --> Orchestrator: ready - Orchestrator --> Naily: ready - Naily -> Nailgun: nodes booted - Nailgun --> WebUser: status on UI - ||| - Orchestrator -> MC: run puppet - MC -> Puppet: runonce - Puppet -> Puppet_master: get modules,class - Puppet_master -> ENC: get class - ENC -> YAML_file: get class - YAML_file --> ENC: class to deploy - ENC --> Puppet_master: class - Puppet_master --> Puppet: modules, class - Puppet -> Puppet: applies $role - Puppet --> MC: done - MC --> Orchestrator: deploy is done - Orchestrator -> YAML_file: update info - Orchestrator --> Naily: deploy is done - Naily --> Nailgun: deploy is done - Nailgun --> WebUser: deploy is done - -Alternative schema of deployment is different in following: - -* Naily stores all data about deployment into YAML file before the deployment, and then calls Orchestrator -* Orchestrator loads nodes information from YAML and calls puppet via MCollective -* Puppet requests data from Puppet master -* Puppet uses `ENC extension `_ to get information what - classes should be applied on particular node. If try to explain in a few - words what ENC is - it is Puppet Master's extension to call external user defined script -* ENC script loads all required data from YAML file -* YAML file could be replaced by some NoSQL DB - -Comparison of deployment approaches ------------------------------------ - -Data from Facter -^^^^^^^^^^^^^^^^ -Pros: - -* Easy. Put file on node via MCollective, and we know what will be executed there. It's easy to check what have been - executed last time. -* No additional stateful components. Otherwise it could lead to data inconsistency -* Easy to switch into configuration without Puppet Master or even replace it to Chef Solo -* Requires time to place data on nodes before puppet run, and implementation in syncronious way - puppet should not - run before the node receive it's role. - -Cons: - -* Doesn't look like a "Puppet" way, when desired state of Cluster should be defined beforeahead and Puppet - will converge the existing state to the desired state - -Data from ENC -^^^^^^^^^^^^^ -Pros: - -* "Puppet" way, everything what is needed is defined in YAML file -* All information could be found in one place - YAML file - -Cons: - -* Naily should know the data structure in YAML file to do the merge. (however it can just call Orchestrator with - metadata, and Orchestrator will write data to YAML file) -* Requires additional stateful component - YAML file, what may lead to data inconsistency -* Puppet Master must be installed on the same node as Orchestrator (to access YAML file). Even if YAML file - is replaced to NoSQL DB, ENC script still has to be present on Puppet Master node. -* With increase of deployment complexity and metadata, YAML file will increase in size. It also should contain - information about all clusters and all nodes consequently, which could become a bottleneck for loading data - in case of hundrends nodes and thousand requests. Separation of YAML structure in cluster-based will not help - because there will be need to pass cluster identifier to puppet, what's unclear how to do besides facter - extension. -* More complex code for Naily(or Orchestrator) is required to do merges of existing data in YAML file and new data, - code to prevent concurrency issues. It would be even more complex with Updates feature, when it would require - of a sequence of actions performed in a specific order. -* Let's say we have attribute { 'keystone' => { 'data_dir' => '/var/lib/keystone' } }, and we want to update our - cluster to new version of OpenStack, node by node, where data_dir location is different. In case with NailyFact, - it's easy - just write facts on target node and run puppet on it, other nodes will not be affected (they still - have settings for old data_dir location). In case with data from ENC it's much more complex, because there is - only single DB - YAML file for the whole cluster. It means it would not be possible to run puppet on old nodes - if they should not be updated yet. diff --git a/docs/develop/api_doc.rst b/docs/develop/api_doc.rst deleted file mode 100644 index 440fe5e4e..000000000 --- a/docs/develop/api_doc.rst +++ /dev/null @@ -1,70 +0,0 @@ -REST API Reference -================== - -.. contents:: :local: - - -Releases API ------------- - -.. automodule:: nailgun.api.handlers.release - - -Clusters API ------------- - -.. automodule:: nailgun.api.handlers.cluster - - -Nodes API ---------- - -.. automodule:: nailgun.api.handlers.node - - -Disks API ---------- - -.. automodule:: nailgun.api.handlers.disks - - -Network Configuration API -------------------------- - -.. automodule:: nailgun.api.handlers.network_configuration - - -Notifications API ------------------ - -.. automodule:: nailgun.api.handlers.notifications - - -Tasks API ------------------ - -.. automodule:: nailgun.api.handlers.tasks - - -Logs API ------------------ - -.. automodule:: nailgun.api.handlers.logs - - -Plugin API ----------- - -.. automodule:: nailgun.api.handlers.plugin - - -Redhat API ------------------ - -.. automodule:: nailgun.api.handlers.redhat - - -Version API ------------------ - -.. automodule:: nailgun.api.handlers.version diff --git a/docs/develop/env.rst b/docs/develop/env.rst deleted file mode 100644 index f0487c2dc..000000000 --- a/docs/develop/env.rst +++ /dev/null @@ -1,273 +0,0 @@ -Fuel Development Environment -============================ - -Basic OS for Fuel development is Ubuntu Linux. Setup instructions below -assume Ubuntu 13.04, most of them should be applicable to other Ubuntu -and Debian versions, too. - -Each subsequent section below assumes that you have followed the steps -described in all preceding sections. By the end of this document, you -should be able to run and test all key components of Fuel, build Fuel -master node installation ISO, and generate documentation. - -Getting the Source Code ------------------------ - -Clone the Mirantis FuelWeb repository from GitHub:: - - git clone git@github.com:Mirantis/fuelweb.git - cd fuelweb - git submodule init - git submodule update - -All sections below assume you start in your clone of this repository. - -Setup for Nailgun Unit Tests ----------------------------- - -#. Install Python dependencies (fysom has no deb package, and the - jsonschema deb is outdated, so these modules have to be installed - from PyPi):: - - sudo apt-get install python-dev python-pip python-psycopg2 python-jinja2 - sudo apt-get install python-paste python-yaml python-sqlalchemy python-kombu - sudo apt-get install python-crypto python-simplejson python-webpy - sudo apt-get install python-nose python-mock python-decorator python-flake8 - sudo apt-get install python-netaddr python-netifaces - sudo easy_install -U setuptools==1.0 - sudo easy_install -U pip==1.2.1 - sudo pip install fysom jsonschema hacking==0.7 nose-timer - -#. Install and configure PostgreSQL database:: - - sudo apt-get install postgresql postgresql-server-dev-9.1 - sudo -u postgres createuser -SDRP nailgun (enter password nailgun) - sudo -u postgres createdb nailgun - -#. Create required folder for log files:: - - sudo mkdir /var/log/nailgun - sudo chown -R `whoami`.`whoami` /var/log/nailgun - -#. Run the Nailgun backend unit tests:: - - cd nailgun - ./run_tests.sh --no-jslint --no-ui-tests - -#. Run the Nailgun flake8 test:: - - cd nailgun - ./run_tests.sh --flake8 - -Setup for Web UI Tests ----------------------- - -#. Install NodeJS (on Debian, you may need to use 'apt-get install -t - experimental' to get the latest npm, on Ubuntu 12.04, use nodejs package - instead of nodejs-legacy)) and CasperJS:: - - sudo apt-get install npm nodejs-legacy phantomjs - sudo npm install -g jslint requirejs - cd ~ - git clone git://github.com/n1k0/casperjs.git - cd casperjs - git checkout tags/1.0.0-RC4 - sudo ln -sf `pwd`/bin/casperjs /usr/local/bin/casperjs - -#. Run full Web UI test suite (this will wipe your Nailgun database in - PostgreSQL):: - - cd nailgun - ./run_tests.sh --jslint - ./run_tests.sh --ui-tests - -Running Nailgun in Fake Mode ----------------------------- - -#. Populate the database from fixtures:: - - cd nailgun - ./manage.py syncdb - ./manage.py loaddefault # It loads all basic fixtures listed in settings.yaml - ./manage.py loaddata nailgun/fixtures/sample_environment.json # Loads fake nodes - -#. Start application in "fake" mode, when no real calls to orchestrator - are performed:: - - python manage.py run -p 8000 --fake-tasks | egrep --line-buffered -v '^$|HTTP' >> /var/log/nailgun.log 2>&1 & - -#. (optional) You can also use --fake-tasks-amqp option if you want to - make fake environment use real RabbitMQ instead of fake one:: - - python manage.py run -p 8000 --fake-tasks-amqp | egrep --line-buffered -v '^$|HTTP' >> /var/log/nailgun.log 2>&1 & - -Astute and Naily ----------------- - -#. Install Ruby dependencies:: - - sudo apt-get install git curl - \curl -L https://get.rvm.io | bash -s stable - rvm install 1.9.3 - -#. Install or update dependencies and run unit tests:: - - cd astute - ./run_tests.sh - -#. (optional) Run Astute MCollective integration test (you'll need to - have MCollective server running for this to work):: - - cd astute - bundle exec rspec spec/integration/mcollective_spec.rb - -Building the Fuel ISO ---------------------- - -#. Following software is required to build the Fuel ISO images on Ubuntu - 12.10 or newer (on Ubuntu 12.04, use nodejs package instead of - nodejs-legacy):: - - sudo apt-get install build-essential make git ruby ruby-dev rubygems debootstrap - sudo apt-get install python-setuptools yum yum-utils libmysqlclient-dev isomd5sum - sudo apt-get install python-nose libvirt-bin python-ipaddr python-paramiko python-yaml - sudo apt-get install python-pip kpartx extlinux npm nodejs-legacy unzip genisoimage - sudo gem install bundler -v 1.2.1 - sudo gem install builder - sudo pip install xmlbuilder jinja2 - sudo npm install -g requirejs - -#. (alternative) If you have completed the instructions in the previous - sections of Fuel development environment setup guide, the list of - additional packages required to build the ISO becomes shorter:: - - sudo apt-get install ruby-dev ruby-builder bundler libmysqlclient-dev - sudo apt-get install yum-utils kpartx extlinux genisoimage isomd5sum - -#. ISO build process requires sudo permissions, allow yourself to run - commands as root user without request for a password:: - - echo "`whoami` ALL=(ALL) NOPASSWD: ALL" | sudo tee -a /etc/sudoers - -#. If you haven't already done so, get the source code:: - - git clone https://github.com/Mirantis/fuelweb.git - cd fuelweb - git submodule init - git submodule update - -#. Now you can build the Fuel ISO image:: - - make iso - -Running the FuelWeb Integration Test ------------------------------------- - -#. Install libvirt and Devops library dependencies:: - - sudo apt-get install libvirt-bin python-libvirt python-ipaddr python-paramiko - sudo pip install xmlbuilder django==1.4.3 - -#. Configure permissions for libvirt and relogin or restart your X for - the group changes to take effect (consult /etc/libvirt/libvirtd.conf - for the group name):: - - GROUP=`grep unix_sock_group /etc/libvirt/libvirtd.conf|cut -d'"' -f2` - sudo useradd `whoami` kvm - sudo useradd `whoami` $GROUP - chgrp $GROUP /var/lib/libvirt/images - chmod g+w /var/lib/libvirt/images - -#. Clone the Mirantis Devops virtual environment manipulation library - from GitHub and install it where FuelWeb Integration Test can find - it:: - - git clone git@github.com:Mirantis/devops.git - cd devops - python setup.py build - sudo python setup.py install - -#. Configure and populate the Devops DB:: - - SETTINGS=/usr/local/lib/python2.7/dist-packages/devops-2.0-py2.7.egg/devops/settings.py - sed -i "s/'postgres'/'devops'/" $SETTINGS - echo "SECRET_KEY = 'secret'" >> $SETTINGS - sudo -u postgres createdb devops - sudo -u postgres createuser -SDR devops - django-admin.py syncdb --settings=devops.settings - -#. Run the integration test:: - - cd fuelweb - make test-integration - -#. To save time, you can execute individual test cases from the - integration test suite like this (nice thing about TestAdminNode - is that it takes you from nothing to a Fuel master with 9 blank nodes - connected to 3 virtual networks):: - - cd fuelweb - export ENV_NAME=fuelweb - export PUBLIC_FORWARD=nat - export ISO_PATH=`pwd`/build/iso/fuelweb-centos-6.4-x86_64.iso - nosetests -w fuelweb_test -s fuelweb_test.integration.test_admin_node:TestAdminNode.test_cobbler_alive - -#. The test harness creates a snapshot of all nodes called 'empty' - before starting the tests, and creates a new snapshot if a test - fails. You can revert to a specific snapshot with this command:: - - dos.py revert --snapshot-name - -#. To fully reset your test environment, tell the Devops toolkit to erase it:: - - dos.py list - dos.py erase - -Running Fuel Puppet Modules Unit Tests --------------------------------------- - -#. Install PuppetLabs RSpec Helper:: - - cd ~ - gem2deb puppetlabs_spec_helper - sudo dpkg -i ruby-puppetlabs-spec-helper_0.4.1-1_all.deb - gem2deb rspec-puppet - sudo dpkg -i ruby-rspec-puppet_0.1.6-1_all.deb - -#. Run unit tests for a Puppet module:: - - cd fuel/deployment/puppet/module - rake spec - -Installing Cobbler ------------------- - -Install Cobbler from GitHub (it can't be installed from PyPi, and deb -package in Ubuntu is outdated):: - - cd ~ - git clone git://github.com/cobbler/cobbler.git - cd cobbler - git checkout release24 - sudo make install - -Building Documentation ----------------------- - -#. You will need the following software to build documentation:: - - sudo apt-get install librsvg2-bin rst2pdf python-sphinx - sudo pip install sphinxcontrib-plantuml - sudo apt-get install python-sphinxcontrib.blockdiag # on Ubuntu 12.10 or higher - sudo pip install sphinxcontrib-blockdiag # on Ubuntu 12.04 - -#. Look at the list of available formats and generate the one you need:: - - cd docs - make help - make html - -You will also need to install Java and PlantUML to automatically -generate UML diagrams from the source. You can also use `PlantUML Server -`_ for a quick preview of your -diagrams. diff --git a/docs/develop/logical_arch.rst b/docs/develop/logical_arch.rst deleted file mode 100644 index 7fcd8c744..000000000 --- a/docs/develop/logical_arch.rst +++ /dev/null @@ -1,87 +0,0 @@ -Logical Architecture -==================== - -Current architecture uses so-called "Metadata via Facter Extension" -approach, inspired by blog posts -`self-classifying puppet nodes `_, -`pulling a list of hosts from mcollective for puppet `_, -`A Simple Puppet Function to Retrieve Information From the Stored Config -DB `_, -`nodeless-puppet example `_. - -In a nutshell, the Fuel deployment orchestration engine `Astute -`_ manages OS provisioning via -Cobbler, and uses an MCollective plugin to distribute a Facter facts -file that defines node's role and other deployment variables for Puppet. -You can find a detailed breakdown of how this works in the -:doc:`Sequence Diagrams `. - -Following components are involved in managing this process: - -- Astute: deployment orchestrator, manages the Puppet cluster (via - MCollective) and the Cobbler provisioning service (over XML-RPC) -- Naily: RPC consumer implementing communication between Nailgun and - Astute over AMQP protocol -- Nailgun [#fn1]_: Web UI backend based on the web.py framework, - includes following sub-components: - - - Nailgun DB: a relational database holding the current state all - OpenStack clusters and provisioning tasks - - Data Model (api/models.py, fixtures/): the definition of NailgunDB - using SQLAlchemy ORM - - REST API (api/handlers/): controller layer of the Web UI, receives - REST requests from the JavaScript UI and routes them to other - Nailgun components - - RPC Receiver (rpc/): handles AMQP messages from Astute - - Task Manager (task/): creates and tracks background tasks - -- JavaScript UI (static/js/): Web UI frontend based on Twitter Bootcamp - framework, communicates with Nailgun using REST API - -In the current implementation the deployment business logic is spread -between Nailgun (primarily in Task, Network, and Volume Manager -components) and Astute. Going forward, all logic should be moved from -Astute to Nailgun, and Astute should become a simple executor of tasks -defined by Nailgun. - -Communication paths between these components are illustrated on the -Logical Architecture Diagram: - - .. uml:: - package "Master Node" { - [JavaScript UI] - package "Nailgun Backend" { - package "SQL Database" <> { - [Nailgun DB] - } - [Nailgun DB] --> [Data Model] - [Data Model] <-- [REST API] - [RPC Receiver] --> [Nailgun DB] - } - [Provisioner (Cobbler)] --> [DHCP, DNS, TFTP] - [RPC Consumer (Naily)] --> [RPC Receiver] : AMQP - [RPC Consumer (Naily)] --> [Orchestrator (Astute)] : AMQP - [Orchestrator (Astute)] --> [MCollective] - [Puppet Master] - } - package "Target Node" { - [MCollective Agent] --> [Puppet] - } - actor Web_User - actor CLI_User - Web_User --> [JavaScript UI] - CLI_User --> [REST API] - - [JavaScript UI] --> [REST API] - - [Orchestrator (Astute)] --> [Provisioner (Cobbler)] : XML-RPC - - [MCollective] --> [MCollective Agent] - [Puppet] --> [Puppet Master] - -.. CLI User --> [Provisioner(cobbler)] - -.. rubric:: Footnotes - -.. [#fn1] Not to be confused with Nailgun the Java CLI accelerator - diff --git a/docs/develop/nailgun.rst b/docs/develop/nailgun.rst deleted file mode 100644 index ad3cdf068..000000000 --- a/docs/develop/nailgun.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. _nailgun: - -Nailgun Development Instructions -================================ - -.. toctree:: - - nailgun/partitions - nailgun/reliability diff --git a/docs/develop/nailgun/partitions.rst b/docs/develop/nailgun/partitions.rst deleted file mode 100644 index 294ab3cb9..000000000 --- a/docs/develop/nailgun/partitions.rst +++ /dev/null @@ -1,176 +0,0 @@ -Creating Partitions on Nodes -============================ - -Fuel uses Cobbler and Anaconda Kickstart to partition block devices on -new nodes. Most of the work is done in the *pmanager.py* Cobbler script -(found under templates/scripts/ in the Cobbler Puppet module) using the -data from the "ks_spaces" Cobbler variable generated by the *Nailgun -VolumeManager* class (nailgun/volumes/manager.py) based on the volumes -metadata defined in the *openstack.json* release fixture -(nailgun/fixtures/). - -The preferred type of a volume for a Fuel slave node is "vg": an LVM -volume group that can contain one or more volumes with type set to "lv". -In cases where LVM is not suitable, it is also possible to create plain -partitions by setting volume type to "partition". - -Typical slave node will always have an "os" volume group and one or more -volumes of other types, depending on the roles assigned to that node and -the role-to-volumes mapping defined in the "volumes_roles_mapping" -section of openstack.json. - -There are a few different ways to add another volume to a slave node: - -#. Add a new logical volume definition to one of the existing LVM volume - groups. -#. Create a new volume group containing your new logical volumes. -#. Create a new plain partition. - -Adding an LV to an Existing Volume Group ----------------------------------------- - -If you need to add a new volume to an existing volume group, for -example "os", your volume definition in openstack.json will look like -this:: - - { - "id": "os", - "type": "vg", - "min_size": {"generator": "calc_min_os_size"}, - "label": "Base System", - "volumes": [ - { - "mount": "/", - "type": "lv", - "name": "root", - "size": {"generator": "calc_total_root_vg"}, - "file_system": "ext4" - }, - { - "mount": "swap", - "type": "lv", - "name": "swap", - "size": {"generator": "calc_swap_size"}, - "file_system": "swap" - }, - { - "mount": "/mnt/some/path", - "type": "lv", - "name": "LOGICAL_VOLUME_NAME", - "size": { - "generator": "calc_LOGICAL_VOLUME_size", - "generator_args": ["arg1", "arg2"] - }, - "file_system": "ext4" - } - ] - } - -Make sure that your logical volume name ("LOGICAL_VOLUME_NAME" in the -example above) is not the same as the volume group name ("os"). - -Adding Generators to Nailgun VolumeManager ------------------------------------------- - -The "size" field in a volume definition can be defined either directly -as an integer number in megabytes, or indirectly via a so called -generator. Generator is a Python lambda that can be called to calculate -logical volume size dynamically. In the json example above size is -defined as a dictionary with two keys: "generator" is the name of the -generator lambda and "generator_args" is the list of arguments that will -be passed to the generator lambda. - -There is the method in the VolumeManager class where generators are -defined. New volume generator 'NEW_GENERATOR_TO_CALCULATE_SIZ' needs to -be added in the generators dictionary inside this method. - -.. code-block:: python - - class VolumeManager(object): - ... - def call_generator(self, generator, *args): - generators = { - ... - 'NEW_GENERATOR_TO_CALCULATE_SIZE': lambda: 1000, - ... - } - - -Creating a New Volume Group ---------------------------- - -Another way to add new volume to slave nodes is to create new volume -group and to define one or more logical volume inside the volume group -definition:: - - { - "id": "NEW_VOLUME_GROUP_NAME", - "type": "vg", - "min_size": {"generator": "calc_NEW_VOLUME_NAME_size"}, - "label": "Label for NEW VOLUME GROUP as it will be shown on UI", - "volumes": [ - { - "mount": "/path/to/mount/point", - "type": "lv", - "name": "LOGICAL_VOLUME_NAME", - "size": { - "generator": "another_generator_to_calc_LOGICAL_VOLUME_size", - "generator_args": ["arg"] - }, - "file_system": "xfs" - } - ] - } - -Creating a New Plain Partition ------------------------------- - -Some node roles may be incompatible with LVM and would require plain -partitions. If that's the case, you may have to define a standalone -volume with type "partition" instead of "vg":: - - { - "id": "NEW_PARTITION_NAME", - "type": "partition", - "min_size": {"generator": "calc_NEW_PARTITION_NAME_size"}, - "label": "Label for NEW PARTITION as it will be shown on UI", - "mount": "none", - "disk_label": "LABEL", - "file_system": "xfs" - } - -Note how you can set mount point to "none" and define a disk label to -identify the partition instead. Its only possible to set a disk label on -a formatted portition, so you have to set "file_system" parameter to use -disk labels. - -Updating the Node Role to Volumes Mapping ------------------------------------------ - -Unlike a new logical volume added to a pre-existing logical volume -group, a new logical volume group or partition will not be allocated on -the node unless it is included in the role-to-volumes mapping -corresponding to one of the node's roles, like this:: - - { - "volumes_roles_mapping": { - "controller": ["os", "image"], - "compute": ["os", "vm", "VOLUME_GROUP_NAME"], - "cinder": ["os", "cinder"] - } - } - -Setting Volume Parameters from Nailgun Settings ------------------------------------------------ - -In addition to VolumeManager generators, it is also possible to define -sizes or whatever you want in the nailgun configuration file -(/etc/nailgun/settings.yaml). All fixture files are templated using -Jinja2 templating engine just before being loaded into nailgun database. -For example, we can define mount point for a new volume as follows:: - - "mount": "{{settings.NEW_LOGICAL_VOLUME_MOUNT_POINT}}" - -Of course, *NEW_LOGICAL_VOLUME_MOUNT_POINT* must be defined in the -settings file. - diff --git a/docs/develop/nailgun/reliability.rst b/docs/develop/nailgun/reliability.rst deleted file mode 100644 index 84476e0dd..000000000 --- a/docs/develop/nailgun/reliability.rst +++ /dev/null @@ -1,66 +0,0 @@ -Nailgun is the core of FuelWeb. -To allow an enterprise features be easily connected, -and open source commity to extend it as well, Nailgun must -have simple, very well defined and documented core, -with the great pluggable capabilities. - -Reliability -___________ - -All software contains bugs and may fail, and Nailgun is not an exception of this rule. -In reality, it is not possible to cover all failure scenarios, -even to come close to 100%. -The question is how we can design the system to avoid bugs in one module causing the damage -of the whole system. - -Example from the Nailgun's past: -Agent collected hardware information, include current_speed param on the interfaces. -One of the interfaces had current_speed=0. At the registration attempt, Nailgun's validator -checked that current_speed > 0, and validator raised an exception InvalidData, -which declined node discovery. -current_speed is one of the attibutes which we can easily skip, it is not even -used for deployment in any way at the moment and used only for the information provided to the user. -But it prevented node discovery, and it made the server unusable. - -Another example. Due to the coincedence of bug and wrong metadata of one of the nodes, -GET request on that node would return 500 Internal Server Error. -Looks like it should affect the only one node, and logically we could remove such -failing node from the environment to get it discovered again. -However, UI + API handlers were written in the following way: - -* UI calls /api/nodes to fetch info about all nodes to just show how many nodes are allocated, and how many are not - -* NodesCollectionHandler would return 500 if any of nodes raise an exception - -It is simple to guess, that the whole UI was completely destroyed by just one -failed node. It was impossible to do any action on UI. - -These two examples give us the starting point to rethink on how to avoid -Nailgun crash just if one of the meta attr is wrong. - -First, we must devide the meta attributes discovered by agent on two categories: - -* absolutely required for node discovering (i.e. MAC address) - -* non-required for discovering - - * required for deployment (i.e. disks) - - * non-required for deployment (i.e. current_speed) - -Second, we must have UI refactored to fetch only the information required, -not the whole DB to just show two numbers. To be more specific, -we have to make sure that issues in one environment must not -affect the other environment. Such a refactoring will require additional -handlers in Nailgun, as well as some additions, such as pagination and etc. -From Nailgun side, it is bad idea to fail the whole CollectionHandler if one -of the objects fail to calculate some attribute. My(mihgen) idea is to simply set -attrubute to Null if failed to calculate, and program UI to handle it properly. -Unit tests must help in testing of this. - -Another idea is to limit the /api/nodes, -/api/networks and other calls -to work only if cluster_id param provided, whether set to None or some of cluster Ids. -In such a way we can be sure that one env will not be able to break the whole UI. - - diff --git a/docs/develop/sequence.rst b/docs/develop/sequence.rst deleted file mode 100644 index b96866c0c..000000000 --- a/docs/develop/sequence.rst +++ /dev/null @@ -1,119 +0,0 @@ -Sequence Diagrams -================= - -OS Provisioning ---------------- - .. uml:: - title Nodes Provisioning - actor WebUser - - box "Physical Server" - participant NodePXE - participant NodeAgent - end box - - NodePXE -> Cobbler: PXE discovery - Cobbler --> NodePXE: bootstrap OS image - NodePXE -> Cobbler: network settings request - Cobbler --> NodePXE: IP, DNS response - NodePXE -> NodePXE: OS installation - NodePXE -> NodeAgent: starts agent - NodePXE -> MC: starts MCollective - NodeAgent -> Ohai: get info - Ohai --> NodeAgent: info - NodeAgent -> NodePXE: get admin node IP - NodePXE --> NodeAgent: admin node IP - NodeAgent -> Nailgun: Registration - ||| - WebUser -> Nailgun: create cluster - WebUser -> Nailgun: add nodes to cluster - WebUser -> Nailgun: deploy cluster - ||| - Nailgun -> Naily: Provision CentOS - Naily -> Astute: Provision CentOS - Astute -> Cobbler: Provision CentOS - Cobbler -> NodePXE: ssh to reboot - Cobbler --> NodePXE: CentOS image - NodePXE -> NodeAgent: starts agent - NodePXE -> MC: starts MC agent - NodeAgent -> Nailgun: Node metadata - -Networks Verification ---------------------- - .. uml:: - title Network Verification - actor WebUser - - WebUser -> Nailgun: verify networks (cluster #1) - Nailgun -> Naily: verify nets (100-120 vlans) - Naily -> Astute: verify nets - Astute -> MC: start listeners - MC -> net_probe.py: forks to listen - MC --> Astute: listening - Astute -> MC: send frames - MC -> net_probe.py: send frames - net_probe.py --> MC: sent - MC --> Astute: sent - - Astute -> MC: get result - MC -> net_probe.py: stop listeners - net_probe.py --> MC: result - MC --> Astute: result graph - Astute --> Naily: vlans Ok - Naily --> Nailgun: response - Nailgun --> WebUser: response - - -Details on Cluster Provisioning & Deployment (via Facter extension) -------------------------------------------------------------------- - .. uml:: - title Cluster Deployment - actor WebUser - - Nailgun -> Naily: Provision,Deploy - Naily -> Astute: Provision,Deploy - Astute -> MC: Type of nodes? - MC -> Astute: bootstrap - Astute -> Cobbler: create system,reboot - Astute -> MC: Type of nodes? - - MC --> Astute: booted in target OS - Astute --> Naily: provisioned - Naily --> Nailgun: provisioned - Nailgun --> WebUser: status on UI - Astute -> MC: Create /etc/naily.facts - - Astute -> MC: run puppet - MC -> Puppet: runonce - Puppet -> Puppet_master: get modules,class - Puppet_master --> Puppet: modules, class - Puppet -> Facter: get facts - Facter --> Puppet: set of facts - - Puppet -> Puppet: applies $role - Puppet --> MC: done - MC --> Astute: deploy is done - Astute --> Naily: deploy is done - Naily --> Nailgun: deploy is done - Nailgun --> WebUser: deploy is done - -Once deploy and provisioning messages are accepted by Naily, provisioining method is called in Astute. -Provisioning part creates system in Cobbler and calls reboot over Cobbler. Then -Astute uses `MCollective direct addressing mode `_ -to check if all required nodes are available, -include puppet agent on them. If some nodes are not ready yet, Astute waits for a few seconds and does request again. -When nodes are booted in target OS, -Astute uses naily_fact MCollective plugin to post data to a special file /etc/naily.fact on target system. -Data include role and all other variables needed for deployment. Then, Astute calls puppetd MCollective plugin -to start deployment. Puppet is started on nodes, and requests Puppet master for modules and manifests. -site.pp on Master node defines one common class for every node. -Accordingly, puppet agent starts its run. Modules contain facter extension, which runs before deployment. Extension -reads facts from /etc/naily.fact placed by mcollective, and extends Facter data with these facts, which can be -easily used in Puppet modules. Case structure in running class chooses appropriate class to import, based on $role -variable, received from /etc/naily.fact. It loads and starts to execute. All variables from file are available -like ordinary facts from Facter. - -It is possible to use the system without Nailgun and Naily: user creates a YAML file with all required -data, and calls Astute binary script. Script loads data from YAML and instantiates Astute instance -the same way as it's instanciated from Naily. - diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index 953dfeecd..000000000 --- a/docs/index.rst +++ /dev/null @@ -1,11 +0,0 @@ -.. _contents: - -Table of contents -================= - -.. toctree:: - :maxdepth: 2 - :numbered: - - develop - user diff --git a/docs/make.bat b/docs/make.bat deleted file mode 100644 index fe9c00afc..000000000 --- a/docs/make.bat +++ /dev/null @@ -1,199 +0,0 @@ -@ECHO OFF - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -) -set BUILDDIR=_build -set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . -set I18NSPHINXOPTS=%SPHINXOPTS% . -if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% - set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% -) - -if "%1" == "" goto help - -if "%1" == "help" ( - :help - echo.Please use `make ^` where ^ is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. singlehtml to make a single large HTML file - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. devhelp to make HTML files and a Devhelp project - echo. epub to make an epub - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. pdf to make PDF files - echo. text to make text files - echo. man to make manual pages - echo. texinfo to make Texinfo files - echo. gettext to make PO message catalogs - echo. changes to make an overview over all changed/added/deprecated items - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - goto end -) - -if "%1" == "clean" ( - for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i - del /q /s %BUILDDIR%\* - goto end -) - -if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/html. - goto end -) - -if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. - goto end -) - -if "%1" == "singlehtml" ( - %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. - goto end -) - -if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the pickle files. - goto end -) - -if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the JSON files. - goto end -) - -if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ -.hhp project file in %BUILDDIR%/htmlhelp. - goto end -) - -if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ -.qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\scaffold.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\scaffold.ghc - goto end -) - -if "%1" == "devhelp" ( - %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. - goto end -) - -if "%1" == "epub" ( - %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The epub file is in %BUILDDIR%/epub. - goto end -) - -if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "pdf" ( - %SPHINXBUILD% -bpdf %ALLSPHINXOPTS% %BUILDDIR%/pdf - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; the PDF files are in %BUILDDIR%/pdf. - goto end -) - -if "%1" == "text" ( - %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The text files are in %BUILDDIR%/text. - goto end -) - -if "%1" == "man" ( - %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The manual pages are in %BUILDDIR%/man. - goto end -) - -if "%1" == "texinfo" ( - %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. - goto end -) - -if "%1" == "gettext" ( - %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The message catalogs are in %BUILDDIR%/locale. - goto end -) - -if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes - if errorlevel 1 exit /b 1 - echo. - echo.The overview file is in %BUILDDIR%/changes. - goto end -) - -if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck - if errorlevel 1 exit /b 1 - echo. - echo.Link check complete; look for any errors in the above output ^ -or in %BUILDDIR%/linkcheck/output.txt. - goto end -) - -if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest - if errorlevel 1 exit /b 1 - echo. - echo.Testing of doctests in the sources finished, look at the ^ -results in %BUILDDIR%/doctest/output.txt. - goto end -) - -:end diff --git a/docs/user.rst b/docs/user.rst deleted file mode 100644 index e03b476aa..000000000 --- a/docs/user.rst +++ /dev/null @@ -1,4 +0,0 @@ -.. _user: - -User guide has been moved to `docs.mirantis.com `_. -If you want to contribute, checkout the sources from `github `_. diff --git a/fuel b/fuel deleted file mode 160000 index e79dd4a6b..000000000 --- a/fuel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e79dd4a6b93c88040bb513efb73126d0112c3eaa diff --git a/gnupg/keyphrase b/gnupg/keyphrase deleted file mode 100644 index af2523a2b..000000000 --- a/gnupg/keyphrase +++ /dev/null @@ -1 +0,0 @@ -naMu7aej diff --git a/gnupg/pubring.gpg b/gnupg/pubring.gpg deleted file mode 100644 index 171746115fc01d42a74000386037d73256dc3934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1198 zcmV;f1X25$0SyFCypw1F2mrf~g^s!ZGP0bCE8-Vt_5hb(ma0cNdpP0jL1`*ww1BxE zNlR3O)gTJE8V9ZxUVt_6ZJD3=yqa0TQ$q*5zailsU_+0HGxKMYB_UUad2y&w@VY5y z(t}E)r0?>0w+Z}E!DwOP7QAHRH2C-1W?y78{dpzbk_h80RRECCrxQ`VQzG3b0AQ1Z)A02bRax%a&KgHV{|}mX>wt1 zbZK)gV{dIfi2*nS69EDMA_W3Zypw1G8v_Ol2?z%R0tOWb0tpHW1Qr4V0RkQY0vCV) z3JDM?!cGMEuZi7V(FgxrrcoY}TW6yvr0?LUOTjohEuac9+`V`|A8gz!XWToax^+F5 zc#%UYjJlW`#1P?IpZ8oMqqBYtn>v zCx*OBeQwD-f_L*H@;8dM6BBDY*IWD*EK`8EXDF#3wPRcYLvQ`-rP7Z-o!UFKZ-~ddbm@^F?{9i%k}xAfQA}H2d#(~20@3PFzz2KyJ}h* z)&;@1Y8YSo!ln<2lO7H=1c6nzDT*?%p{b`NqsP{Y;u5@>tPAlfYS%hVx+xF`!&&z8>T9!X#9DxLg;f%M>z zOrY}St=F{$EOYd=z~L&0cdS0G1bd-u!PN?I*0Kjlczl0#*(nHvy9%3sF8SGtdROzMgr zT1F#xN(3(yeD__d5MEw)>?kZ`Z83o^00H~Q4x-?Uv?GGham*uYL!=ZTGa>nnn!rGN zbe_Hld~-66knWEf=`7aFyqOgLCjI*erK3*=Q4XZivDaQ)gP}|sYZiTz37~3HBqrmb zINz}Jf~9_vo8fG+ip@%_r`}1zNTzcB6-I3I05G1l_NP%&i MEE-w;tgr$A115GS`Tzg` diff --git a/gnupg/random_seed b/gnupg/random_seed deleted file mode 100644 index df1c730d2d7284e2297cbb0bf5b347d64f924982..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 600 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 l{+ZeMWb9oIQZm9xe P!>o5IT7^(`2xSZahHw@g diff --git a/iso/module.mk b/iso/module.mk index 300033734..bb9e84fed 100644 --- a/iso/module.mk +++ b/iso/module.mk @@ -82,19 +82,19 @@ $(ISOROOT)/ks.cfg: $(SOURCE_DIR)/iso/ks.template $(SOURCE_DIR)/iso/ks.py $(KSYAM python $(SOURCE_DIR)/iso/ks.py -t $(SOURCE_DIR)/iso/ks.template -c $(KSYAML) -o $@ $(ISOROOT)/bootstrap_admin_node.sh: $(SOURCE_DIR)/iso/bootstrap_admin_node.sh ; $(ACTION.COPY) $(ISOROOT)/bootstrap_admin_node.conf: $(SOURCE_DIR)/iso/bootstrap_admin_node.conf ; $(ACTION.COPY) -$(ISOROOT)/send2syslog.py: $(SOURCE_DIR)/bin/send2syslog.py ; $(ACTION.COPY) -$(ISOROOT)/version.yaml: $(call depv,COMMIT_SHA) +$(ISOROOT)/send2syslog.py: $(BUILD_DIR)/repos/nailgun/bin/send2syslog.py ; $(ACTION.COPY) +$(BUILD_DIR)/repos/nailgun/bin/send2syslog.py: $(BUILD_DIR)/repos/nailgun.done $(ISOROOT)/version.yaml: $(call depv,PRODUCT_VERSION) -$(ISOROOT)/version.yaml: $(call depv,FUEL_COMMIT_SHA) -$(ISOROOT)/version.yaml: - echo "COMMIT_SHA: $(COMMIT_SHA)" > $@ - echo "PRODUCT_VERSION: $(PRODUCT_VERSION)" >> $@ - echo "FUEL_COMMIT_SHA: $(FUEL_COMMIT_SHA)" >> $@ +$(ISOROOT)/version.yaml: $(BUILD_DIR)/repos/repos.done + echo "VERSION:" > $@ + echo " release: $(PRODUCT_VERSION)" >> $@ + cat $(BUILD_DIR)/repos/version.yaml >> $@ $(ISOROOT)/puppet-slave.tgz: \ - $(call find-files,$(SOURCE_DIR)/fuel/deployment/puppet) - (cd $(SOURCE_DIR)/fuel/deployment/puppet && tar rf $(ISOROOT)/puppet-slave.tar ./*) + $(BUILD_DIR)/repos/fuellib.done \ + $(call find-files,$(BUILD_DIR)/repos/fuellib/deployment/puppet) + (cd $(BUILD_DIR)/repos/fuellib/deployment/puppet && tar rf $(ISOROOT)/puppet-slave.tar ./*) gzip -c -9 $(ISOROOT)/puppet-slave.tar > $@ && \ rm $(ISOROOT)/puppet-slave.tar diff --git a/mirror/eggs/module.mk b/mirror/eggs/module.mk index c9fc4a163..bfde94dcf 100644 --- a/mirror/eggs/module.mk +++ b/mirror/eggs/module.mk @@ -11,7 +11,8 @@ clean-mirror-eggs: $(BUILD_DIR)/mirror/eggs/build.done: $(call depv,LOCAL_MIRROR_EGGS) $(BUILD_DIR)/mirror/eggs/build.done: $(call depv,REQUIRED_EGGS) -$(BUILD_DIR)/mirror/eggs/build.done: $(call depv,OSTF_EGGS) +$(BUILD_DIR)/mirror/eggs/build.done: $(BUILD_DIR)/repos/fuellib.done +$(BUILD_DIR)/mirror/eggs/build.done: $(call find-files,$(BUILD_DIR)/repos/fuellib/deployment/puppet/nailgun/files/venv-ostf.txt) $(BUILD_DIR)/mirror/eggs/build.done: $(call depv,SANDBOX_PACKAGES) $(BUILD_DIR)/mirror/eggs/build.done: SANDBOX:=$(BUILD_DIR)/mirror/eggs/SANDBOX $(BUILD_DIR)/mirror/eggs/build.done: export SANDBOX_UP:=$(SANDBOX_UP) @@ -47,12 +48,12 @@ $(BUILD_DIR)/mirror/eggs/build.done: \ --find-links $(MIRROR_EGGS) \ --download /tmp/$(notdir $(LOCAL_MIRROR_EGGS)) \ $(REQUIRED_EGGS) + grep -v "^\\s*\#" $(BUILD_DIR)/repos/fuellib/deployment/puppet/nailgun/files/venv-ostf.txt | xargs \ sudo chroot $(SANDBOX) pip install \ --exists-action=i \ --index-url $(MIRROR_EGGS) \ --find-links $(MIRROR_EGGS) \ - --download /tmp/$(notdir $(LOCAL_MIRROR_EGGS)) \ - $(OSTF_EGGS) + --download /tmp/$(notdir $(LOCAL_MIRROR_EGGS)) # # Copying downloaded eggs into eggs mirror rsync -a $(SANDBOX)/tmp/$(notdir $(LOCAL_MIRROR_EGGS))/ $(LOCAL_MIRROR_EGGS) diff --git a/mirror/gems/module.mk b/mirror/gems/module.mk index 7eb52d62b..dcb99e0fe 100644 --- a/mirror/gems/module.mk +++ b/mirror/gems/module.mk @@ -1,34 +1,11 @@ -$(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile: $(call depv,MIRROR_GEMS) -$(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile: - mkdir -p $(@D) - echo -n > $@ - for i in $(MIRROR_GEMS); do \ - echo "source \"$$i\"" >> $@; \ - done - -$(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile: $(call depv,MIRROR_GEMS) -$(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile: \ - $(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile.lock \ - $(BUILD_DIR)/packages/gems/build.done \ - $(BUILD_DIR)/packages/rpm/build.done - echo -n > $@ - for i in $(MIRROR_GEMS); do \ - echo "source \"$$i\"" >> $@; \ - done - echo "source \"file://$(BUILD_MIRROR_GEMS)\"" >> $@ - echo "gemspec :path => \"$(SOURCE_DIR)/naily\"" >> $@ - $(ACTION.TOUCH) - -$(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile.lock: \ - $(SOURCE_DIR)/naily/Gemfile.lock - mkdir -p $(@D) - cp $(SOURCE_DIR)/naily/Gemfile.lock $@ - +$(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done: $(call depv,MIRROR_GEMS) $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done: \ - $(SOURCE_DIR)/requirements-gems.txt \ - $(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile \ - $(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile + $(SOURCE_DIR)/requirements-gems.txt mkdir -p $(BUILD_DIR)/mirror/gems/gems-bundle + /bin/echo -n > $(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile + for i in $(MIRROR_GEMS); do \ + echo "source \"$$i\"" >> $(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile; \ + done cat $(SOURCE_DIR)/requirements-gems.txt | while read gem ver; do \ echo "gem \"$${gem}\", \"$${ver}\"" >> $(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile; \ done @@ -36,8 +13,6 @@ $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done: \ $(BUILD_DIR)/mirror/gems/gems-bundle.done: $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done ( cd $(BUILD_DIR)/mirror/gems/gems-bundle && bundle install --path=. && bundle package ) - find $(BUILD_DIR)/mirror/gems/gems-bundle/naily \( -name "astute*.gem*" \) -exec rm '{}' \+ - ( cd $(BUILD_DIR)/mirror/gems/gems-bundle/naily && bundle install --path=. && bundle package ) ( cd $(BUILD_DIR)/mirror/gems/gems-bundle/vendor/cache/ && \ gem fetch `for i in $(MIRROR_GEMS); do echo -n "--source $$i "; done` -v 1.3.4 bundler ) $(ACTION.TOUCH) @@ -47,8 +22,5 @@ $(BUILD_DIR)/mirror/gems/build.done: $(call depv,BUILD_MIRROR_GEMS) $(BUILD_DIR)/mirror/gems/build.done: $(BUILD_DIR)/mirror/gems/gems-bundle.done @mkdir -p $(LOCAL_MIRROR_GEMS)/gems cp $(BUILD_DIR)/mirror/gems/gems-bundle/vendor/cache/*.gem $(LOCAL_MIRROR_GEMS)/gems - find $(BUILD_DIR)/mirror/gems/gems-bundle/naily/vendor/cache/ \ - \( -name "*.gem" -a ! -name "astute*" -a ! -name "mcollective*" -a ! -name "raemon*" \) \ - -exec cp '{}' $(LOCAL_MIRROR_GEMS)/gems \; (cd $(LOCAL_MIRROR_GEMS) && gem generate_index gems) $(ACTION.TOUCH) diff --git a/mirror/rhel/repo.mk b/mirror/rhel/repo.mk index b73613488..f749fc296 100644 --- a/mirror/rhel/repo.mk +++ b/mirror/rhel/repo.mk @@ -31,26 +31,28 @@ $(BUILD_DIR)/mirror/rhel/yum-config.done: \ $(BUILD_DIR)/mirror/rhel/etc/yum/pluginconf.d/priorities.conf $(ACTION.TOUCH) -$(BUILD_DIR)/mirror/rhel/yum.done: $(call depv,REQ_RHEL_RPMS) $(BUILD_DIR)/mirror/rhel/yum.done: \ + $(BUILD_DIR)/repos/fuellib.done \ + $(call find-files,$(BUILD_DIR)/repos/fuellib/deployment/puppet/rpmcache/files/required-rpms.txt \ $(BUILD_DIR)/mirror/rhel/yum-config.done yum -c $(BUILD_DIR)/mirror/rhel/etc/yum.conf clean all rm -rf /var/tmp/yum-$$USER-*/ + grep -v "^\\s*\#" $(BUILD_DIR)/repos/fuellib/deployment/puppet/rpmcache/files/required-rpms.txt | /bin/sed 's/-[0-9][0-9\.a-zA-Z_-]\+//g' | xargs \ yumdownloader -q --resolve --archlist=$(CENTOS_ARCH) \ -c $(BUILD_DIR)/mirror/rhel/etc/yum.conf \ - --destdir=$(LOCAL_MIRROR_RHEL)/Packages \ - `echo $(REQ_RHEL_RPMS) | /bin/sed 's/-[0-9][0-9\.a-zA-Z_-]\+//g'` + --destdir=$(LOCAL_MIRROR_RHEL)/Packages $(ACTION.TOUCH) -show-yum-urls-rhel: $(call depv,REQ_RHEL_RPMS) show-yum-urls-rhel: \ + $(BUILD_DIR)/repos/fuellib.done \ + $(call find-files,$(BUILD_DIR)/repos/fuellib/deployment/puppet/rpmcache/files/required-rpms.txt \ $(BUILD_DIR)/mirror/rhel/yum-config.done yum -c $(BUILD_DIR)/mirror/rhel/etc/yum.conf clean all rm -rf /var/tmp/yum-$$USER-*/ + grep -v "^\\s*\#" $(BUILD_DIR)/repos/fuellib/deployment/puppet/rpmcache/files/required-rpms.txt | /bin/sed 's/-[0-9][0-9\.a-zA-Z_-]\+//g' | xargs \ yumdownloader --urls -q --resolve --archlist=$(CENTOS_ARCH) \ -c $(BUILD_DIR)/mirror/rhel/etc/yum.conf \ - --destdir=$(LOCAL_MIRROR_RHEL)/Packages \ - `echo $(REQ_RHEL_RPMS) | /bin/sed 's/-[0-9][0-9\.a-zA-Z_-]\+//g'` + --destdir=$(LOCAL_MIRROR_RHEL)/Packages $(LOCAL_MIRROR_RHEL)/comps.xml: \ export COMPSXML=$(shell wget -qO- $(MIRROR_RHEL)/repodata/repomd.xml | grep -m 1 '$(@F)' | awk -F'"' '{ print $$2 }') diff --git a/mirror/src/module.mk b/mirror/src/module.mk index 773102087..b276d4d53 100644 --- a/mirror/src/module.mk +++ b/mirror/src/module.mk @@ -6,17 +6,6 @@ else wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) $(MIRROR_SRC)/$(notdir $@) endif -# -# Download ostf packages directly from the github, because -# it updates often and we don't want to update main mirrors -# on each commit -# -$(LOCAL_MIRROR_SRC)/$(OSTF_TESTS_SHA).zip: - wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) https://github.com/Mirantis/fuel-ostf-tests/archive/$(OSTF_TESTS_SHA).zip - -$(LOCAL_MIRROR_SRC)/$(OSTF_PLUGIN_SHA).zip: - wget --no-use-server-timestamps -c -P $(LOCAL_MIRROR_SRC) https://github.com/Mirantis/fuel-ostf-plugin/archive/$(OSTF_PLUGIN_SHA).zip - $(BUILD_DIR)/mirror/src/build.done: $(SOURCE_DIR)/requirements-src.txt \ - | $(addprefix $(LOCAL_MIRROR_SRC)/, $(notdir $(REQUIRED_SRCS)) $(OSTF_TESTS_SHA).zip $(OSTF_PLUGIN_SHA).zip) + | $(addprefix $(LOCAL_MIRROR_SRC)/, $(notdir $(REQUIRED_SRCS))) $(ACTION.TOUCH) diff --git a/nailgun/MANIFEST.in b/nailgun/MANIFEST.in deleted file mode 100644 index cecf6d0ae..000000000 --- a/nailgun/MANIFEST.in +++ /dev/null @@ -1,4 +0,0 @@ -include manage.py -include fuel-cli/fuel -recursive-include nailgun * -recursive-include static * diff --git a/nailgun/build.js b/nailgun/build.js deleted file mode 100644 index 9e52ab3f7..000000000 --- a/nailgun/build.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2013 Mirantis, Inc. - * - * 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. -**/ -({ - baseUrl: ".", - appDir: "static", - dir: "/tmp/static", - mainConfigFile: "static/js/main.js", - modules: [{name: "js/main"}], - waitSeconds: 60, - optimize: "uglify2" -}) diff --git a/nailgun/examples/README b/nailgun/examples/README deleted file mode 100644 index 420cf4fd3..000000000 --- a/nailgun/examples/README +++ /dev/null @@ -1,2 +0,0 @@ -You should copy file fake-target-mcollective.log to /var/tmp for emulate node logs when FAKE-TASKS enabled. - diff --git a/nailgun/examples/fake-target-mcollective.log b/nailgun/examples/fake-target-mcollective.log deleted file mode 100644 index b8859dedd..000000000 --- a/nailgun/examples/fake-target-mcollective.log +++ /dev/null @@ -1,309 +0,0 @@ -2013-01-16T12:26:36 info: # Logfile created on Wed Jan 16 12:26:36 +0000 2013 by logger.rb/1.2.6 -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.492877 #834] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Facts::Yaml_facts from mcollective/facts/yaml_facts.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.503049 #834] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin facts_plugin with class MCollective::Facts::Yaml_facts single_instance: true -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.503142 #834] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Connector::Stomp from mcollective/connector/stomp.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.503832 #834] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin connector_plugin with class MCollective::Connector::Stomp single_instance: true -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.503940 #834] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Security::Psk from mcollective/security/psk.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.504627 #834] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin security_plugin with class MCollective::Security::Psk single_instance: true -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.504751 #834] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Registration::Agentlist from mcollective/registration/agentlist.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.505116 #834] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin registration_plugin with class MCollective::Registration::Agentlist single_instance: true -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.505348 #834] DEBUG -- : pluginmanager.rb:47:in `<<' Registering plugin global_stats with class MCollective::RunnerStats single_instance: true -2013-01-16T12:26:36 info: I, [2013-01-16T12:26:36.505395 #834] INFO -- : mcollectived:31 The Marionette Collective 2.2.1 started logging at debug level -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.505433 #834] DEBUG -- : mcollectived:34 Starting in the background (true) -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.512411 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin global_stats with class MCollective::RunnerStats -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.512524 #838] DEBUG -- : pluginmanager.rb:80:in `[]' Returning new plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.512598 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin global_stats with class MCollective::RunnerStats -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.512662 #838] DEBUG -- : pluginmanager.rb:80:in `[]' Returning new plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.512756 #838] DEBUG -- : stomp.rb:150:in `connect' Connecting to 10.20.0.2:61613 -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.518718 #838] DEBUG -- : agents.rb:26:in `loadagents' Reloading all agents from disk -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.518854 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found erase_node at /usr/libexec/mcollective/mcollective/agent/erase_node.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.518923 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Erase_node from mcollective/agent/erase_node.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.539956 #838] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for erase_node -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.540066 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin erase_node_agent with class MCollective::Agent::Erase_node single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.540121 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin erase_node_agent with class MCollective::Agent::Erase_node -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.540416 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/erase_node' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.541162 #838] DEBUG -- : base.rb:93:in `findddlfile' Found erase_node ddl at /usr/libexec/mcollective/mcollective/agent/erase_node.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.541332 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.541417 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.erase_node.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.541706 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found discovery at /usr/libexec/mcollective/mcollective/agent/discovery.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.541796 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Discovery from mcollective/agent/discovery.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545131 #838] DEBUG -- : agents.rb:91:in `activate_agent?' MCollective::Agent::Discovery does not have an activate? method, activating as default -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545221 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin discovery_agent with class MCollective::Agent::Discovery single_instance: true -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545274 #838] DEBUG -- : pluginmanager.rb:80:in `[]' Returning new plugin discovery_agent with class MCollective::Agent::Discovery -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545353 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545422 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.discovery.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545540 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found systemtype at /usr/libexec/mcollective/mcollective/agent/systemtype.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545602 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Systemtype from mcollective/agent/systemtype.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545788 #838] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for systemtype -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545846 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin systemtype_agent with class MCollective::Agent::Systemtype single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545894 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin systemtype_agent with class MCollective::Agent::Systemtype -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.545998 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/systemtype' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546101 #838] DEBUG -- : base.rb:93:in `findddlfile' Found systemtype ddl at /usr/libexec/mcollective/mcollective/agent/systemtype.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546248 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546315 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.systemtype.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546400 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found net_probe at /usr/libexec/mcollective/mcollective/agent/net_probe.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546456 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Net_probe from mcollective/agent/net_probe.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546846 #838] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for net_probe -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546903 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin net_probe_agent with class MCollective::Agent::Net_probe single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.546958 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin net_probe_agent with class MCollective::Agent::Net_probe -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.547054 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/net_probe' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.547148 #838] DEBUG -- : base.rb:93:in `findddlfile' Found net_probe ddl at /usr/libexec/mcollective/mcollective/agent/net_probe.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.547339 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.547402 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.net_probe.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.547492 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found rpuppet at /usr/libexec/mcollective/mcollective/agent/rpuppet.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.547549 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Rpuppet from mcollective/agent/rpuppet.rb -2013-01-16T12:26:36 err: E, [2013-01-16T12:26:36.551471 #838] ERROR -- : pluginmanager.rb:171:in `loadclass' Failed to load MCollective::Agent::Rpuppet: no such file to load -- puppet/util/command_line -2013-01-16T12:26:36 err: E, [2013-01-16T12:26:36.551553 #838] ERROR -- : agents.rb:71:in `loadagent' Loading agent rpuppet failed: no such file to load -- puppet/util/command_line -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.551626 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found rapply at /usr/libexec/mcollective/mcollective/agent/rapply.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.551688 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Rapply from mcollective/agent/rapply.rb -2013-01-16T12:26:36 err: E, [2013-01-16T12:26:36.555693 #838] ERROR -- : pluginmanager.rb:171:in `loadclass' Failed to load MCollective::Agent::Rapply: no such file to load -- puppet/application -2013-01-16T12:26:36 err: E, [2013-01-16T12:26:36.555757 #838] ERROR -- : agents.rb:71:in `loadagent' Loading agent rapply failed: no such file to load -- puppet/application -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.555823 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found puppetd at /usr/libexec/mcollective/mcollective/agent/puppetd.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.555882 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Puppetd from mcollective/agent/puppetd.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.556361 #838] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for puppetd -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.556425 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin puppetd_agent with class MCollective::Agent::Puppetd single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.556474 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin puppetd_agent with class MCollective::Agent::Puppetd -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.556562 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/puppetd' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.556661 #838] DEBUG -- : base.rb:93:in `findddlfile' Found puppetd ddl at /usr/libexec/mcollective/mcollective/agent/puppetd.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.556942 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557042 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.puppetd.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557142 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found rpcutil at /usr/libexec/mcollective/mcollective/agent/rpcutil.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557197 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Rpcutil from mcollective/agent/rpcutil.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557546 #838] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for rpcutil -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557603 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin rpcutil_agent with class MCollective::Agent::Rpcutil single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557650 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin rpcutil_agent with class MCollective::Agent::Rpcutil -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557725 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/rpcutil' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.557815 #838] DEBUG -- : base.rb:93:in `findddlfile' Found rpcutil ddl at /usr/libexec/mcollective/mcollective/agent/rpcutil.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.558307 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.558369 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.rpcutil.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.558456 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found nailyfact at /usr/libexec/mcollective/mcollective/agent/nailyfact.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.558512 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Nailyfact from mcollective/agent/nailyfact.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.558816 #838] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for nailyfact -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.558872 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin nailyfact_agent with class MCollective::Agent::Nailyfact single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.558919 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin nailyfact_agent with class MCollective::Agent::Nailyfact -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.559015 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/nailyfact' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.559106 #838] DEBUG -- : base.rb:93:in `findddlfile' Found nailyfact ddl at /usr/libexec/mcollective/mcollective/agent/nailyfact.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.559285 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.559348 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.nailyfact.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.559435 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found node_indirector at /usr/libexec/mcollective/mcollective/agent/node_indirector.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.559490 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Node_indirector from mcollective/agent/node_indirector.rb -2013-01-16T12:26:36 err: E, [2013-01-16T12:26:36.564361 #838] ERROR -- : pluginmanager.rb:171:in `loadclass' Failed to load MCollective::Agent::Node_indirector: no such file to load -- puppet/node -2013-01-16T12:26:36 err: E, [2013-01-16T12:26:36.564424 #838] ERROR -- : agents.rb:71:in `loadagent' Loading agent node_indirector failed: no such file to load -- puppet/node -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.564490 #838] DEBUG -- : agents.rb:104:in `findagentfile' Found fake at /usr/libexec/mcollective/mcollective/agent/fake.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.564549 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Fake from mcollective/agent/fake.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.564715 #838] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for fake -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.564775 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin fake_agent with class MCollective::Agent::Fake single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.564824 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin fake_agent with class MCollective::Agent::Fake -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.564907 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/fake' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.565043 #838] DEBUG -- : base.rb:93:in `findddlfile' Found fake ddl at /usr/libexec/mcollective/mcollective/agent/fake.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.565181 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.565245 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.fake.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.565666 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Data::Agent_data from mcollective/data/agent_data.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.566017 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin agent_data with class MCollective::Data::Agent_data single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.566082 #838] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Data::Fstat_data from mcollective/data/fstat_data.rb -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.566294 #838] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin fstat_data with class MCollective::Data::Fstat_data single_instance: false -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.566365 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin fstat_data with class MCollective::Data::Fstat_data -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.566440 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'data/fstat_data' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.566660 #838] DEBUG -- : base.rb:93:in `findddlfile' Found fstat_data ddl at /usr/libexec/mcollective/mcollective/data/fstat_data.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567041 #838] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin agent_data with class MCollective::Data::Agent_data -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567117 #838] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'data/agent_data' -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567201 #838] DEBUG -- : base.rb:93:in `findddlfile' Found agent_data ddl at /usr/libexec/mcollective/mcollective/data/agent_data.ddl -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567366 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567427 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.mcollective.command -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567507 #838] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567603 #838] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /queue/mcollective.ca4c50b905dc21ea17a10549a6f5944f -2013-01-16T12:26:36 debug: D, [2013-01-16T12:26:36.567676 #838] DEBUG -- : stomp.rb:197:in `receive' Waiting for a message from Stomp -2013-01-16T12:26:37 warning: W, [2013-01-16T12:26:37.452256 #838] WARN -- : runner.rb:60:in `run' Exiting after signal: SIGTERM -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.452333 #838] DEBUG -- : stomp.rb:270:in `disconnect' Disconnecting from Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.609291 #958] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Facts::Yaml_facts from mcollective/facts/yaml_facts.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.619522 #958] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin facts_plugin with class MCollective::Facts::Yaml_facts single_instance: true -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.619617 #958] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Connector::Stomp from mcollective/connector/stomp.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.620322 #958] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin connector_plugin with class MCollective::Connector::Stomp single_instance: true -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.620433 #958] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Security::Psk from mcollective/security/psk.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.621145 #958] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin security_plugin with class MCollective::Security::Psk single_instance: true -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.621264 #958] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading Mcollective::Registration::Agentlist from mcollective/registration/agentlist.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.621654 #958] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin registration_plugin with class MCollective::Registration::Agentlist single_instance: true -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.621894 #958] DEBUG -- : pluginmanager.rb:47:in `<<' Registering plugin global_stats with class MCollective::RunnerStats single_instance: true -2013-01-16T12:26:37 info: I, [2013-01-16T12:26:37.621939 #958] INFO -- : mcollectived:31 The Marionette Collective 2.2.1 started logging at debug level -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.621974 #958] DEBUG -- : mcollectived:34 Starting in the background (true) -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.627841 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin global_stats with class MCollective::RunnerStats -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.627954 #962] DEBUG -- : pluginmanager.rb:80:in `[]' Returning new plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.628056 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin global_stats with class MCollective::RunnerStats -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.628129 #962] DEBUG -- : pluginmanager.rb:80:in `[]' Returning new plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.628224 #962] DEBUG -- : stomp.rb:150:in `connect' Connecting to 10.20.0.2:61613 -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.636559 #962] DEBUG -- : agents.rb:26:in `loadagents' Reloading all agents from disk -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.636706 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found erase_node at /usr/libexec/mcollective/mcollective/agent/erase_node.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.636773 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Erase_node from mcollective/agent/erase_node.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.652064 #962] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for erase_node -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.652159 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin erase_node_agent with class MCollective::Agent::Erase_node single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.652207 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin erase_node_agent with class MCollective::Agent::Erase_node -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.652505 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/erase_node' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.653250 #962] DEBUG -- : base.rb:93:in `findddlfile' Found erase_node ddl at /usr/libexec/mcollective/mcollective/agent/erase_node.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.653417 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.653487 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.erase_node.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.653736 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found discovery at /usr/libexec/mcollective/mcollective/agent/discovery.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.653795 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Discovery from mcollective/agent/discovery.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.653972 #962] DEBUG -- : agents.rb:91:in `activate_agent?' MCollective::Agent::Discovery does not have an activate? method, activating as default -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.656743 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin discovery_agent with class MCollective::Agent::Discovery single_instance: true -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.656800 #962] DEBUG -- : pluginmanager.rb:80:in `[]' Returning new plugin discovery_agent with class MCollective::Agent::Discovery -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.656877 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.656941 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.discovery.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657062 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found systemtype at /usr/libexec/mcollective/mcollective/agent/systemtype.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657124 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Systemtype from mcollective/agent/systemtype.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657296 #962] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for systemtype -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657353 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin systemtype_agent with class MCollective::Agent::Systemtype single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657400 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin systemtype_agent with class MCollective::Agent::Systemtype -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657499 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/systemtype' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657601 #962] DEBUG -- : base.rb:93:in `findddlfile' Found systemtype ddl at /usr/libexec/mcollective/mcollective/agent/systemtype.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657741 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657801 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.systemtype.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657900 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found net_probe at /usr/libexec/mcollective/mcollective/agent/net_probe.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.657955 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Net_probe from mcollective/agent/net_probe.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.658388 #962] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for net_probe -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.658447 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin net_probe_agent with class MCollective::Agent::Net_probe single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.658496 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin net_probe_agent with class MCollective::Agent::Net_probe -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.658572 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/net_probe' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.658664 #962] DEBUG -- : base.rb:93:in `findddlfile' Found net_probe ddl at /usr/libexec/mcollective/mcollective/agent/net_probe.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.658853 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.658919 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.net_probe.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.664250 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found rpuppet at /usr/libexec/mcollective/mcollective/agent/rpuppet.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.664346 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Rpuppet from mcollective/agent/rpuppet.rb -2013-01-16T12:26:37 err: E, [2013-01-16T12:26:37.665259 #962] ERROR -- : pluginmanager.rb:171:in `loadclass' Failed to load MCollective::Agent::Rpuppet: no such file to load -- puppet/util/command_line -2013-01-16T12:26:37 err: E, [2013-01-16T12:26:37.665313 #962] ERROR -- : agents.rb:71:in `loadagent' Loading agent rpuppet failed: no such file to load -- puppet/util/command_line -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.665388 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found rapply at /usr/libexec/mcollective/mcollective/agent/rapply.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.665444 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Rapply from mcollective/agent/rapply.rb -2013-01-16T12:26:37 err: E, [2013-01-16T12:26:37.668623 #962] ERROR -- : pluginmanager.rb:171:in `loadclass' Failed to load MCollective::Agent::Rapply: no such file to load -- puppet/application -2013-01-16T12:26:37 err: E, [2013-01-16T12:26:37.668684 #962] ERROR -- : agents.rb:71:in `loadagent' Loading agent rapply failed: no such file to load -- puppet/application -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.668751 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found puppetd at /usr/libexec/mcollective/mcollective/agent/puppetd.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.668811 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Puppetd from mcollective/agent/puppetd.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.669313 #962] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for puppetd -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.669376 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin puppetd_agent with class MCollective::Agent::Puppetd single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.669426 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin puppetd_agent with class MCollective::Agent::Puppetd -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.669547 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/puppetd' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.669647 #962] DEBUG -- : base.rb:93:in `findddlfile' Found puppetd ddl at /usr/libexec/mcollective/mcollective/agent/puppetd.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.669926 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670016 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.puppetd.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670124 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found rpcutil at /usr/libexec/mcollective/mcollective/agent/rpcutil.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670181 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Rpcutil from mcollective/agent/rpcutil.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670528 #962] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for rpcutil -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670583 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin rpcutil_agent with class MCollective::Agent::Rpcutil single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670630 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin rpcutil_agent with class MCollective::Agent::Rpcutil -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670703 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/rpcutil' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.670792 #962] DEBUG -- : base.rb:93:in `findddlfile' Found rpcutil ddl at /usr/libexec/mcollective/mcollective/agent/rpcutil.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.674272 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.674374 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.rpcutil.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.674490 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found nailyfact at /usr/libexec/mcollective/mcollective/agent/nailyfact.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.674556 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Nailyfact from mcollective/agent/nailyfact.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.674931 #962] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for nailyfact -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675019 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin nailyfact_agent with class MCollective::Agent::Nailyfact single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675072 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin nailyfact_agent with class MCollective::Agent::Nailyfact -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675164 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/nailyfact' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675272 #962] DEBUG -- : base.rb:93:in `findddlfile' Found nailyfact ddl at /usr/libexec/mcollective/mcollective/agent/nailyfact.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675488 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675556 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.nailyfact.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675656 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found node_indirector at /usr/libexec/mcollective/mcollective/agent/node_indirector.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.675718 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Node_indirector from mcollective/agent/node_indirector.rb -2013-01-16T12:26:37 err: E, [2013-01-16T12:26:37.676526 #962] ERROR -- : pluginmanager.rb:171:in `loadclass' Failed to load MCollective::Agent::Node_indirector: no such file to load -- puppet/node -2013-01-16T12:26:37 err: E, [2013-01-16T12:26:37.676585 #962] ERROR -- : agents.rb:71:in `loadagent' Loading agent node_indirector failed: no such file to load -- puppet/node -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.676652 #962] DEBUG -- : agents.rb:104:in `findagentfile' Found fake at /usr/libexec/mcollective/mcollective/agent/fake.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.676711 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Agent::Fake from mcollective/agent/fake.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.676898 #962] DEBUG -- : agent.rb:138:in `activate?' Starting default activation checks for fake -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.676960 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin fake_agent with class MCollective::Agent::Fake single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.680570 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin fake_agent with class MCollective::Agent::Fake -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.680716 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'agent/fake' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.680834 #962] DEBUG -- : base.rb:93:in `findddlfile' Found fake ddl at /usr/libexec/mcollective/mcollective/agent/fake.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.681027 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.681100 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.fake.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.681567 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Data::Agent_data from mcollective/data/agent_data.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.681902 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin agent_data with class MCollective::Data::Agent_data single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.681965 #962] DEBUG -- : pluginmanager.rb:167:in `loadclass' Loading MCollective::Data::Fstat_data from mcollective/data/fstat_data.rb -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.682202 #962] DEBUG -- : pluginmanager.rb:44:in `<<' Registering plugin fstat_data with class MCollective::Data::Fstat_data single_instance: false -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.682275 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin fstat_data with class MCollective::Data::Fstat_data -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.682349 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'data/fstat_data' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.682577 #962] DEBUG -- : base.rb:93:in `findddlfile' Found fstat_data ddl at /usr/libexec/mcollective/mcollective/data/fstat_data.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.682933 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin agent_data with class MCollective::Data::Agent_data -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.685273 #962] DEBUG -- : cache.rb:117:in `ttl' Cache miss on 'ddl' key 'data/agent_data' -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.685379 #962] DEBUG -- : base.rb:93:in `findddlfile' Found agent_data ddl at /usr/libexec/mcollective/mcollective/data/agent_data.ddl -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.685570 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.685631 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /topic/mcollective.mcollective.command -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.685714 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.685809 #962] DEBUG -- : stomp.rb:241:in `subscribe' Subscribing to /queue/mcollective.c4ca4238a0b923820dcc509a6f75849b -2013-01-16T12:26:37 debug: D, [2013-01-16T12:26:37.685883 #962] DEBUG -- : stomp.rb:197:in `receive' Waiting for a message from Stomp -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222263 #962] DEBUG -- : runnerstats.rb:49:in `received' Incrementing total stat -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222338 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222419 #962] DEBUG -- : runnerstats.rb:38:in `validated' Incrementing validated stat -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222469 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222546 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222626 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222675 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222723 #962] DEBUG -- : base.rb:153:in `validate_filter?' Message passed the filter checks -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222764 #962] DEBUG -- : runnerstats.rb:26:in `passed' Incrementing passed stat -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222806 #962] DEBUG -- : runner.rb:80:in `agentmsg' Handling message for agent 'discovery' on collective 'mcollective' -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222853 #962] DEBUG -- : agents.rb:119:in `dispatch' Dispatching a message to agent discovery -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.222943 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin discovery_agent with class MCollective::Agent::Discovery -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.223018 #962] DEBUG -- : stomp.rb:197:in `receive' Waiting for a message from Stomp -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.223190 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.223394 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.223463 #962] DEBUG -- : base.rb:168:in `create_reply' Encoded a message for request c4252a6973535a958349627872a4f6b2 -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.223580 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.223646 #962] DEBUG -- : stomp.rb:230:in `publish' Sending a broadcast message to STOMP target '/topic/mcollective.discovery.reply' -2013-01-16T12:29:47 debug: D, [2013-01-16T12:29:47.223902 #962] DEBUG -- : runnerstats.rb:56:in `sent' Incrementing replies stat -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207332 #962] DEBUG -- : runnerstats.rb:49:in `received' Incrementing total stat -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207419 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207502 #962] DEBUG -- : runnerstats.rb:38:in `validated' Incrementing validated stat -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207558 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207625 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207697 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207747 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207796 #962] DEBUG -- : base.rb:153:in `validate_filter?' Message passed the filter checks -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207839 #962] DEBUG -- : runnerstats.rb:26:in `passed' Incrementing passed stat -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207883 #962] DEBUG -- : runner.rb:80:in `agentmsg' Handling message for agent 'rpcutil' on collective 'mcollective' -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.207926 #962] DEBUG -- : agents.rb:119:in `dispatch' Dispatching a message to agent rpcutil -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.208034 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin rpcutil_agent with class MCollective::Agent::Rpcutil -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.208099 #962] DEBUG -- : stomp.rb:197:in `receive' Waiting for a message from Stomp -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.208265 #962] DEBUG -- : cache.rb:105:in `read' Cache hit on 'ddl' key 'agent/rpcutil' -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.209068 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.209135 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.209211 #962] DEBUG -- : base.rb:168:in `create_reply' Encoded a message for request 865fb61cf4bc5dd08b2152f494c1d9f8 -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.209334 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.209411 #962] DEBUG -- : stomp.rb:230:in `publish' Sending a broadcast message to STOMP target '/topic/mcollective.rpcutil.reply' -2013-01-16T12:29:49 debug: D, [2013-01-16T12:29:49.209685 #962] DEBUG -- : runnerstats.rb:56:in `sent' Incrementing replies stat -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236481 #962] DEBUG -- : runnerstats.rb:49:in `received' Incrementing total stat -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236566 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236644 #962] DEBUG -- : runnerstats.rb:38:in `validated' Incrementing validated stat -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236698 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236766 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236835 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236883 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236932 #962] DEBUG -- : base.rb:153:in `validate_filter?' Message passed the filter checks -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.236973 #962] DEBUG -- : runnerstats.rb:26:in `passed' Incrementing passed stat -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237040 #962] DEBUG -- : runner.rb:80:in `agentmsg' Handling message for agent 'discovery' on collective 'mcollective' -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237083 #962] DEBUG -- : agents.rb:119:in `dispatch' Dispatching a message to agent discovery -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237175 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin discovery_agent with class MCollective::Agent::Discovery -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237232 #962] DEBUG -- : stomp.rb:197:in `receive' Waiting for a message from Stomp -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237398 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237608 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237676 #962] DEBUG -- : base.rb:168:in `create_reply' Encoded a message for request 8d7776d9c45b5f56b87570fce2fbcc27 -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237829 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.237896 #962] DEBUG -- : stomp.rb:230:in `publish' Sending a broadcast message to STOMP target '/topic/mcollective.discovery.reply' -2013-01-16T12:29:58 debug: D, [2013-01-16T12:29:58.238151 #962] DEBUG -- : runnerstats.rb:56:in `sent' Incrementing replies stat -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224258 #962] DEBUG -- : runnerstats.rb:49:in `received' Incrementing total stat -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224345 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224423 #962] DEBUG -- : runnerstats.rb:38:in `validated' Incrementing validated stat -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224478 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224544 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224614 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224663 #962] DEBUG -- : base.rb:117:in `validate_filter?' Passing based on agent rpcutil -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224711 #962] DEBUG -- : base.rb:153:in `validate_filter?' Message passed the filter checks -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224753 #962] DEBUG -- : runnerstats.rb:26:in `passed' Incrementing passed stat -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224802 #962] DEBUG -- : runner.rb:80:in `agentmsg' Handling message for agent 'rpcutil' on collective 'mcollective' -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224844 #962] DEBUG -- : agents.rb:119:in `dispatch' Dispatching a message to agent rpcutil -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.224933 #962] DEBUG -- : pluginmanager.rb:88:in `[]' Returning new plugin rpcutil_agent with class MCollective::Agent::Rpcutil -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.225004 #962] DEBUG -- : stomp.rb:197:in `receive' Waiting for a message from Stomp -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.225162 #962] DEBUG -- : cache.rb:105:in `read' Cache hit on 'ddl' key 'agent/rpcutil' -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.225500 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.225567 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin security_plugin with class MCollective::Security::Psk -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.225644 #962] DEBUG -- : base.rb:168:in `create_reply' Encoded a message for request abe36a613826518fb19cda0e2226dd6a -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.225807 #962] DEBUG -- : pluginmanager.rb:83:in `[]' Returning cached plugin connector_plugin with class MCollective::Connector::Stomp -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.225880 #962] DEBUG -- : stomp.rb:230:in `publish' Sending a broadcast message to STOMP target '/topic/mcollective.rpcutil.reply' -2013-01-16T12:30:00 debug: D, [2013-01-16T12:30:00.226246 #962] DEBUG -- : runnerstats.rb:56:in `sent' Incrementing replies stat diff --git a/nailgun/fuel-cli/fuel b/nailgun/fuel-cli/fuel deleted file mode 100755 index 461d4a422..000000000 --- a/nailgun/fuel-cli/fuel +++ /dev/null @@ -1,1087 +0,0 @@ -#!/usr/bin/env python -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import argparse -import curses -from functools import partial -from itertools import chain -import json -import math -import os -import shutil -import sys -from time import sleep -import urllib2 - -API_ROOT = "http://127.0.0.1:8000/api/" -DEBUG = False -JSON = False -passive_arguments = ["eid", "action", "debug", "json"] - - -class SetAction(argparse.Action): - """Custom argparse.Action subclass to store distinct values - - :returns: Set of arguments - """ - def __call__(self, parser, namespace, values, option_string=None): - try: - getattr(namespace, self.dest).update(values) - except AttributeError: - setattr(namespace, self.dest, set(values)) - - -def recur_get(multi_level_dict, key_chain): - """Method accesses some field in nested dictionaries - - :returns: value for last key in key_chain in last dictionary - """ - if not isinstance(multi_level_dict[key_chain[0]], dict): - return multi_level_dict[key_chain[0]] - else: - return recur_get(multi_level_dict[key_chain[0]], key_chain[1:]) - - -def format_table(data, acceptable_keys=None, subdict_keys=None): - """Format list of dicts to ascii table - - :acceptable_keys list(str): list of keys for which to create table - also specifies their order - :subdict_keys list(tuple(str)): list of key chains (tuples of key strings) - which are applied to dictionaries - to extract values - """ - if JSON: - print(json.dumps(data, indent=4)) - exit(0) - if subdict_keys: - for key_chain in subdict_keys: - for data_dict in data: - data_dict[key_chain[0]] = recur_get(data_dict, key_chain) - if acceptable_keys: - rows = [tuple([value[key] for key in acceptable_keys]) - for value in data] - header = tuple(acceptable_keys) - else: - rows = [tuple(x.values()) for x in data] - header = tuple(data[0].keys()) - number_of_columns = len(header) - column_widths = dict( - zip( - range(number_of_columns), - (len(str(x)) for x in header) - ) - ) - - for row in rows: - column_widths.update( - (index, max(column_widths[index], len(str(element)))) - for index, element in enumerate(row) - ) - row_template = ' | '.join( - '%%-%ss' % column_widths[i] for i in range(number_of_columns) - ) - - return '\n'.join( - (row_template % header, - '-|-'.join(column_widths[column_index]*'-' - for column_index in range(number_of_columns)), - '\n'.join(row_template % x for x in rows)) - ) - - -def json_api_delete_request(api): - """Make DELETE request to specific API with some data - """ - print_debug( - "DELETE {0}".format(API_ROOT + api) - ) - opener = urllib2.build_opener(urllib2.HTTPHandler) - request = urllib2.Request(API_ROOT + api) - request.add_header('Content-Type', ' application/json') - request.get_method = lambda: 'DELETE' - try: - return json.loads( - opener.open(request).read() - ) - except urllib2.HTTPError as e: - print_error(str(e) + "\n") - - -def json_api_put_request(api, data): - """Make PUT request to specific API with some data - """ - data_json = json.dumps(data) - print_debug( - "PUT {0} data={1}" - .format(API_ROOT + api, data_json) - ) - opener = urllib2.build_opener(urllib2.HTTPHandler) - request = urllib2.Request(API_ROOT + api, data=data_json) - request.add_header('Content-Type', ' application/json') - request.get_method = lambda: 'PUT' - try: - return json.loads( - opener.open(request).read() - ) - except urllib2.HTTPError as e: - print_error(str(e) + "\n") - - -def json_api_get_request(api): - """Make GET request to specific API - """ - print_debug( - "GET {0}" - .format(API_ROOT + api) - ) - try: - request = urllib2.urlopen(API_ROOT + api) - return json.loads( - request.read() - ) - except urllib2.HTTPError as e: - print_error(str(e) + "\n") - - -def json_api_post_request(api, data): - """Make POST request to specific API with some data - """ - data_json = json.dumps(data) - print_debug( - "POST {0} data={1}" - .format(API_ROOT + api, data_json) - ) - try: - return json.loads( - urllib2.urlopen( - url=API_ROOT + api, - data=data_json - ).read() - ) - except urllib2.HTTPError as e: - print_error(str(e) + "\n") - - -def has_arguments(params): - current_arguments = [v for k, v in params.__dict__.iteritems() - if k not in passive_arguments] - return any(current_arguments) - - -def print_error(message): - sys.stderr.write(message) - exit(1) - - -def print_debug(message): - if DEBUG: - print(message) - - -def check_for_attributes(params, attributes): - not_paseed_checks = [attribute for attribute in attributes - if not getattr(params, attribute)] - if len(not_paseed_checks): - print_error( - "{0} required!\n".format(", ".join(not_paseed_checks)) - ) - - -def check_for_one_attribute(params, attributes): - if not any(map( - lambda attr: getattr(params, attr), - attributes - )): - print_error( - "At least one of {0} is required!\n".format(", ".join(attributes)) - ) - - -def release(params): - """List and modify currently available releases - """ - acceptable_keys = ["id", "name", "state", "operating_system", "version"] - if not has_arguments(params) or params.list: - data = json_api_get_request("releases/") - print(format_table(data, acceptable_keys=acceptable_keys)) - if params.rid: - data = json_api_get_request( - "releases/{0}/" - .format(params.rid) - ) - print(format_table([data], acceptable_keys=acceptable_keys)) - - -def environment(params): - """Create, list and modify currently existing environments(clusters) - """ - if not has_arguments(params) or params.list: - acceptable_keys = ["id", "status", "name", "mode", - "release", "changes"] - data = json_api_get_request("clusters/") - if params.eid: - data = filter( - lambda x: x[u"id"] == int(params.eid), - data - ) - print(format_table(data, acceptable_keys=acceptable_keys, - subdict_keys=[("release", u"id")])) - elif params.create: - check_for_attributes(params, ["ename", "rid"]) - data = { - "nodes": [], - "tasks": [], - "name": params.ename, - "release": int(params.rid) - } - cluster_response = json_api_post_request("clusters/", data) - cluster_id = cluster_response[u"id"] - if params.mode: - data = {"mode": params.mode} - cluster_response = json_api_put_request( - "clusters/{0}/".format(cluster_id), - data - ) - if params.json: - print(json.dumps(cluster_response, indent=4)) - else: - print( - "Environment with id={id} in mode={mode}" - " was successfully created!" - .format(**cluster_response) - ) - elif params.set: - check_for_attributes(params, ["eid"]) - if params.mode or params.ename: - data = {} - if params.mode: - data["mode"] = params.mode - if params.ename: - data["name"] = params.ename - put_response = json_api_put_request( - "clusters/{0}/".format(params.eid), - data - ) - if params.json: - print(json.dumps(put_response, indent=4)) - else: - if params.ename: - print( - "Environment with id={0} was " - "successfully renamed to {1}" - .format( - params.eid, - params.ename - ) - ) - if params.mode: - print( - "Mode of environment with id={0} was " - "successfully set to {1}." - .format( - params.eid, - params.mode - ) - ) - - -def node(params): - """List and assign available nodes to environments - """ - if not has_arguments(params) or params.list: - acceptable_keys = ["id", "status", "name", "cluster", - "mac", "roles", "online"] - data = json_api_get_request("nodes/") - if params.eid: - data = filter( - lambda x: x[u"cluster"] == int(params.eid), - data - ) - print( - format_table(data, acceptable_keys=acceptable_keys) - ) - elif params.set: - check_for_attributes(params, ["nid", "role", "eid"]) - node_ids = list(chain(*params.nid)) - roles = map(str.lower, params.role) - data = map( - lambda node_id: { - "id": node_id, - "cluster_id": params.eid, - "roles": roles, - "pending_addition": True, - "pending_deletion": False - }, - node_ids - ) - put_response = json_api_put_request("nodes/", data) - node_ids = map(str, node_ids) - if params.json: - print(json.dumps(put_response, indent=4)) - else: - print( - "{0} added to environment with id={1} in {2}." - .format( - "Node with id={0} was".format(node_ids[0]) - if len(node_ids) == 1 else - "Nodes with ids={0} were".format(", ".join(node_ids)), - params.eid, - "role={0}".format(roles[0]) - if len(roles) == 1 else - "roles={0}".format(", ".join(roles)) - ) - ) - elif params.remove: - check_for_one_attribute(params, ["eid", "nid"]) - nodes_clusters = dict((node["id"], node["cluster"]) - for node in json_api_get_request("nodes/")) - if not params.nid and params.eid: - node_ids = [k for k, v in nodes_clusters.iteritems() - if v == int(params.eid)] - else: - node_ids = list(chain(*params.nid)) - data = map( - lambda node_id: { - "id": node_id, - "cluster_id": params.eid or nodes_clusters.get(node_id), - "pending_roles": [], - "pending_addition": False, - "pending_deletion": True - }, - node_ids - ) - put_response = json_api_put_request("nodes/", data) - node_ids = map(str, node_ids) - if params.json: - print(json.dumps(put_response, indent=4)) - else: - print( - "{0} removed from environment with id={1}." - .format( - "Node with id={0} was".format(node_ids[0]) - if len(node_ids) == 1 else - "Nodes with ids={0} were".format(", ".join(node_ids)), - params.eid - ) - ) - - -def network(params): - """Show or modify network settings of specific environments - """ - print(params) - - -def settings(params): - """Show or modify environment settings - """ - print(params) - - -def logs(params): - """Show logs for specific environment - """ - print(params) - - -def task(params): - """Show tasks - """ - get_response = json_api_get_request("tasks/") - if params.json: - print(json.dumps(get_response, indent=4)) - - -def notifications(params): - """Show notifications - """ - print(params) - - -def health(params): - """Perform health check for environments - """ - print(params) - - -def deploy(params): - """Deploy changes to environments - """ - check_for_attributes(params, ["eid"]) - put_response = json_api_put_request( - "clusters/{0}/changes".format(params.eid), - {} - ) - if params.json: - print(json.dumps(put_response, indent=4)) - else: - print_deploy_progress(params.eid) - - -def get_bar_for_progress(full_width, progress): - number_of_equal_signs = int( - math.ceil(progress * float(full_width-2)/100) - ) - return "[{0}{1}{2}]".format( - "=" * number_of_equal_signs, - ">" if number_of_equal_signs < full_width-2 else "", - " " * (full_width-3-number_of_equal_signs) - ) - - -def print_deploy_progress(eid): - stdscr = curses.initscr() - scr_width = stdscr.getmaxyx()[1] - curses.noecho() - curses.cbreak() - tasks = json_api_get_request("tasks?cluster_id={0}".format(eid)) - deploy_task = filter( - lambda x: x.get("name", "") == "deploy", - tasks - )[0] - deploy_task_id = deploy_task["id"] - progress = 0 - total_progress_bar = partial(get_bar_for_progress, scr_width - 17) - node_bar = partial(get_bar_for_progress, scr_width - 28) - nodes = [] - try: - while progress != 100 or \ - any(map(lambda node: node["progress"] != 100, nodes)): - task_response = json_api_get_request( - "tasks/{0}/".format(deploy_task_id) - ) - progress = task_response["progress"] - nodes = json_api_get_request( - "nodes?cluster_id={0}" - .format(eid) - ) - nodes.sort(key=lambda node: node.get("id")) - stdscr.addstr(0, 0, - "Deploying changes to environment with id={0}" - .format(eid) - ) - stdscr.addstr(1, 0, - "Deployment: {0} {1:4.0%}".format( - total_progress_bar(progress), - progress / 100.0 - )) - for index, node in enumerate(nodes): - stdscr.addstr(index + 2, 0, - "Node{0:3} {1:13}: {2} {3:4.0%}".format( - node["id"], - node["status"], - node_bar(node["progress"]), - node["progress"] / 100.0 - ) - ) - sleep(0.25) - stdscr.refresh() - sleep(1) - finally: - curses.echo() - curses.nocbreak() - curses.endwin() - - -def provisioning(params): - """Show computed provisioning facts for orchestrator - """ - fact(params, "provisioning") - - -def deployment(params): - """Show computed deployment facts for orchestrator - """ - fact(params, "deployment") - - -def fact(params, info_type): - check_for_attributes(params, ["eid"]) - - dir_name = os.path.join( - os.path.abspath(os.path.curdir - if params.dir is None else params.dir), - "{0}_{1}".format(info_type, params.eid) - ) - facts_default_url = "clusters/{0}/orchestrator/{1}/defaults".format( - params.eid, - info_type - ) - facts_url = "clusters/{0}/orchestrator/{1}/".format( - params.eid, - info_type - ) - if params.default: - facts = json_api_get_request(facts_default_url) - write_facts_to_dir(facts, dir_name) - elif params.upload: - put_response = json_api_put_request( - facts_url, - read_deployment_info(dir_name) - if info_type == "deployment" else - read_provisioning_info(dir_name) - ) - - if params.json: - print(json.dumps(put_response, indent=4)) - else: - print("{0} facts uploaded successfully.".format(info_type)) - elif params.delete: - json_api_delete_request(facts_url) - print("{0} facts deleted successfully.".format(info_type)) - else: - facts = json_api_get_request(facts_url) - if not facts: - print( - "Environment with id={0} has no {1} info." - .format(params.eid, info_type) - ) - return - if params.download: - write_facts_to_dir(facts, dir_name) - else: - if params.json: - print(json.dumps(facts, indent=4)) - - -def read_json(path): - with open(path, "r") as json_file: - return json.loads(json_file.read()) - - -def folder_or_one_up(dir_path): - if not os.path.exists(dir_path): - path_to_folder = dir_path.split(os.sep) - one_folder_up = path_to_folder[:-2] + path_to_folder[-2:-1] - dir_path = os.sep.join(one_folder_up) - return dir_path - - -def read_provisioning_info(dir_name): - dir_name = folder_or_one_up(dir_name) - if "engine.json" not in os.listdir(dir_name): - print_error( - "engine.json was not found in {0}\n" - .format(dir_name) - ) - try: - node_facts = map( - read_json, - [os.path.join(dir_name, json_file) - for json_file in os.listdir(dir_name) - if json_file.endswith('.json') and json_file != "engine.json"] - ) - engine = read_json(os.path.join(dir_name, "engine.json")) - return { - "engine": engine, - "nodes": node_facts - } - except OSError: - print_error( - "Directory {0} doesn't exist.\n" - .format(dir_name) - ) - - -def read_deployment_info(dir_name): - dir_name = folder_or_one_up(dir_name) - try: - return map( - read_json, - [os.path.join(dir_name, json_file) - for json_file in os.listdir(dir_name) - if json_file.endswith('.json')] - ) - except OSError: - print_error( - "Directory {0} doesn't exist.\n" - .format(dir_name) - ) - - -def write_facts_to_dir(facts, dir_name): - if os.path.exists(dir_name): - shutil.rmtree(dir_name) - print("old directory {0} was removed".format(dir_name)) - os.makedirs(dir_name) - print("directory {0} was created".format(dir_name)) - if isinstance(facts, dict): - engine_fd = open(os.path.join(dir_name, "engine.json"), "w+") - engine_fd.write(json.dumps(facts["engine"], indent=4)) - print("Created {0}".format(engine_fd.name)) - engine_fd.close() - facts = facts["nodes"] - name_template = "{name}.json" - else: - name_template = "{role}_{uid}.json" - for fact in facts: - fd = open( - os.path.join( - dir_name, - name_template.format(**fact) - ), - "w+" - ) - fd.write(json.dumps(fact, indent=4)) - print("Created {0}".format(fd.name)) - fd.close() - - -def parse_node_ids(x): - """Parse arguments with commas and spaces - - :returns: list of lists with numbers - """ - filtered = [y for y in x.split(",") if y.strip() != ''] - if len(filtered) > 1: - return map(int, filtered) - elif len(filtered) == 1: - return [int(filtered[0])] - else: - return None - - -actions = { - "release": { - "action": release, - "args": [{ - "args": ["-l", "--list"], - "params": { - "dest": "list", - "action": "store_true", - "help": "List all available releases.", - "default": False - } - }, { - "args": ["-c", "--config"], - "params": { - "dest": "config", - "action": "store_true", - "help": "Configure release with --release", - "default": False - } - }, { - "args": ["--rel", "--release"], - "params": { - "dest": "rid", - "action": "store", - "type": str, - "help": "Specify release id to configure", - "default": None - } - }] - }, - "environment": { - "action": environment, - "args": [{ - "args": ["-l", "--list"], - "params": { - "dest": "list", - "action": "store_true", - "help": "List all available environments.", - "default": False - } - }, { - "args": ["-c", "--env-create", "--create"], - "params": { - "dest": "create", - "action": "store_true", - "help": "Create a new environment with specific " - "release id and name.", - "default": False - } - }, { - "args": ["--name", "--env-name"], - "params": { - "dest": "ename", - "action": "store", - "type": str, - "help": "environment name", - "default": None - } - }, { - "args": ["-s", "--set"], - "params": { - "dest": "set", - "action": "store_true", - "help": "Set environment parameters (e.g name, " - "deployment mode)", - "default": False - } - }, { - "args": ["-d", "--delete", "--env-delete"], - "params": { - "dest": "delete", - "action": "store_true", - "help": "Delete environment with specific eid or name", - "default": False - } - }, { - "args": ["--rel", "--release"], - "params": { - "dest": "rid", - "action": "store", - "type": str, - "help": "Release id", - "default": None - } - }, { - "args": ["-m", "--mode", "--deployment-mode"], - "params": { - "dest": "mode", - "action": "store", - "choices": ["multinode", "ha", "ha_full", "ha_compact"], - "help": "Set deployment mode for specific environment.", - "default": False - } - }] - }, - "node": { - "action": node, - "args": [{ - "args": ["-l", "--list"], - "params": { - "dest": "list", - "action": "store_true", - "help": "List all nodes.", - "default": False - } - }, { - "args": ["-s", "--set"], - "params": { - "dest": "set", - "action": "store_true", - "help": "Set role for specific node.", - "default": False - } - }, { - "args": ["--node", "--node-id"], - "params": { - "dest": "nid", - "action": "store", - "nargs": '+', - "type": parse_node_ids, - "help": "Node id.", - "default": None - } - }, { - "args": ["-r", "--role"], - "params": { - "dest": "role", - "type": lambda v: v.split(','), - "action": SetAction, - "help": "Role to assign for node.", - "default": None - } - }, { - "args": ["--rm", "--remove"], - "params": { - "dest": "remove", - "action": "store_true", - "help": "Remove specific node.", - "default": False - } - }] - }, - "network": { - "action": network, - "args": [{ - "args": ["-d", "--default"], - "params": { - "dest": "default", - "action": "store_true", - "help": "Open default configuration.", - "default": False - } - }, { - "args": ["-m", "--modify"], - "params": { - "dest": "modify", - "action": "store_true", - "help": "Modify current configuration.", - "default": False - } - }, { - "args": ["-v", "--verify"], - "params": { - "dest": "verify", - "action": "store_true", - "help": "Verify current configuration.", - "default": False - } - }, { - "args": ["-c", "--cancel"], - "params": { - "dest": "cancel", - "action": "store_true", - "help": "Remove current changes in configuration.", - "default": False - } - }, { - "args": ["-s", "--save"], - "params": { - "dest": "save", - "action": "store_true", - "help": "Save current changes in configuration.", - "default": False - } - }] - }, - "settings": { - "action": settings, - "args": [{ - "args": ["-d", "--default"], - "params": { - "dest": "default", - "action": "store_true", - "help": "Open default configuration.", - "default": False - } - }, { - "args": ["-m", "--modify"], - "params": { - "dest": "modify", - "action": "store_true", - "help": "Modify current configuration.", - "default": False - } - }, { - "args": ["-c", "--cancel"], - "params": { - "dest": "cancel", - "action": "store_true", - "help": "Remove current changes in configuration.", - "default": False - } - }, { - "args": ["-s", "--save"], - "params": { - "dest": "save", - "action": "store_true", - "help": "Save current changes in configuration.", - "default": False - } - }] - }, - "logs": { - "action": logs, - "args": [{ - "args": ["-db", "--date-before"], - "params": { - "dest": "before", - "action": "store", - "type": str, - "help": "Date before which collect logs.", - "default": None - } - }, { - "args": ["-da", "--date-after"], - "params": { - "dest": "after", - "action": "store", - "type": str, - "help": "Date after which collect logs.", - "default": None - } - }, { - "args": ["-m", "--max-entries"], - "params": { - "dest": "max", - "action": "store", - "type": str, - "help": "Maximum number of log entries.", - "default": None - } - }, { - "args": ["-n", "--node"], - "params": { - "dest": "node", - "action": "store", - "type": str, - "help": "From which node to collect logs.", - "default": None - } - }, { - "args": ["-s", "--source"], - "params": { - "dest": "source", - "action": "store", - "type": str, - "help": "Service to use as log source. " - "(web backend, REST, orchestrator)", - "default": None - } - }, { - "args": ["-ll", "--log-level"], - "params": { - "dest": "level", - "action": "store", - "type": str, - "help": "Log level. e.g DEBUG, INFO, WARNING", - "default": None - } - }] - }, - "task": { - "action": task, - "args": [] - }, - "notification": { - "action": notifications, - "args": [] - }, - "health": { - "action": health, - "args": [] - }, - "deploy": { - "action": deploy, - "args": [] - } -} - - -def get_args_for_facts(fact_type): - return [ - { - "args": ["--delete"], - "params": { - "dest": "delete", - "action": "store_true", - "help": "Delete current {0} data.".format(fact_type), - "default": False - } - }, { - "args": ["--download"], - "params": { - "dest": "download", - "action": "store_true", - "help": "Download current {0} data.".format(fact_type), - "default": False - } - }, { - "args": ["--upload"], - "params": { - "dest": "upload", - "action": "store_true", - "help": "Upload current {0} data.".format(fact_type), - "default": False - } - }, { - "args": ["--default"], - "params": { - "dest": "default", - "action": "store_true", - "help": "Download default {0} data.".format(fact_type), - "default": False - } - }, { - "args": ["-d", "--dir"], - "params": { - "dest": "dir", - "action": "store", - "help": "Directory with {0} data.".format(fact_type), - "default": None - } - } - ] - - -substitutions = { - "env": "environment", - "net": "network", - "rel": "release", - "list": "--list", - "set": "--set", - "delete": "--delete", - "download": "--download", - "upload": "--upload", - "default": "--default", - "create": "--create", - "remove": "--remove" -} - -if __name__ == '__main__': - sys.argv = map( - lambda x: substitutions.get(x, x), - sys.argv - ) - - for argument in ["--json", "--debug"]: - if argument in sys.argv: - sys.argv.remove(argument) - sys.argv.insert(1, argument) - - for argument in ["--env", "--env-id"]: - if argument in sys.argv: - index_of_inv = sys.argv.index(argument) - sys.argv.pop(index_of_inv) - env = sys.argv.pop(index_of_inv) - sys.argv.insert(1, env) - sys.argv.insert(1, argument) - break - - fact_types = [deployment, provisioning] - for fact_type in fact_types: - actions[fact_type.__name__] = { - "action": fact_type, - "args": get_args_for_facts(fact_type.__name__) - } - - parser = argparse.ArgumentParser() - parser.add_argument("--env", "--env-id", - dest="eid", - action="store", - type=str, - help="environment id", - default=None - ) - parser.add_argument("--json", - dest="json", - action="store_true", - help="prints to only json to stdout", - default=False - ) - parser.add_argument("--debug", - dest="debug", - action="store_true", - help="prints details of all HTTP request", - default=False - ) - subparsers = parser.add_subparsers( - dest="action", help='actions' - ) - - for action, params in actions.iteritems(): - action_parser = subparsers.add_parser( - action, help=params["action"].__doc__ - ) - for arg in params.get("args", []): - action_parser.add_argument( - *arg["args"], - **arg["params"] - ) - - params, other_params = parser.parse_known_args() - sys.argv.pop(1) - DEBUG = params.debug - JSON = params.json - if params.action not in actions: - parser.print_help() - sys.exit(0) - current_action = getattr(params, "action") - delattr(params, "action") - actions[current_action]["action"](params) diff --git a/nailgun/manage.py b/nailgun/manage.py deleted file mode 100755 index d19716a65..000000000 --- a/nailgun/manage.py +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import argparse -import code -import sys - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers( - dest="action", help='actions' - ) - run_parser = subparsers.add_parser( - 'run', help='run application locally' - ) - run_parser.add_argument( - '-p', '--port', dest='port', action='store', type=str, - help='application port', default='8000' - ) - run_parser.add_argument( - '-a', '--address', dest='address', action='store', type=str, - help='application address', default='0.0.0.0' - ) - run_parser.add_argument( - '--fake-tasks', action='store_true', help='fake tasks' - ) - run_parser.add_argument( - '--fake-tasks-amqp', action='store_true', - help='fake tasks with real AMQP' - ) - run_parser.add_argument( - '--keepalive', - action='store_true', - help='run keep alive thread' - ) - run_parser.add_argument( - '-c', '--config', dest='config_file', action='store', type=str, - help='custom config file', default=None - ) - run_parser.add_argument( - '--fake-tasks-tick-count', action='store', type=int, - help='Fake tasks tick count' - ) - run_parser.add_argument( - '--fake-tasks-tick-interval', action='store', type=int, - help='Fake tasks tick interval in seconds' - ) - test_parser = subparsers.add_parser( - 'test', help='run unit tests' - ) - syncdb_parser = subparsers.add_parser( - 'syncdb', help='sync application database' - ) - dropdb_parser = subparsers.add_parser( - 'dropdb', help='drop application database' - ) - shell_parser = subparsers.add_parser( - 'shell', help='open python REPL' - ) - shell_parser.add_argument( - '-c', '--config', dest='config_file', action='store', type=str, - help='custom config file', default=None - ) - loaddata_parser = subparsers.add_parser( - 'loaddata', help='load data from fixture' - ) - loaddata_parser.add_argument( - 'fixture', action='store', help='json fixture to load' - ) - dumpdata_parser = subparsers.add_parser( - 'dumpdata', help='dump models as fixture' - ) - dumpdata_parser.add_argument( - 'model', action='store', help='model name to dump; underscored name' - 'should be used, e.g. network_group for NetworkGroup model' - ) - loaddefault_parser = subparsers.add_parser( - 'loaddefault', - help='load data from default fixtures ' - '(settings.FIXTURES_TO_IPLOAD)' - ) - dump_settings = subparsers.add_parser( - 'dump_settings', help='dump current settings to YAML' - ) - params, other_params = parser.parse_known_args() - sys.argv.pop(1) - - if params.action == "dumpdata": - import logging - logging.disable(logging.WARNING) - from nailgun.fixtures import fixman - fixman.dump_fixture(params.model) - sys.exit(0) - - from nailgun.logger import logger - from nailgun.settings import settings - - if params.action == "syncdb": - logger.info("Syncing database...") - from nailgun.db import syncdb - syncdb() - logger.info("Done") - elif params.action == "dropdb": - logger.info("Dropping database...") - from nailgun.db import dropdb - dropdb() - logger.info("Done") - elif params.action == "test": - logger.info("Running tests...") - from nailgun.unit_test import TestRunner - TestRunner.run() - logger.info("Done") - elif params.action == "loaddata": - logger.info("Uploading fixture...") - from nailgun.fixtures import fixman - with open(params.fixture, "r") as fileobj: - fixman.upload_fixture(fileobj) - logger.info("Done") - elif params.action == "loaddefault": - logger.info("Uploading fixture...") - from nailgun.fixtures import fixman - fixman.upload_fixtures() - logger.info("Done") - elif params.action == "dump_settings": - sys.stdout.write(settings.dump()) - elif params.action in ("run",): - settings.update({ - 'LISTEN_PORT': int(params.port), - 'LISTEN_ADDRESS': params.address, - }) - for attr in ['FAKE_TASKS', 'FAKE_TASKS_TICK_COUNT', - 'FAKE_TASKS_TICK_INTERVAL', 'FAKE_TASKS_AMQP']: - param = getattr(params, attr.lower()) - if param is not None: - settings.update({attr: param}) - if params.config_file: - settings.update_from_file(params.config_file) - from nailgun.wsgi import appstart - appstart(keepalive=params.keepalive) - elif params.action == "shell": - from nailgun.db import db - if params.config_file: - settings.update_from_file(params.config_file) - try: - from IPython import embed - embed() - except ImportError: - code.interact(local={'db': db, 'settings': settings}) - else: - parser.print_help() diff --git a/nailgun/module.mk b/nailgun/module.mk deleted file mode 100644 index e9ad476fc..000000000 --- a/nailgun/module.mk +++ /dev/null @@ -1,25 +0,0 @@ -NAILGUN_VERSION:=$(shell python -c "import sys; sys.path.insert(0, '$(SOURCE_DIR)/nailgun'); import setup; print setup.version") - -$(BUILD_DIR)/packages/eggs/Nailgun-$(NAILGUN_VERSION).tar.gz: $(call depv,NO_UI_OPTIMIZE) \ - $(call find-files,$(SOURCE_DIR)/nailgun) -ifeq ($(NO_UI_OPTIMIZE),0) - mkdir -p $(BUILD_DIR)/packages/eggs - cp -r $(SOURCE_DIR)/nailgun $(BUILD_DIR)/packages/eggs - cd $(SOURCE_DIR)/nailgun && \ - r.js -o build.js dir=$(BUILD_DIR)/packages/eggs/nailgun/static - rm -rf $(BUILD_DIR)/packages/eggs/nailgun/static/templates - rm -f $(BUILD_DIR)/packages/eggs/nailgun/static/build.txt - find $(BUILD_DIR)/packages/eggs/nailgun/static/css -type f ! -name main.css -delete - find $(BUILD_DIR)/packages/eggs/nailgun/static/js -type f ! -name main.js -and ! -name require.js -delete - cd $(BUILD_DIR)/packages/eggs/nailgun && \ - python setup.py sdist --dist-dir $(BUILD_DIR)/packages/eggs -else - cd $(SOURCE_DIR)/nailgun && \ - python setup.py sdist --dist-dir $(BUILD_DIR)/packages/eggs -endif - -test-unit: test-unit-nailgun - -.PHONY: test-unit test-unit-nailgun -test-unit-nailgun: - cd $(SOURCE_DIR)/nailgun && ./run_tests.sh diff --git a/nailgun/nailgun/__init__.py b/nailgun/nailgun/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/api/__init__.py b/nailgun/nailgun/api/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/api/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/api/fields.py b/nailgun/nailgun/api/fields.py deleted file mode 100644 index 72405acf2..000000000 --- a/nailgun/nailgun/api/fields.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -import sqlalchemy.types as types - - -class JSON(types.TypeDecorator): - - impl = types.Text - - def process_bind_param(self, value, dialect): - if value is not None: - value = json.dumps(value) - return value - - def process_result_value(self, value, dialect): - if value is not None: - value = json.loads(value) - return value diff --git a/nailgun/nailgun/api/handlers/__init__.py b/nailgun/nailgun/api/handlers/__init__.py deleted file mode 100644 index 0143afe08..000000000 --- a/nailgun/nailgun/api/handlers/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.handlers.base import check_client_content_type -from nailgun.api.handlers.base import forbid_client_caching diff --git a/nailgun/nailgun/api/handlers/base.py b/nailgun/nailgun/api/handlers/base.py deleted file mode 100644 index 044ac68fe..000000000 --- a/nailgun/nailgun/api/handlers/base.py +++ /dev/null @@ -1,140 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from datetime import datetime -from decorator import decorator -import json - -import web - -from nailgun.api.serializers.base import BasicSerializer -from nailgun.api.validators.base import BasicValidator -from nailgun.db import db -from nailgun.errors import errors -from nailgun.logger import logger -from nailgun import notifier - - -def check_client_content_type(handler): - content_type = web.ctx.env.get("CONTENT_TYPE", "application/json") - if web.ctx.path.startswith("/api")\ - and not content_type.startswith("application/json"): - raise web.unsupportedmediatype - return handler() - - -def forbid_client_caching(handler): - if web.ctx.path.startswith("/api"): - web.header('Cache-Control', - 'store, no-cache, must-revalidate,' - ' post-check=0, pre-check=0') - web.header('Pragma', 'no-cache') - dt = datetime.fromtimestamp(0).strftime( - '%a, %d %b %Y %H:%M:%S GMT' - ) - web.header('Expires', dt) - return handler() - - -@decorator -def content_json(func, *args, **kwargs): - web.header('Content-Type', 'application/json') - data = func(*args, **kwargs) - return build_json_response(data) - - -def build_json_response(data): - web.header('Content-Type', 'application/json') - if type(data) in (dict, list): - return json.dumps(data, indent=4) - return data - - -handlers = {} - - -class HandlerRegistrator(type): - def __init__(cls, name, bases, dct): - super(HandlerRegistrator, cls).__init__(name, bases, dct) - if hasattr(cls, 'model'): - key = cls.model.__name__ - if key in handlers: - logger.warning("Handler for %s already registered" % key) - return - handlers[key] = cls - - -class JSONHandler(object): - __metaclass__ = HandlerRegistrator - validator = BasicValidator - serializer = BasicSerializer - - fields = [] - - def __init__(self): - self.serializer.load_handlers(handlers) - - @classmethod - def render(cls, instance, fields=None): - return cls.serializer.serialize( - instance, - fields=fields or cls.fields - ) - - def checked_data(self, validate_method=None): - try: - if validate_method: - data = validate_method(web.data()) - else: - data = self.validator.validate(web.data()) - except ( - errors.InvalidInterfacesInfo, - errors.InvalidMetadata - ) as exc: - notifier.notify("error", str(exc)) - raise web.badrequest(message=str(exc)) - except ( - errors.AlreadyExists - ) as exc: - err = web.conflict() - err.message = exc.message - raise err - except ( - errors.InvalidData, - Exception - ) as exc: - raise web.badrequest(message=str(exc)) - return data - - def get_object_or_404(self, model, *args, **kwargs): - # should be in ('warning', 'Log message') format - # (loglevel, message) - log_404 = kwargs.pop("log_404") if "log_404" in kwargs else None - log_get = kwargs.pop("log_get") if "log_get" in kwargs else None - if "id" in kwargs: - obj = db().query(model).get(kwargs["id"]) - elif len(args) > 0: - obj = db().query(model).get(args[0]) - else: - obj = db().query(model).filter(**kwargs).all() - if not obj: - if log_404: - getattr(logger, log_404[0])(log_404[1]) - raise web.notfound() - else: - if log_get: - getattr(logger, log_get[0])(log_get[1]) - return obj diff --git a/nailgun/nailgun/api/handlers/cluster.py b/nailgun/nailgun/api/handlers/cluster.py deleted file mode 100644 index 034f2b434..000000000 --- a/nailgun/nailgun/api/handlers/cluster.py +++ /dev/null @@ -1,386 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with clusters -""" - -import json -import traceback -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.handlers.tasks import TaskHandler -from nailgun.api.models import Attributes -from nailgun.api.models import Cluster -from nailgun.api.models import Node -from nailgun.api.models import Release -from nailgun.api.serializers.network_configuration \ - import NetworkConfigurationSerializer -from nailgun.api.validators.cluster import AttributesValidator -from nailgun.api.validators.cluster import ClusterValidator -from nailgun.db import db -from nailgun.errors import errors -from nailgun.logger import logger -from nailgun.network.manager import NetworkManager -from nailgun.task.manager import ClusterDeletionManager -from nailgun.task.manager import DeploymentTaskManager - - -class ClusterHandler(JSONHandler): - """Cluster single handler - """ - - fields = ( - "id", - "name", - "mode", - "status", - "grouping", - ("release", "*") - ) - - model = Cluster - validator = ClusterValidator - - @classmethod - def render(cls, instance, fields=None): - json_data = JSONHandler.render(instance, fields=cls.fields) - if instance.changes: - for i in instance.changes: - if not i.node_id: - json_data.setdefault("changes", []).append(i.name) - else: - json_data.setdefault("changes", []).append( - [i.name, i.node_id] - ) - else: - json_data["changes"] = [] - return json_data - - @content_json - def GET(self, cluster_id): - """:returns: JSONized Cluster object. - :http: * 200 (OK) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - return self.render(cluster) - - @content_json - def PUT(self, cluster_id): - """:returns: JSONized Cluster object. - :http: * 200 (OK) - * 400 (invalid cluster data specified) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - data = self.checked_data() - network_manager = NetworkManager() - - for key, value in data.iteritems(): - if key == "nodes": - # TODO(NAME): sepatate nodes - #for deletion and addition by set(). - new_nodes = db().query(Node).filter( - Node.id.in_(value) - ) - nodes_to_remove = [n for n in cluster.nodes - if n not in new_nodes] - nodes_to_add = [n for n in new_nodes - if n not in cluster.nodes] - for node in nodes_to_add: - if not node.online: - raise web.badrequest( - "Can not add offline node to cluster") - map(cluster.nodes.remove, nodes_to_remove) - map(cluster.nodes.append, nodes_to_add) - for node in nodes_to_remove: - network_manager.clear_assigned_networks(node.id) - network_manager.clear_all_allowed_networks(node.id) - for node in nodes_to_add: - network_manager.allow_network_assignment_to_all_interfaces( - node.id - ) - network_manager.assign_networks_to_main_interface(node.id) - else: - setattr(cluster, key, value) - db().commit() - return self.render(cluster) - - @content_json - def DELETE(self, cluster_id): - """:returns: {} - :http: * 202 (cluster deletion process launched) - * 400 (failed to execute cluster deletion process) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - task_manager = ClusterDeletionManager(cluster_id=cluster.id) - try: - logger.debug('Trying to execute cluster deletion task') - task_manager.execute() - except Exception as e: - logger.warn('Error while execution ' - 'cluster deletion task: %s' % str(e)) - logger.warn(traceback.format_exc()) - raise web.badrequest(str(e)) - raise web.webapi.HTTPError( - status="202 Accepted", - data="{}" - ) - - -class ClusterCollectionHandler(JSONHandler): - """Cluster collection handler - """ - - validator = ClusterValidator - - @content_json - def GET(self): - """:returns: Collection of JSONized Cluster objects. - :http: * 200 (OK) - """ - return map( - ClusterHandler.render, - db().query(Cluster).all() - ) - - @content_json - def POST(self): - """:returns: JSONized Cluster object. - :http: * 201 (cluster successfully created) - * 400 (invalid cluster data specified) - * 409 (cluster with such parameters already exists) - """ - # It's used for cluster creating only. - data = self.checked_data() - - cluster = Cluster() - cluster.release = db().query(Release).get(data["release"]) - # TODO(NAME): use fields - for field in ('name', 'mode', 'net_manager'): - if data.get(field): - setattr(cluster, field, data.get(field)) - db().add(cluster) - db().commit() - attributes = Attributes( - editable=cluster.release.attributes_metadata.get("editable"), - generated=cluster.release.attributes_metadata.get("generated"), - cluster=cluster - ) - attributes.generate_fields() - - netmanager = NetworkManager() - try: - netmanager.create_network_groups(cluster.id) - - cluster.add_pending_changes("attributes") - cluster.add_pending_changes("networks") - - if 'nodes' in data and data['nodes']: - nodes = db().query(Node).filter( - Node.id.in_(data['nodes']) - ).all() - map(cluster.nodes.append, nodes) - db().commit() - for node in nodes: - netmanager.allow_network_assignment_to_all_interfaces( - node.id - ) - netmanager.assign_networks_to_main_interface(node.id) - - raise web.webapi.created(json.dumps( - ClusterHandler.render(cluster), - indent=4 - )) - except ( - errors.OutOfVLANs, - errors.OutOfIPs, - errors.NoSuitableCIDR - ) as e: - # Cluster was created in this request, - # so we no need to use ClusterDeletionManager. - # All relations wiil be cascade deleted automaticly. - # TODO(NAME): investigate transactions - db().delete(cluster) - - raise web.badrequest(e.message) - - -class ClusterChangesHandler(JSONHandler): - """Cluster changes handler - """ - - fields = ( - "id", - "name", - ) - - @content_json - def PUT(self, cluster_id): - """:returns: JSONized Task object. - :http: * 200 (task successfully executed) - * 404 (cluster not found in db) - * 400 (failed to execute task) - """ - cluster = self.get_object_or_404( - Cluster, - cluster_id, - log_404=( - "warning", - "Error: there is no cluster " - "with id '{0}' in DB.".format(cluster_id))) - - try: - network_info = \ - NetworkConfigurationSerializer.serialize_for_cluster( - cluster - ) - logger.info( - u"Network info:\n{0}".format( - json.dumps(network_info, indent=4) - ) - ) - task_manager = DeploymentTaskManager( - cluster_id=cluster.id - ) - task = task_manager.execute() - except Exception as exc: - logger.warn(u'ClusterChangesHandler: error while execution' - ' deploy task: {0}'.format(str(exc))) - raise web.badrequest(str(exc)) - - return TaskHandler.render(task) - - -class ClusterAttributesHandler(JSONHandler): - """Cluster attributes handler - """ - - fields = ( - "editable", - ) - - validator = AttributesValidator - - @content_json - def GET(self, cluster_id): - """:returns: JSONized Cluster attributes. - :http: * 200 (OK) - * 404 (cluster not found in db) - * 500 (cluster has no attributes) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - if not cluster.attributes: - raise web.internalerror("No attributes found!") - - return { - "editable": cluster.attributes.editable - } - - @content_json - def PUT(self, cluster_id): - """:returns: JSONized Cluster attributes. - :http: * 200 (OK) - * 400 (wrong attributes data specified) - * 404 (cluster not found in db) - * 500 (cluster has no attributes) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - if not cluster.attributes: - raise web.internalerror("No attributes found!") - - data = self.checked_data() - - for key, value in data.iteritems(): - setattr(cluster.attributes, key, value) - cluster.add_pending_changes("attributes") - - db().commit() - return {"editable": cluster.attributes.editable} - - -class ClusterAttributesDefaultsHandler(JSONHandler): - """Cluster default attributes handler - """ - - fields = ( - "editable", - ) - - @content_json - def GET(self, cluster_id): - """:returns: JSONized default Cluster attributes. - :http: * 200 (OK) - * 404 (cluster not found in db) - * 500 (cluster has no attributes) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - attrs = cluster.release.attributes_metadata.get("editable") - if not attrs: - raise web.internalerror("No attributes found!") - return {"editable": attrs} - - @content_json - def PUT(self, cluster_id): - """:returns: JSONized Cluster attributes. - :http: * 200 (OK) - * 400 (wrong attributes data specified) - * 404 (cluster not found in db) - * 500 (cluster has no attributes) - """ - cluster = self.get_object_or_404( - Cluster, - cluster_id, - log_404=( - "warning", - "Error: there is no cluster " - "with id '{0}' in DB.".format(cluster_id) - ) - ) - - if not cluster.attributes: - logger.error('ClusterAttributesDefaultsHandler: no attributes' - ' found for cluster_id %s' % cluster_id) - raise web.internalerror("No attributes found!") - - cluster.attributes.editable = cluster.release.attributes_metadata.get( - "editable" - ) - db().commit() - cluster.add_pending_changes("attributes") - - logger.debug('ClusterAttributesDefaultsHandler:' - ' editable attributes for cluster_id %s were reset' - ' to default' % cluster_id) - return {"editable": cluster.attributes.editable} - - -class ClusterGeneratedData(JSONHandler): - """Cluster generated data - """ - - @content_json - def GET(self, cluster_id): - """:returns: JSONized cluster generated data - :http: * 200 (OK) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - return cluster.attributes.generated diff --git a/nailgun/nailgun/api/handlers/disks.py b/nailgun/nailgun/api/handlers/disks.py deleted file mode 100644 index d1dce45c3..000000000 --- a/nailgun/nailgun/api/handlers/disks.py +++ /dev/null @@ -1,119 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with disks -""" - -import traceback -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.models import Node -from nailgun.api.models import NodeAttributes -from nailgun.api.validators.node import NodeDisksValidator -from nailgun.db import db -from nailgun.errors import errors -from nailgun.logger import logger -from nailgun.volumes.manager import DisksFormatConvertor - - -class NodeDisksHandler(JSONHandler): - """Node disks handler - """ - - validator = NodeDisksValidator - - @content_json - def GET(self, node_id): - """:returns: JSONized node disks. - :http: * 200 (OK) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - node_volumes = node.attributes.volumes - return DisksFormatConvertor.format_disks_to_simple(node_volumes) - - @content_json - def PUT(self, node_id): - """:returns: JSONized node disks. - :http: * 200 (OK) - * 400 (invalid disks data specified) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - data = self.checked_data() - - if node.cluster: - node.cluster.add_pending_changes('disks', node_id=node.id) - - volumes_data = DisksFormatConvertor.format_disks_to_full(node, data) - # For some reasons if we update node attributes like - # node.attributes.volumes = volumes_data - # after - # db().commit() - # it resets to previous state - db().query(NodeAttributes).filter_by(node_id=node_id).update( - {'volumes': volumes_data}) - db().commit() - - return DisksFormatConvertor.format_disks_to_simple( - node.attributes.volumes) - - -class NodeDefaultsDisksHandler(JSONHandler): - """Node default disks handler - """ - - @content_json - def GET(self, node_id): - """:returns: JSONized node disks. - :http: * 200 (OK) - * 404 (node or its attributes not found in db) - """ - node = self.get_object_or_404(Node, node_id) - if not node.attributes: - return web.notfound() - - volumes = DisksFormatConvertor.format_disks_to_simple( - node.volume_manager.gen_volumes_info()) - - return volumes - - -class NodeVolumesInformationHandler(JSONHandler): - """Node volumes information handler - """ - - @content_json - def GET(self, node_id): - """:returns: JSONized volumes info for node. - :http: * 200 (OK) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - - volumes_info = [] - try: - volumes_info = DisksFormatConvertor.get_volumes_info(node) - except errors.CannotFindVolumesInfoForRole: - logger.error(traceback.format_exc()) - raise web.notfound( - message='Cannot calculate volumes info. ' - 'Please, add node to a cluster.') - - return volumes_info diff --git a/nailgun/nailgun/api/handlers/logs.py b/nailgun/nailgun/api/handlers/logs.py deleted file mode 100644 index 38ac93071..000000000 --- a/nailgun/nailgun/api/handlers/logs.py +++ /dev/null @@ -1,351 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with logs -""" - -from itertools import dropwhile -import json -import logging -import os -import re -import time - -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.handlers.tasks import TaskHandler -from nailgun.api.models import Node -from nailgun.api.models import RedHatAccount -from nailgun.db import db -from nailgun.settings import settings -from nailgun.task.manager import DumpTaskManager - -logger = logging.getLogger(__name__) - - -def read_backwards(file, bufsize=4096): - buf = "" - try: - file.seek(-1, 1) - except IOError: - return - trailing_newline = False - if file.read(1) == "\n": - trailing_newline = True - file.seek(-1, 1) - - while True: - newline_pos = buf.rfind("\n") - pos = file.tell() - if newline_pos != -1: - line = buf[newline_pos + 1:] - buf = buf[:newline_pos] - if pos or newline_pos or trailing_newline: - line += "\n" - yield line - elif pos: - toread = min(bufsize, pos) - file.seek(-toread, 1) - buf = file.read(toread) + buf - file.seek(-toread, 1) - if pos == toread: - buf = "\n" + buf - else: - return - - -class LogEntryCollectionHandler(JSONHandler): - """Log entry collection handler - """ - - @content_json - def GET(self): - """Receives following parameters: - - - *date_before* - get logs before this date - - *date_after* - get logs after this date - - *source* - source of logs - - *node* - node id (for getting node logs) - - *level* - log level (all levels showed by default) - - *to* - number of entries - - *max_entries* - max number of entries to load - - :returns: Collection of log entries, log file size - and if there are new entries. - :http: * 200 (OK) - * 400 (invalid *date_before* value) - * 400 (invalid *date_after* value) - * 400 (invalid *source* value) - * 400 (invalid *node* value) - * 400 (invalid *level* value) - * 400 (invalid *to* value) - * 400 (invalid *max_entries* value) - * 404 (log file not found) - * 404 (log files dir not found) - * 404 (node not found) - * 500 (node has no assigned ip) - * 500 (invalid regular expression in config) - """ - user_data = web.input() - date_before = user_data.get('date_before') - if date_before: - try: - date_before = time.strptime(date_before, - settings.UI_LOG_DATE_FORMAT) - except ValueError: - logger.debug("Invalid 'date_before' value: %s", date_before) - raise web.badrequest("Invalid 'date_before' value") - date_after = user_data.get('date_after') - if date_after: - try: - date_after = time.strptime(date_after, - settings.UI_LOG_DATE_FORMAT) - except ValueError: - logger.debug("Invalid 'date_after' value: %s", date_after) - raise web.badrequest("Invalid 'date_after' value") - truncate_log = bool(user_data.get('truncate_log')) - - if not user_data.get('source'): - logger.debug("'source' must be specified") - raise web.badrequest("'source' must be specified") - - log_config = filter(lambda lc: lc['id'] == user_data.source, - settings.LOGS) - # If log source not found or it is fake source but we are run without - # fake tasks. - if not log_config or (log_config[0].get('fake') and - not settings.FAKE_TASKS): - logger.debug("Log source %r not found", user_data.source) - return web.notfound("Log source not found") - log_config = log_config[0] - - # If it is 'remote' and not 'fake' log source then calculate log file - # path by base dir, node IP and relative path to file. - # Otherwise return absolute path. - node = None - if log_config['remote'] and not log_config.get('fake'): - if not user_data.get('node'): - raise web.badrequest("'node' must be specified") - node = db().query(Node).get(user_data.node) - if not node: - return web.notfound("Node not found") - if not node.ip: - logger.error('Node %r has no assigned ip', node.id) - raise web.internalerror("Node has no assigned ip") - - if node.status == "discover": - ndir = node.ip - else: - ndir = node.fqdn - - remote_log_dir = os.path.join(log_config['base'], ndir) - if not os.path.exists(remote_log_dir): - logger.debug("Log files dir %r for node %s not found", - remote_log_dir, node.id) - return web.notfound("Log files dir for node not found") - - log_file = os.path.join(remote_log_dir, log_config['path']) - else: - log_file = log_config['path'] - - if not os.path.exists(log_file): - if node: - logger.debug("Log file %r for node %s not found", - log_file, node.id) - else: - logger.debug("Log file %r not found", log_file) - return web.notfound("Log file not found") - - level = user_data.get('level') - allowed_levels = log_config['levels'] - if level is not None: - if not (level in log_config['levels']): - raise web.badrequest("Invalid level") - allowed_levels = [l for l in dropwhile(lambda l: l != level, - log_config['levels'])] - try: - regexp = re.compile(log_config['regexp']) - except re.error as e: - logger.error('Invalid regular expression for file %r: %s', - log_config['id'], e) - raise web.internalerror("Invalid regular expression in config") - - entries = [] - to_byte = None - try: - to_byte = int(user_data.get('to', 0)) - except ValueError: - logger.debug("Invalid 'to' value: %d", to_byte) - raise web.badrequest("Invalid 'to' value") - - log_file_size = os.stat(log_file).st_size - if to_byte >= log_file_size: - return json.dumps({ - 'entries': [], - 'to': log_file_size, - 'has_more': False, - }) - - try: - max_entries = int(user_data.get('max_entries', - settings.TRUNCATE_LOG_ENTRIES)) - except ValueError: - logger.debug("Invalid 'max_entries' value: %d", max_entries) - raise web.badrequest("Invalid 'max_entries' value") - - accs = db().query(RedHatAccount).all() - regs = [] - if len(accs) > 0: - regs = [ - ( - re.compile(r"|".join([a.username for a in accs])), - "username" - ), - ( - re.compile(r"|".join([a.password for a in accs])), - "password" - ) - ] - - has_more = False - with open(log_file, 'r') as f: - f.seek(0, 2) - # we need to calculate current position manually instead of using - # tell() because read_backwards uses buffering - pos = f.tell() - multilinebuf = [] - for line in read_backwards(f): - pos -= len(line) - if not truncate_log and pos < to_byte: - has_more = pos > 0 - break - entry = line.rstrip('\n') - if not len(entry): - continue - if 'skip_regexp' in log_config and \ - re.match(log_config['skip_regexp'], entry): - continue - m = regexp.match(entry) - if m is None: - if log_config.get('multiline'): - # Add next multiline part to last entry if it exist. - multilinebuf.append(entry) - else: - logger.debug("Unable to parse log entry '%s' from %s", - entry, log_file) - continue - entry_text = m.group('text') - if len(multilinebuf): - multilinebuf.reverse() - entry_text += '\n' + '\n'.join(multilinebuf) - multilinebuf = [] - entry_level = m.group('level').upper() or 'INFO' - if level and not (entry_level in allowed_levels): - continue - try: - entry_date = time.strptime(m.group('date'), - log_config['date_format']) - except ValueError: - logger.debug("Unable to parse date from log entry." - " Date format: %r, date part of entry: %r", - log_config['date_format'], - m.group('date')) - continue - - for regex, replace in regs: - entry_text = regex.sub(replace, entry_text) - - entries.append([ - time.strftime(settings.UI_LOG_DATE_FORMAT, entry_date), - entry_level, - entry_text - ]) - if truncate_log and len(entries) >= max_entries: - has_more = True - break - - return { - 'entries': entries, - 'to': log_file_size, - 'has_more': has_more, - } - - -class LogPackageHandler(object): - """Log package handler - """ - @content_json - def PUT(self): - """:returns: JSONized Task object. - :http: * 200 (task successfully executed) - * 400 (failed to execute task) - """ - try: - task_manager = DumpTaskManager() - task = task_manager.execute() - except Exception as exc: - logger.warn(u'DumpTask: error while execution ' - 'dump environment task: {0}'.format(str(exc))) - raise web.badrequest(str(exc)) - return TaskHandler.render(task) - - -class LogSourceCollectionHandler(JSONHandler): - """Log source collection handler - """ - - @content_json - def GET(self): - """:returns: Collection of log sources (from settings) - :http: * 200 (OK) - """ - return settings.LOGS - - -class LogSourceByNodeCollectionHandler(JSONHandler): - """Log source by node collection handler - """ - - @content_json - def GET(self, node_id): - """:returns: Collection of log sources by node (from settings) - :http: * 200 (OK) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - - def getpath(x): - if x.get('fake'): - if settings.FAKE_TASKS: - return x['path'] - else: - return '' - else: - if node.status == "discover": - ndir = node.ip - else: - ndir = node.fqdn - return os.path.join(x['base'], ndir, x['path']) - - f = lambda x: ( - x.get('remote') and x.get('path') and x.get('base') and - os.access(getpath(x), os.R_OK) and os.path.isfile(getpath(x)) - ) - sources = filter(f, settings.LOGS) - return sources diff --git a/nailgun/nailgun/api/handlers/network_configuration.py b/nailgun/nailgun/api/handlers/network_configuration.py deleted file mode 100644 index 399c23258..000000000 --- a/nailgun/nailgun/api/handlers/network_configuration.py +++ /dev/null @@ -1,128 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with network configurations -""" - -import json -import traceback -import web - -from nailgun.api.handlers.base import build_json_response -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.handlers.tasks import TaskHandler -from nailgun.api.models import Cluster -from nailgun.api.models import NetworkConfiguration -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Task -from nailgun.api.serializers.network_configuration \ - import NetworkConfigurationSerializer -from nailgun.api.validators.network import NetworkConfigurationValidator -from nailgun.db import db -from nailgun.logger import logger -from nailgun.task.helpers import TaskHelper -from nailgun.task.manager import CheckNetworksTaskManager -from nailgun.task.manager import VerifyNetworksTaskManager - - -class NetworkConfigurationVerifyHandler(JSONHandler): - """Network configuration verify handler - """ - - validator = NetworkConfigurationValidator - - @content_json - def PUT(self, cluster_id): - """:IMPORTANT: this method should be rewritten to be more RESTful - - :returns: JSONized Task object. - :http: * 202 (network checking task failed) - * 200 (network verification task started) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - - try: - data = self.validator.validate_networks_update(web.data()) - except web.webapi.badrequest as exc: - task = Task(name='check_networks', cluster=cluster) - db().add(task) - db().commit() - TaskHelper.set_error(task.uuid, exc.data) - logger.error(traceback.format_exc()) - - json_task = build_json_response(TaskHandler.render(task)) - raise web.accepted(data=json_task) - - vlan_ids = [{ - 'name': n['name'], - 'vlans': NetworkGroup.generate_vlan_ids_list(n) - } for n in data['networks']] - - task_manager = VerifyNetworksTaskManager(cluster_id=cluster.id) - task = task_manager.execute(data, vlan_ids) - - return TaskHandler.render(task) - - -class NetworkConfigurationHandler(JSONHandler): - """Network configuration handler - """ - - validator = NetworkConfigurationValidator - serializer = NetworkConfigurationSerializer - - @content_json - def GET(self, cluster_id): - """:returns: JSONized network configuration for cluster. - :http: * 200 (OK) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - return self.serializer.serialize_for_cluster(cluster) - - def PUT(self, cluster_id): - """:returns: JSONized Task object. - :http: * 202 (network checking task created) - * 404 (cluster not found in db) - """ - data = json.loads(web.data()) - cluster = self.get_object_or_404(Cluster, cluster_id) - - task_manager = CheckNetworksTaskManager(cluster_id=cluster.id) - task = task_manager.execute(data) - - if task.status != 'error': - try: - if 'networks' in data: - self.validator.validate_networks_update(json.dumps(data)) - - NetworkConfiguration.update(cluster, data) - except web.webapi.badrequest as exc: - TaskHelper.set_error(task.uuid, exc.data) - logger.error(traceback.format_exc()) - except Exception as exc: - TaskHelper.set_error(task.uuid, exc) - logger.error(traceback.format_exc()) - - data = build_json_response(TaskHandler.render(task)) - if task.status == 'error': - db().rollback() - else: - db().commit() - raise web.accepted(data=data) diff --git a/nailgun/nailgun/api/handlers/node.py b/nailgun/nailgun/api/handlers/node.py deleted file mode 100644 index b82849a00..000000000 --- a/nailgun/nailgun/api/handlers/node.py +++ /dev/null @@ -1,567 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with nodes -""" - -from datetime import datetime -import json -import traceback - -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.models import Cluster -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.api.models import NodeAttributes -from nailgun.api.models import NodeNICInterface -from nailgun.api.validators.network import NetAssignmentValidator -from nailgun.api.validators.node import NodeValidator -from nailgun.db import db -from nailgun.logger import logger -from nailgun.network.manager import NetworkManager -from nailgun.network.topology import TopoChecker -from nailgun import notifier - - -class NodeHandler(JSONHandler): - fields = ('id', 'name', 'meta', 'progress', 'roles', 'pending_roles', - 'status', 'mac', 'fqdn', 'ip', 'manufacturer', 'platform_name', - 'pending_addition', 'pending_deletion', 'os_platform', - 'error_type', 'online', 'cluster') - model = Node - validator = NodeValidator - - @classmethod - def render(cls, instance, fields=None): - json_data = None - try: - json_data = JSONHandler.render(instance, fields=cls.fields) - network_manager = NetworkManager() - json_data['network_data'] = network_manager.get_node_networks( - instance.id) - except Exception: - logger.error(traceback.format_exc()) - return json_data - - @content_json - def GET(self, node_id): - """:returns: JSONized Node object. - :http: * 200 (OK) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - return self.render(node) - - @content_json - def PUT(self, node_id): - """:returns: JSONized Node object. - :http: * 200 (OK) - * 400 (invalid node data specified) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - if not node.attributes: - node.attributes = NodeAttributes(node_id=node.id) - - data = self.checked_data(self.validator.validate_update) - - network_manager = NetworkManager() - - if "cluster_id" in data: - if data["cluster_id"] is None and node.cluster: - node.cluster.clear_pending_changes(node_id=node.id) - node.roles = node.pending_roles = [] - old_cluster_id = node.cluster_id - node.cluster_id = data["cluster_id"] - if node.cluster_id != old_cluster_id: - if old_cluster_id: - network_manager.clear_assigned_networks(node.id) - network_manager.clear_all_allowed_networks(node.id) - if node.cluster_id: - network_manager.allow_network_assignment_to_all_interfaces( - node.id - ) - network_manager.assign_networks_to_main_interface(node.id) - for key, value in data.iteritems(): - # we don't allow to update id explicitly - # and updated cluster_id before all other fields - if key in ("id", "cluster_id"): - continue - setattr(node, key, value) - if not node.status in ('provisioning', 'deploying') \ - and "roles" in data or "cluster_id" in data: - try: - node.attributes.volumes = \ - node.volume_manager.gen_volumes_info() - except Exception as exc: - msg = ( - u"Failed to generate volumes " - "info for node '{0}': '{1}'" - ).format( - node.name or data.get("mac") or data.get("id"), - str(exc) or "see logs for details" - ) - logger.warning(traceback.format_exc()) - notifier.notify("error", msg, node_id=node.id) - db().commit() - return self.render(node) - - def DELETE(self, node_id): - """:returns: Empty string - :http: * 204 (node successfully deleted) - * 404 (cluster not found in db) - """ - node = self.get_object_or_404(Node, node_id) - db().delete(node) - db().commit() - raise web.webapi.HTTPError( - status="204 No Content", - data="" - ) - - -class NodeCollectionHandler(JSONHandler): - """Node collection handler - """ - - validator = NodeValidator - - @content_json - def GET(self): - """May receive cluster_id parameter to filter list - of nodes - - :returns: Collection of JSONized Node objects. - :http: * 200 (OK) - """ - user_data = web.input(cluster_id=None) - if user_data.cluster_id == '': - nodes = db().query(Node).filter_by( - cluster_id=None).all() - elif user_data.cluster_id: - nodes = db().query(Node).filter_by( - cluster_id=user_data.cluster_id).all() - else: - nodes = db().query(Node).all() - return map(NodeHandler.render, nodes) - - @content_json - def POST(self): - """:returns: JSONized Node object. - :http: * 201 (cluster successfully created) - * 400 (invalid node data specified) - * 403 (node has incorrect status) - * 409 (node with such parameters already exists) - """ - data = self.checked_data() - - if data.get("status", "") != "discover": - error = web.forbidden() - error.data = "Only bootstrap nodes are allowed to be registered." - msg = u"Node with mac '{0}' was not created, " \ - u"because request status is '{1}'."\ - .format(data[u'mac'], data[u'status']) - logger.warning(msg) - raise error - - node = Node() - if "cluster_id" in data: - # FIXME(vk): this part is needed only for tests. Normally, - # nodes are created only by agent and POST requests don't contain - # cluster_id, but our integration and unit tests widely use it. - # We need to assign cluster first - cluster_id = data.pop("cluster_id") - if cluster_id: - node.cluster = db.query(Cluster).get(cluster_id) - for key, value in data.iteritems(): - if key == "id": - continue - elif key == "meta": - node.create_meta(value) - else: - setattr(node, key, value) - - node.name = "Untitled (%s)" % data['mac'][-5:] - node.timestamp = datetime.now() - db().add(node) - db().commit() - node.attributes = NodeAttributes() - - try: - node.attributes.volumes = node.volume_manager.gen_volumes_info() - if node.cluster: - node.cluster.add_pending_changes( - "disks", - node_id=node.id - ) - except Exception as exc: - msg = ( - u"Failed to generate volumes " - "info for node '{0}': '{1}'" - ).format( - node.name or data.get("mac") or data.get("id"), - str(exc) or "see logs for details" - ) - logger.warning(traceback.format_exc()) - notifier.notify("error", msg, node_id=node.id) - db().add(node) - db().commit() - - network_manager = NetworkManager() - # Add interfaces for node from 'meta'. - if node.meta and node.meta.get('interfaces'): - network_manager.update_interfaces_info(node.id) - - if node.cluster_id: - network_manager.allow_network_assignment_to_all_interfaces(node.id) - network_manager.assign_networks_to_main_interface(node.id) - - try: - # we use multiplier of 1024 because there are no problems here - # with unfair size calculation - ram = str(round(float( - node.meta['memory']['total']) / 1073741824, 1)) + " GB RAM" - except Exception as exc: - logger.warning(traceback.format_exc()) - ram = "unknown RAM" - - try: - # we use multiplier of 1000 because disk vendors specify HDD size - # in terms of decimal capacity. Sources: - # http://knowledge.seagate.com/articles/en_US/FAQ/172191en - # http://physics.nist.gov/cuu/Units/binary.html - hd_size = round(float( - sum([d["size"] for d in node.meta["disks"]]) / 1000000000), 1) - # if HDD > 100 GB we show it's size in TB - if hd_size > 100: - hd_size = str(hd_size / 1000) + " TB HDD" - else: - hd_size = str(hd_size) + " GB HDD" - except Exception as exc: - logger.warning(traceback.format_exc()) - hd_size = "unknown HDD" - - cores = str(node.meta.get('cpu', {}).get('total', "unknown")) - notifier.notify( - "discover", - "New node is discovered: %s CPUs / %s / %s " % - (cores, ram, hd_size), - node_id=node.id - ) - raise web.webapi.created(json.dumps( - NodeHandler.render(node), - indent=4 - )) - - @content_json - def PUT(self): - """:returns: Collection of JSONized Node objects. - :http: * 200 (nodes are successfully updated) - * 400 (invalid nodes data specified) - """ - data = self.checked_data( - self.validator.validate_collection_update - ) - - network_manager = NetworkManager() - q = db().query(Node) - nodes_updated = [] - for nd in data: - is_agent = nd.pop("is_agent") if "is_agent" in nd else False - node = None - if "mac" in nd: - node = q.filter_by(mac=nd["mac"]).first() \ - or self.validator.validate_existent_node_mac_update(nd) - else: - node = q.get(nd["id"]) - if is_agent: - node.timestamp = datetime.now() - if not node.online: - node.online = True - msg = u"Node '{0}' is back online".format( - node.human_readable_name) - logger.info(msg) - notifier.notify("discover", msg, node_id=node.id) - db().commit() - old_cluster_id = node.cluster_id - if "cluster_id" in nd: - if nd["cluster_id"] is None and node.cluster: - node.cluster.clear_pending_changes(node_id=node.id) - node.roles = node.pending_roles = [] - node.cluster_id = nd["cluster_id"] - for key, value in nd.iteritems(): - if is_agent and (key, value) == ("status", "discover") \ - and node.status == "provisioning": - # We don't update provisioning back to discover - logger.debug( - "Node is already provisioning - " - "status not updated by agent" - ) - continue - if key == "meta": - node.update_meta(value) - else: - setattr(node, key, value) - db().commit() - if not node.attributes: - node.attributes = NodeAttributes() - db().commit() - if not node.attributes.volumes: - node.attributes.volumes = \ - node.volume_manager.gen_volumes_info() - db().commit() - if not node.status in ('provisioning', 'deploying'): - variants = ( - "disks" in node.meta and - len(node.meta["disks"]) != len( - filter( - lambda d: d["type"] == "disk", - node.attributes.volumes - ) - ), - "roles" in nd, - "cluster_id" in nd - ) - if any(variants): - try: - node.attributes.volumes = \ - node.volume_manager.gen_volumes_info() - if node.cluster: - node.cluster.add_pending_changes( - "disks", - node_id=node.id - ) - except Exception as exc: - msg = ( - "Failed to generate volumes " - "info for node '{0}': '{1}'" - ).format( - node.name or data.get("mac") or data.get("id"), - str(exc) or "see logs for details" - ) - logger.warning(traceback.format_exc()) - notifier.notify("error", msg, node_id=node.id) - - db().commit() - if is_agent: - # Update node's NICs. - if node.meta and 'interfaces' in node.meta: - # we won't update interfaces if data is invalid - network_manager.update_interfaces_info(node.id) - - nodes_updated.append(node) - db().commit() - if 'cluster_id' in nd and nd['cluster_id'] != old_cluster_id: - if old_cluster_id: - network_manager.clear_assigned_networks(node.id) - network_manager.clear_all_allowed_networks(node.id) - if nd['cluster_id']: - network_manager.allow_network_assignment_to_all_interfaces( - node.id - ) - network_manager.assign_networks_to_main_interface(node.id) - return map(NodeHandler.render, nodes_updated) - - -class NodeNICsHandler(JSONHandler): - """Node network interfaces handler - """ - - fields = ( - 'id', ( - 'interfaces', - 'id', - 'mac', - 'name', - 'current_speed', - 'max_speed', - ('assigned_networks', 'id', 'name'), - ('allowed_networks', 'id', 'name') - ) - ) - - model = NodeNICInterface - validator = NetAssignmentValidator - - @content_json - def GET(self, node_id): - """:returns: Collection of JSONized Node interfaces. - :http: * 200 (OK) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - return self.render(node)['interfaces'] - - -class NodeCollectionNICsHandler(JSONHandler): - """Node collection network interfaces handler - """ - - model = NetworkGroup - validator = NetAssignmentValidator - fields = NodeNICsHandler.fields - - @content_json - def PUT(self): - """:returns: Collection of JSONized Node objects. - :http: * 200 (nodes are successfully updated) - * 400 (invalid nodes data specified) - """ - data = self.validator.validate_collection_structure(web.data()) - network_manager = NetworkManager() - updated_nodes_ids = [] - for node_data in data: - self.validator.verify_data_correctness(node_data) - node_id = network_manager._update_attrs(node_data) - updated_nodes_ids.append(node_id) - updated_nodes = db().query(Node).filter( - Node.id.in_(updated_nodes_ids) - ).all() - return map(self.render, updated_nodes) - - -class NodeNICsDefaultHandler(JSONHandler): - """Node default network interfaces handler - """ - - @content_json - def GET(self, node_id): - """:returns: Collection of default JSONized interfaces for node. - :http: * 200 (OK) - * 404 (node not found in db) - """ - node = self.get_object_or_404(Node, node_id) - default_nets = self.get_default(node) - return default_nets - - def get_default(self, node): - nics = [] - network_manager = NetworkManager() - for nic in node.interfaces: - nic_dict = { - "id": nic.id, - "name": nic.name, - "mac": nic.mac, - "max_speed": nic.max_speed, - "current_speed": nic.current_speed - } - - assigned_ng_ids = network_manager.get_default_nic_networkgroups( - node.id, - nic.id - ) - for ng_id in assigned_ng_ids: - ng = db().query(NetworkGroup).get(ng_id) - nic_dict.setdefault("assigned_networks", []).append( - {"id": ng_id, "name": ng.name} - ) - - allowed_ng_ids = network_manager.get_allowed_nic_networkgroups( - node.id, - nic.id - ) - for ng_id in allowed_ng_ids: - ng = db().query(NetworkGroup).get(ng_id) - nic_dict.setdefault("allowed_networks", []).append( - {"id": ng_id, "name": ng.name} - ) - - nics.append(nic_dict) - return nics - - -class NodeCollectionNICsDefaultHandler(NodeNICsDefaultHandler): - """Node collection default network interfaces handler - """ - - validator = NetAssignmentValidator - - @content_json - def GET(self): - """May receive cluster_id parameter to filter list - of nodes - - :returns: Collection of JSONized Nodes interfaces. - :http: * 200 (OK) - * 404 (node not found in db) - """ - user_data = web.input(cluster_id=None) - if user_data.cluster_id == '': - nodes = self.get_object_or_404(Node, cluster_id=None) - elif user_data.cluster_id: - nodes = self.get_object_or_404( - Node, - cluster_id=user_data.cluster_id - ) - else: - nodes = self.get_object_or_404(Node) - def_net_nodes = [] - for node in nodes: - rendered_node = self.get_default(self.render(node)) - def_net_nodes.append(rendered_node) - return map(self.render, nodes) - - -class NodeNICsVerifyHandler(JSONHandler): - """Node NICs verify handler - Class is proof of concept. Not ready for use. - """ - - fields = ( - 'id', ( - 'interfaces', - 'id', - 'mac', - 'name', - ('assigned_networks', 'id', 'name'), - ('allowed_networks', 'id', 'name') - ) - ) - - validator = NetAssignmentValidator - - @content_json - def POST(self): - """:returns: Collection of JSONized Nodes interfaces. - :http: * 200 (OK) - """ - data = self.validator.validate_structure(web.data()) - for node in data: - self.validator.verify_data_correctness(node) - if TopoChecker.is_assignment_allowed(data): - return map(self.render, data) - topo, fields_with_conflicts = TopoChecker.resolve_topo_conflicts(data) - return map(self.render, topo, fields=fields_with_conflicts) - - -class NodesAllocationStatsHandler(object): - """Node allocation stats handler - """ - - @content_json - def GET(self): - """:returns: Total and unallocated nodes count. - :http: * 200 (OK) - """ - unallocated_nodes = db().query(Node).filter_by(cluster_id=None).count() - total_nodes = \ - db().query(Node).count() - return {'total': total_nodes, - 'unallocated': unallocated_nodes} diff --git a/nailgun/nailgun/api/handlers/notifications.py b/nailgun/nailgun/api/handlers/notifications.py deleted file mode 100644 index cf9c60289..000000000 --- a/nailgun/nailgun/api/handlers/notifications.py +++ /dev/null @@ -1,124 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with notifications -""" - -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.models import Notification -from nailgun.api.validators.notification import NotificationValidator -from nailgun.db import db -from nailgun.settings import settings - - -class NotificationHandler(JSONHandler): - """Notification single handler - """ - - fields = ( - "id", - "cluster", - "topic", - "message", - "status", - "node_id", - "task_id" - ) - model = Notification - validator = NotificationValidator - - @classmethod - def render(cls, instance, fields=None): - json_data = JSONHandler.render(instance, fields=cls.fields) - json_data["time"] = ":".join([ - instance.datetime.strftime("%H"), - instance.datetime.strftime("%M"), - instance.datetime.strftime("%S") - ]) - json_data["date"] = "-".join([ - instance.datetime.strftime("%d"), - instance.datetime.strftime("%m"), - instance.datetime.strftime("%Y") - ]) - return json_data - - @content_json - def GET(self, notification_id): - """:returns: JSONized Notification object. - :http: * 200 (OK) - * 404 (notification not found in db) - """ - notification = self.get_object_or_404(Notification, notification_id) - return self.render(notification) - - @content_json - def PUT(self, notification_id): - """:returns: JSONized Notification object. - :http: * 200 (OK) - * 400 (invalid notification data specified) - * 404 (notification not found in db) - """ - notification = self.get_object_or_404(Notification, notification_id) - data = self.validator.validate_update(web.data()) - for key, value in data.iteritems(): - setattr(notification, key, value) - db().add(notification) - db().commit() - return self.render(notification) - - -class NotificationCollectionHandler(JSONHandler): - - validator = NotificationValidator - - @content_json - def GET(self): - """:returns: Collection of JSONized Notification objects. - :http: * 200 (OK) - """ - user_data = web.input(limit=settings.MAX_ITEMS_PER_PAGE) - limit = user_data.limit - query = db().query(Notification).limit(limit) - notifications = query.all() - return map( - NotificationHandler.render, - notifications - ) - - @content_json - def PUT(self): - """:returns: Collection of JSONized Notification objects. - :http: * 200 (OK) - * 400 (invalid data specified for collection update) - """ - data = self.validator.validate_collection_update(web.data()) - q = db().query(Notification) - notifications_updated = [] - for nd in data: - notification = q.get(nd["id"]) - for key, value in nd.iteritems(): - setattr(notification, key, value) - notifications_updated.append(notification) - db().add(notification) - db().commit() - return map( - NotificationHandler.render, - notifications_updated - ) diff --git a/nailgun/nailgun/api/handlers/orchestrator.py b/nailgun/nailgun/api/handlers/orchestrator.py deleted file mode 100644 index 0e7003078..000000000 --- a/nailgun/nailgun/api/handlers/orchestrator.py +++ /dev/null @@ -1,126 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.models import Cluster -from nailgun.db import db -from nailgun.logger import logger -from nailgun.orchestrator import deployment_serializers -from nailgun.orchestrator import provisioning_serializers - - -class DefaultOrchestratorInfo(JSONHandler): - """Base class for default orchestrator data. - Need to redefine serializer variable - """ - - # Override this attribute - _serializer = None - - @content_json - def GET(self, cluster_id): - """:returns: JSONized default data which will be passed to orchestrator - :http: * 200 (OK) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - return self._serializer.serialize(cluster) - - -class OrchestratorInfo(JSONHandler): - """Base class for replaced data.""" - - def get_orchestrator_info(self, cluster): - """Method should return data - which will be passed to orchestrator - """ - raise NotImplementedError('Please Implement this method') - - def update_orchestrator_info(self, cluster, data): - """Method should override data which - will be passed to orchestrator - """ - raise NotImplementedError('Please Implement this method') - - @content_json - def GET(self, cluster_id): - """:returns: JSONized data which will be passed to orchestrator - :http: * 200 (OK) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - return self.get_orchestrator_info(cluster) - - @content_json - def PUT(self, cluster_id): - """:returns: JSONized data which will be passed to orchestrator - :http: * 200 (OK) - * 400 (wrong data specified) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - data = self.checked_data() - self.update_orchestrator_info(cluster, data) - logger.debug('OrchestratorInfo:' - ' facts for cluster_id {0} were uploaded' - .format(cluster_id)) - return data - - @content_json - def DELETE(self, cluster_id): - """:returns: {} - :http: * 202 (orchestrator data deletion process launched) - * 400 (failed to execute orchestrator data deletion process) - * 404 (cluster not found in db) - """ - cluster = self.get_object_or_404(Cluster, cluster_id) - self.update_orchestrator_info(cluster, {}) - raise web.accepted(data="{}") - - -class DefaultProvisioningInfo(DefaultOrchestratorInfo): - - _serializer = provisioning_serializers - - -class DefaultDeploymentInfo(DefaultOrchestratorInfo): - - _serializer = deployment_serializers - - -class ProvisioningInfo(OrchestratorInfo): - - def get_orchestrator_info(self, cluster): - return cluster.replaced_provisioning_info - - def update_orchestrator_info(self, cluster, data): - cluster.replaced_provisioning_info = data - db().commit() - return cluster.replaced_provisioning_info - - -class DeploymentInfo(OrchestratorInfo): - - def get_orchestrator_info(self, cluster): - return cluster.replaced_deployment_info - - def update_orchestrator_info(self, cluster, data): - cluster.replaced_deployment_info = data - db().commit() - return cluster.replaced_deployment_info diff --git a/nailgun/nailgun/api/handlers/plugin.py b/nailgun/nailgun/api/handlers/plugin.py deleted file mode 100644 index 8c9789479..000000000 --- a/nailgun/nailgun/api/handlers/plugin.py +++ /dev/null @@ -1,58 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with plugins -""" - - -import json -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.handlers.tasks import TaskHandler -from nailgun.plugin.manager import PluginManager - - -class PluginCollectionHandler(JSONHandler): - - @content_json - def GET(self): - pass - - @content_json - def POST(self): - plugin_manager = PluginManager() - task = plugin_manager.add_install_plugin_task( - json.loads(web.data())) - - return TaskHandler.render(task) - - -class PluginHandler(JSONHandler): - - @content_json - def GET(self, plugin_id): - pass - - @content_json - def DELETE(self, plugin_id): - pass - - @content_json - def PUT(self, plugin_id): - pass diff --git a/nailgun/nailgun/api/handlers/redhat.py b/nailgun/nailgun/api/handlers/redhat.py deleted file mode 100644 index 5c2ebdc73..000000000 --- a/nailgun/nailgun/api/handlers/redhat.py +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with exclusive Red Hat tasks -""" - -import traceback - -import web - -from nailgun.api.handlers.base import build_json_response -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.handlers.tasks import TaskHandler -from nailgun.api.models import RedHatAccount -from nailgun.api.models import Release -from nailgun.api.validators.redhat import RedHatAccountValidator -from nailgun.db import db -from nailgun.logger import logger -from nailgun.task.manager import RedHatSetupTaskManager - - -class RedHatAccountHandler(JSONHandler): - """Red Hat account handler - """ - - fields = ( - 'username', - 'password', - 'license_type', - 'satellite', - 'activation_key' - ) - model = RedHatAccount - - @content_json - def GET(self): - """:returns: JSONized RedHatAccount object. - :http: * 200 (OK) - * 404 (account not found in db) - """ - account = db().query(RedHatAccount).first() - if not account: - raise web.notfound() - return self.render(account) - - @content_json - def POST(self): - """:returns: JSONized RedHatAccount object. - :http: * 200 (OK) - * 400 (invalid account data specified) - * 404 (account not found in db) - """ - data = self.checked_data() - - license_type = data.get("license_type") - if license_type == 'rhsm': - data["satellite"] = "" - data["activation_key"] = "" - - release_id = data.pop('release_id') - release_db = db().query(Release).get(release_id) - if not release_db: - raise web.notfound( - "No release with ID={0} found".format(release_id) - ) - account = db().query(RedHatAccount).first() - if account: - db().query(RedHatAccount).update(data) - else: - account = RedHatAccount(**data) - db().add(account) - db().commit() - return self.render(account) - - -class RedHatSetupHandler(JSONHandler): - """Red Hat setup handler - """ - - validator = RedHatAccountValidator - - @content_json - def POST(self): - """Starts Red Hat setup and download process - - :returns: JSONized Task object. - :http: * 202 (setup task created and started) - * 400 (invalid account data specified) - * 404 (release not found in db) - """ - data = self.checked_data() - - license_type = data.get("license_type") - if license_type == 'rhsm': - data["satellite"] = "" - data["activation_key"] = "" - - release_data = {'release_id': data['release_id']} - release_id = data.pop('release_id') - release_db = db().query(Release).get(release_id) - if not release_db: - raise web.notfound( - "No release with ID={0} found".format(release_id) - ) - release_data['redhat'] = data - release_data['release_name'] = release_db.name - - account = db().query(RedHatAccount).first() - if account: - db().query(RedHatAccount).update(data) - else: - account = RedHatAccount(**data) - db().add(account) - db().commit() - - task_manager = RedHatSetupTaskManager(release_data) - try: - task = task_manager.execute() - except Exception as exc: - logger.error(u'RedHatAccountHandler: error while execution' - ' Red Hat validation task: {0}'.format(str(exc))) - logger.error(traceback.format_exc()) - raise web.badrequest(str(exc)) - - data = build_json_response(TaskHandler.render(task)) - raise web.accepted(data=data) diff --git a/nailgun/nailgun/api/handlers/registration.py b/nailgun/nailgun/api/handlers/registration.py deleted file mode 100644 index 856e22ffa..000000000 --- a/nailgun/nailgun/api/handlers/registration.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Product registration handlers -""" - -import base64 -import json - - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.settings import settings - - -class FuelKeyHandler(JSONHandler): - """ Fuel key handler""" - - @content_json - def GET(self): - """Returns Fuel Key data - :returns: base64 of FUEL commit SHA, release version and Fuel UUID. - :http: * 200 (OK) - """ - key_data = { - "sha": settings.COMMIT_SHA, - "release": settings.PRODUCT_VERSION, - "uuid": settings.FUEL_KEY - } - signature = base64.b64encode(json.dumps(key_data)) - key_data["signature"] = signature - return {"key": base64.b64encode(json.dumps(key_data))} diff --git a/nailgun/nailgun/api/handlers/release.py b/nailgun/nailgun/api/handlers/release.py deleted file mode 100644 index 7fe9310c8..000000000 --- a/nailgun/nailgun/api/handlers/release.py +++ /dev/null @@ -1,122 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Handlers dealing with releases -""" - -import json - -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.models import Release -from nailgun.api.validators.release import ReleaseValidator -from nailgun.db import db - - -class ReleaseHandler(JSONHandler): - """Release single handler - """ - - fields = ( - "id", - "name", - "version", - "description", - "operating_system", - "roles", - "roles_metadata", - "state" - ) - model = Release - validator = ReleaseValidator - - @content_json - def GET(self, release_id): - """:returns: JSONized Release object. - :http: * 200 (OK) - * 404 (release not found in db) - """ - release = self.get_object_or_404(Release, release_id) - return self.render(release) - - @content_json - def PUT(self, release_id): - """:returns: JSONized Release object. - :http: * 200 (OK) - * 400 (invalid release data specified) - * 404 (release not found in db) - * 409 (release with such parameters already exists) - """ - release = self.get_object_or_404(Release, release_id) - - data = self.checked_data() - - for key, value in data.iteritems(): - setattr(release, key, value) - db().commit() - return self.render(release) - - def DELETE(self, release_id): - """:returns: JSONized Release object. - :http: * 204 (release successfully deleted) - * 404 (release not found in db) - """ - release = self.get_object_or_404(Release, release_id) - db().delete(release) - db().commit() - raise web.webapi.HTTPError( - status="204 No Content", - data="" - ) - - -class ReleaseCollectionHandler(JSONHandler): - """Release collection handler - """ - - validator = ReleaseValidator - - @content_json - def GET(self): - """:returns: Collection of JSONized Release objects. - :http: * 200 (OK) - """ - return map( - ReleaseHandler.render, - db().query(Release).all() - ) - - @content_json - def POST(self): - """:returns: JSONized Release object. - :http: * 201 (cluster successfully created) - * 400 (invalid cluster data specified) - * 409 (release with such parameters already exists) - """ - data = self.checked_data() - - release = Release() - for key, value in data.iteritems(): - setattr(release, key, value) - db().add(release) - db().commit() - raise web.webapi.created(json.dumps( - ReleaseHandler.render(release), - indent=4 - )) diff --git a/nailgun/nailgun/api/handlers/tasks.py b/nailgun/nailgun/api/handlers/tasks.py deleted file mode 100644 index 5bc19595b..000000000 --- a/nailgun/nailgun/api/handlers/tasks.py +++ /dev/null @@ -1,98 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import web - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.api.models import Task -from nailgun.db import db - -""" -Handlers dealing with tasks -""" - - -class TaskHandler(JSONHandler): - """Task single handler - """ - - fields = ( - "id", - "cluster", - "uuid", - "name", - "result", - "message", - "status", - "progress" - ) - model = Task - - @content_json - def GET(self, task_id): - """:returns: JSONized Task object. - :http: * 200 (OK) - * 404 (task not found in db) - """ - task = self.get_object_or_404(Task, task_id) - return self.render(task) - - def DELETE(self, task_id): - """:returns: JSONized Cluster object. - :http: * 204 (task successfully deleted) - * 400 (can't delete running task manually) - * 404 (task not found in db) - """ - task = self.get_object_or_404(Task, task_id) - if task.status not in ("ready", "error"): - raise web.badrequest("You cannot delete running task manually") - for subtask in task.subtasks: - db().delete(subtask) - db().delete(task) - db().commit() - raise web.webapi.HTTPError( - status="204 No Content", - data="" - ) - - -class TaskCollectionHandler(JSONHandler): - """Task collection handler - """ - - @content_json - def GET(self): - """May receive cluster_id parameter to filter list - of tasks - - :returns: Collection of JSONized Task objects. - :http: * 200 (OK) - * 404 (task not found in db) - """ - user_data = web.input(cluster_id=None) - if user_data.cluster_id == '': - tasks = db().query(Task).filter_by( - cluster_id=None).all() - elif user_data.cluster_id: - tasks = db().query(Task).filter_by( - cluster_id=user_data.cluster_id).all() - else: - tasks = db().query(Task).all() - return map( - TaskHandler.render, - tasks - ) diff --git a/nailgun/nailgun/api/handlers/version.py b/nailgun/nailgun/api/handlers/version.py deleted file mode 100644 index 4e3e19115..000000000 --- a/nailgun/nailgun/api/handlers/version.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -""" -Product info handlers -""" - -from nailgun.api.handlers.base import content_json -from nailgun.api.handlers.base import JSONHandler -from nailgun.settings import settings - - -class VersionHandler(JSONHandler): - """Version info handler - """ - - @content_json - def GET(self): - """:returns: FUEL/FUELWeb commit SHA, release version. - :http: * 200 (OK) - """ - return { - "sha": str(settings.COMMIT_SHA), - "release": str(settings.PRODUCT_VERSION), - "fuel_sha": str(settings.FUEL_COMMIT_SHA) - } diff --git a/nailgun/nailgun/api/models.py b/nailgun/nailgun/api/models.py deleted file mode 100644 index 46d9d5fe2..000000000 --- a/nailgun/nailgun/api/models.py +++ /dev/null @@ -1,850 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from copy import deepcopy -from random import choice -import string -import uuid - -from sqlalchemy import Boolean -from sqlalchemy import Column -from sqlalchemy import Float -from sqlalchemy import Integer -from sqlalchemy import String -from sqlalchemy import Text -from sqlalchemy import Unicode -from sqlalchemy import UniqueConstraint -from sqlalchemy import ForeignKey, Enum, DateTime -from sqlalchemy.orm import relationship, backref -from sqlalchemy.ext.declarative import declarative_base -import web - -from nailgun.api.fields import JSON -from nailgun.db import db -from nailgun.logger import logger -from nailgun.settings import settings -from nailgun.volumes.manager import VolumeManager - - -Base = declarative_base() - - -class NodeRoles(Base): - __tablename__ = 'node_roles' - id = Column(Integer, primary_key=True) - role = Column(Integer, ForeignKey('roles.id', ondelete="CASCADE")) - node = Column(Integer, ForeignKey('nodes.id')) - - -class PendingNodeRoles(Base): - __tablename__ = 'pending_node_roles' - id = Column(Integer, primary_key=True) - role = Column(Integer, ForeignKey('roles.id', ondelete="CASCADE")) - node = Column(Integer, ForeignKey('nodes.id')) - - -class Role(Base): - __tablename__ = 'roles' - id = Column(Integer, primary_key=True) - release_id = Column(Integer, ForeignKey('releases.id', ondelete='CASCADE')) - name = Column(String(50), nullable=False) - - -class Release(Base): - __tablename__ = 'releases' - __table_args__ = ( - UniqueConstraint('name', 'version'), - ) - STATES = ( - 'not_available', - 'downloading', - 'error', - 'available' - ) - id = Column(Integer, primary_key=True) - name = Column(Unicode(100), nullable=False) - version = Column(String(30), nullable=False) - description = Column(Unicode) - operating_system = Column(String(50), nullable=False) - state = Column(Enum(*STATES, name='release_state'), - nullable=False, - default='not_available') - networks_metadata = Column(JSON, default=[]) - attributes_metadata = Column(JSON, default={}) - volumes_metadata = Column(JSON, default={}) - roles_metadata = Column(JSON, default={}) - role_list = relationship("Role", backref="release") - clusters = relationship("Cluster", backref="release") - - @property - def roles(self): - return [role.name for role in self.role_list] - - @roles.setter - def roles(self, roles): - for role in roles: - if role not in self.roles: - self.role_list.append(Role(name=role, release=self)) - db().commit() - - -class ClusterChanges(Base): - __tablename__ = 'cluster_changes' - POSSIBLE_CHANGES = ( - 'networks', - 'attributes', - 'disks' - ) - id = Column(Integer, primary_key=True) - cluster_id = Column(Integer, ForeignKey('clusters.id')) - node_id = Column(Integer, ForeignKey('nodes.id', ondelete='CASCADE')) - name = Column( - Enum(*POSSIBLE_CHANGES, name='possible_changes'), - nullable=False - ) - - -class Cluster(Base): - __tablename__ = 'clusters' - MODES = ('multinode', 'ha_full', 'ha_compact') - STATUSES = ('new', 'deployment', 'operational', 'error', 'remove') - NET_MANAGERS = ('FlatDHCPManager', 'VlanManager') - GROUPING = ('roles', 'hardware', 'both') - id = Column(Integer, primary_key=True) - mode = Column( - Enum(*MODES, name='cluster_mode'), - nullable=False, - default='multinode' - ) - status = Column( - Enum(*STATUSES, name='cluster_status'), - nullable=False, - default='new' - ) - net_manager = Column( - Enum(*NET_MANAGERS, name='cluster_net_manager'), - nullable=False, - default='FlatDHCPManager' - ) - grouping = Column( - Enum(*GROUPING, name='cluster_grouping'), - nullable=False, - default='roles' - ) - name = Column(Unicode(50), unique=True, nullable=False) - release_id = Column(Integer, ForeignKey('releases.id'), nullable=False) - nodes = relationship("Node", backref="cluster", cascade="delete") - tasks = relationship("Task", backref="cluster", cascade="delete") - attributes = relationship("Attributes", uselist=False, - backref="cluster", cascade="delete") - changes = relationship("ClusterChanges", backref="cluster", - cascade="delete") - # We must keep all notifications even if cluster is removed. - # It is because we want user to be able to see - # the notification history so that is why we don't use - # cascade="delete" in this relationship - # During cluster deletion sqlalchemy engine will set null - # into cluster foreign key column of notification entity - notifications = relationship("Notification", backref="cluster") - network_groups = relationship("NetworkGroup", backref="cluster", - cascade="delete") - replaced_deployment_info = Column(JSON, default={}) - replaced_provisioning_info = Column(JSON, default={}) - - @property - def is_ha_mode(self): - return self.mode in ('ha_full', 'ha_compact') - - @property - def full_name(self): - return '%s (id=%s, mode=%s)' % (self.name, self.id, self.mode) - - @classmethod - def validate(cls, data): - d = cls.validate_json(data) - if d.get("name"): - if db().query(Cluster).filter_by( - name=d["name"] - ).first(): - c = web.webapi.conflict - c.message = "Environment with this name already exists" - raise c() - if d.get("release"): - release = db().query(Release).get(d.get("release")) - if not release: - raise web.webapi.badrequest(message="Invalid release id") - return d - - def add_pending_changes(self, changes_type, node_id=None): - ex_chs = db().query(ClusterChanges).filter_by( - cluster=self, - name=changes_type - ) - if not node_id: - ex_chs = ex_chs.first() - else: - ex_chs = ex_chs.filter_by(node_id=node_id).first() - # do nothing if changes with the same name already pending - if ex_chs: - return - ch = ClusterChanges( - cluster_id=self.id, - name=changes_type - ) - if node_id: - ch.node_id = node_id - db().add(ch) - db().commit() - - def clear_pending_changes(self, node_id=None): - chs = db().query(ClusterChanges).filter_by( - cluster_id=self.id - ) - if node_id: - chs = chs.filter_by(node_id=node_id) - map(db().delete, chs.all()) - db().commit() - - def prepare_for_deployment(self): - from nailgun.network.manager import NetworkManager - from nailgun.task.helpers import TaskHelper - - nodes = set(TaskHelper.nodes_to_deploy(self) + - TaskHelper.nodes_in_provisioning(self)) - - TaskHelper.update_slave_nodes_fqdn(nodes) - - nodes_ids = sorted([n.id for n in nodes]) - netmanager = NetworkManager() - if nodes_ids: - netmanager.assign_ips(nodes_ids, 'management') - netmanager.assign_ips(nodes_ids, 'public') - netmanager.assign_ips(nodes_ids, 'storage') - - def prepare_for_provisioning(self): - from nailgun.network.manager import NetworkManager - from nailgun.task.helpers import TaskHelper - - netmanager = NetworkManager() - nodes = TaskHelper.nodes_to_provision(self) - TaskHelper.update_slave_nodes_fqdn(nodes) - for node in nodes: - netmanager.assign_admin_ips( - node.id, len(node.meta.get('interfaces', []))) - - -class Node(Base): - __tablename__ = 'nodes' - NODE_STATUSES = ( - 'ready', - 'discover', - 'provisioning', - 'provisioned', - 'deploying', - 'error' - ) - NODE_ERRORS = ( - 'deploy', - 'provision', - 'deletion' - ) - id = Column(Integer, primary_key=True) - cluster_id = Column(Integer, ForeignKey('clusters.id')) - name = Column(Unicode(100)) - status = Column( - Enum(*NODE_STATUSES, name='node_status'), - nullable=False, - default='discover' - ) - meta = Column(JSON, default={}) - mac = Column(String(17), nullable=False, unique=True) - ip = Column(String(15)) - fqdn = Column(String(255)) - manufacturer = Column(Unicode(50)) - platform_name = Column(String(150)) - progress = Column(Integer, default=0) - os_platform = Column(String(150)) - pending_addition = Column(Boolean, default=False) - pending_deletion = Column(Boolean, default=False) - changes = relationship("ClusterChanges", backref="node") - error_type = Column(Enum(*NODE_ERRORS, name='node_error_type')) - error_msg = Column(String(255)) - timestamp = Column(DateTime, nullable=False) - online = Column(Boolean, default=True) - role_list = relationship("Role", secondary=NodeRoles.__table__) - pending_role_list = relationship("Role", - secondary=PendingNodeRoles.__table__) - attributes = relationship("NodeAttributes", - backref=backref("node"), - uselist=False) - interfaces = relationship("NodeNICInterface", backref="node", - cascade="delete") - - @property - def offline(self): - return not self.online - - @property - def network_data(self): - # It is required for integration tests; to get info about nets - # which must be created on target node - from nailgun.network.manager import NetworkManager - netmanager = NetworkManager() - return netmanager.get_node_networks(self.id) - - @property - def volume_manager(self): - return VolumeManager(self) - - @property - def needs_reprovision(self): - return self.status == 'error' and self.error_type == 'provision' and \ - not self.pending_deletion - - @property - def needs_redeploy(self): - return (self.status == 'error' or len(self.pending_roles)) and \ - not self.pending_deletion - - @property - def needs_redeletion(self): - return self.status == 'error' and self.error_type == 'deletion' - - @property - def human_readable_name(self): - return self.name or self.mac - - @property - def full_name(self): - return u'%s (id=%s, mac=%s)' % (self.name, self.id, self.mac) - - @property - def roles(self): - return [role.name for role in self.role_list] - - @roles.setter - def roles(self, new_roles): - self.role_list = map(lambda role: Role(name=role), new_roles) - db().commit() - - @property - def pending_roles(self): - return [role.name for role in self.pending_role_list] - - @pending_roles.setter - def pending_roles(self, new_roles): - self.pending_role_list = map( - lambda role: Role(name=role), new_roles) - - db().commit() - - def _check_interface_has_required_params(self, iface): - return bool(iface.get('name') and iface.get('mac')) - - def _clean_iface(self, iface): - # cleaning up unnecessary fields - set to None if bad - for param in ["max_speed", "current_speed"]: - val = iface.get(param) - if not (isinstance(val, int) and val >= 0): - val = None - iface[param] = val - return iface - - def update_meta(self, data): - # helper for basic checking meta before updation - result = [] - for iface in data["interfaces"]: - if not self._check_interface_has_required_params(iface): - logger.warning( - "Invalid interface data: {0}. " - "Interfaces are not updated.".format(iface) - ) - data["interfaces"] = self.meta.get("interfaces") - self.meta = data - return - result.append(self._clean_iface(iface)) - - data["interfaces"] = result - self.meta = data - - def create_meta(self, data): - # helper for basic checking meta before creation - result = [] - for iface in data["interfaces"]: - if not self._check_interface_has_required_params(iface): - logger.warning( - "Invalid interface data: {0}. " - "Skipping interface.".format(iface) - ) - continue - result.append(self._clean_iface(iface)) - - data["interfaces"] = result - self.meta = data - - -class NodeAttributes(Base): - __tablename__ = 'node_attributes' - id = Column(Integer, primary_key=True) - node_id = Column(Integer, ForeignKey('nodes.id')) - volumes = Column(JSON, default=[]) - interfaces = Column(JSON, default={}) - - -class IPAddr(Base): - __tablename__ = 'ip_addrs' - id = Column(Integer, primary_key=True) - network = Column(Integer, ForeignKey('networks.id', ondelete="CASCADE")) - node = Column(Integer, ForeignKey('nodes.id', ondelete="CASCADE")) - ip_addr = Column(String(25), nullable=False) - - -class IPAddrRange(Base): - __tablename__ = 'ip_addr_ranges' - id = Column(Integer, primary_key=True) - network_group_id = Column(Integer, ForeignKey('network_groups.id')) - first = Column(String(25), nullable=False) - last = Column(String(25), nullable=False) - - -class Vlan(Base): - __tablename__ = 'vlan' - id = Column(Integer, primary_key=True) - network = relationship("Network", - backref=backref("vlan")) - - -class Network(Base): - __tablename__ = 'networks' - id = Column(Integer, primary_key=True) - # can be nullable only for fuelweb admin net - release = Column(Integer, ForeignKey('releases.id')) - name = Column(Unicode(100), nullable=False) - access = Column(String(20), nullable=False) - vlan_id = Column(Integer, ForeignKey('vlan.id')) - network_group_id = Column(Integer, ForeignKey('network_groups.id')) - cidr = Column(String(25), nullable=False) - gateway = Column(String(25)) - nodes = relationship( - "Node", - secondary=IPAddr.__table__, - backref="networks") - - -class NetworkGroup(Base): - __tablename__ = 'network_groups' - NAMES = ( - # Node networks - 'fuelweb_admin', - 'storage', - # internal in terms of fuel - 'management', - 'public', - - # VM networks - 'floating', - # private in terms of fuel - 'fixed' - ) - - id = Column(Integer, primary_key=True) - name = Column(Enum(*NAMES, name='network_group_name'), nullable=False) - access = Column(String(20), nullable=False) - # can be nullable only for fuelweb admin net - release = Column(Integer, ForeignKey('releases.id')) - # can be nullable only for fuelweb admin net - cluster_id = Column(Integer, ForeignKey('clusters.id')) - network_size = Column(Integer, default=256) - amount = Column(Integer, default=1) - vlan_start = Column(Integer, default=1) - networks = relationship("Network", cascade="delete", - backref="network_group") - cidr = Column(String(25)) - gateway = Column(String(25)) - - netmask = Column(String(25), nullable=False) - ip_ranges = relationship( - "IPAddrRange", - backref="network_group" - ) - - @classmethod - def generate_vlan_ids_list(cls, ng): - if ng["vlan_start"] is None: - return [] - vlans = [ - i for i in xrange( - int(ng["vlan_start"]), - int(ng["vlan_start"]) + int(ng["amount"]) - ) - ] - return vlans - - -class NetworkConfiguration(object): - @classmethod - def update(cls, cluster, network_configuration): - from nailgun.network.manager import NetworkManager - network_manager = NetworkManager() - if 'net_manager' in network_configuration: - setattr( - cluster, - 'net_manager', - network_configuration['net_manager']) - - if 'networks' in network_configuration: - for ng in network_configuration['networks']: - ng_db = db().query(NetworkGroup).get(ng['id']) - - for key, value in ng.iteritems(): - if key == "ip_ranges": - cls.__set_ip_ranges(ng['id'], value) - else: - if key == 'cidr' and \ - not ng['name'] in ('public', 'floating'): - network_manager.update_ranges_from_cidr( - ng_db, value) - - setattr(ng_db, key, value) - - network_manager.create_networks(ng_db) - ng_db.cluster.add_pending_changes('networks') - - @classmethod - def __set_ip_ranges(cls, network_group_id, ip_ranges): - # deleting old ip ranges - db().query(IPAddrRange).filter_by( - network_group_id=network_group_id).delete() - - for r in ip_ranges: - new_ip_range = IPAddrRange( - first=r[0], - last=r[1], - network_group_id=network_group_id) - db().add(new_ip_range) - db().commit() - - -class AttributesGenerators(object): - @classmethod - def password(cls, arg=None): - try: - length = int(arg) - except Exception: - length = 8 - chars = string.letters + string.digits - return u''.join([choice(chars) for _ in xrange(length)]) - - @classmethod - def ip(cls, arg=None): - if str(arg) in ("admin", "master"): - return settings.MASTER_IP - return "127.0.0.1" - - @classmethod - def identical(cls, arg=None): - return str(arg) - - -class Attributes(Base): - __tablename__ = 'attributes' - id = Column(Integer, primary_key=True) - cluster_id = Column(Integer, ForeignKey('clusters.id')) - editable = Column(JSON) - generated = Column(JSON) - - def generate_fields(self): - self.generated = self.traverse(self.generated) - db().add(self) - db().commit() - - @classmethod - def traverse(cls, cdict): - new_dict = {} - if cdict: - for i, val in cdict.iteritems(): - if isinstance(val, (str, unicode, int, float)): - new_dict[i] = val - elif isinstance(val, dict) and "generator" in val: - try: - generator = getattr( - AttributesGenerators, - val["generator"] - ) - except AttributeError: - logger.error("Attribute error: %s" % val["generator"]) - raise - else: - new_dict[i] = generator(val.get("generator_arg")) - else: - new_dict[i] = cls.traverse(val) - return new_dict - - def merged_attrs(self): - return self._dict_merge(self.generated, self.editable) - - def merged_attrs_values(self): - attrs = self.merged_attrs() - for group_attrs in attrs.itervalues(): - for attr, value in group_attrs.iteritems(): - if isinstance(value, dict) and 'value' in value: - group_attrs[attr] = value['value'] - if 'common' in attrs: - attrs.update(attrs.pop('common')) - return attrs - - def _dict_merge(self, a, b): - '''recursively merges dict's. not just simple a['key'] = b['key'], if - both a and bhave a key who's value is a dict then dict_merge is called - on both values and the result stored in the returned dictionary. - ''' - if not isinstance(b, dict): - return b - result = deepcopy(a) - for k, v in b.iteritems(): - if k in result and isinstance(result[k], dict): - result[k] = self._dict_merge(result[k], v) - else: - result[k] = deepcopy(v) - return result - - -class Task(Base): - __tablename__ = 'tasks' - TASK_STATUSES = ( - 'ready', - 'running', - 'error' - ) - TASK_NAMES = ( - 'super', - - # cluster - 'deploy', - 'deployment', - 'provision', - 'node_deletion', - 'cluster_deletion', - 'check_before_deployment', - - # network - 'check_networks', - 'verify_networks', - 'check_dhcp', - 'verify_network_connectivity', - - # plugin - 'install_plugin', - 'update_plugin', - 'delete_plugin', - - # red hat - 'redhat_setup', - 'redhat_check_credentials', - 'redhat_check_licenses', - 'redhat_download_release', - 'redhat_update_cobbler_profile', - - # dump - 'dump', - ) - id = Column(Integer, primary_key=True) - cluster_id = Column(Integer, ForeignKey('clusters.id')) - uuid = Column(String(36), nullable=False, - default=lambda: str(uuid.uuid4())) - name = Column( - Enum(*TASK_NAMES, name='task_name'), - nullable=False, - default='super' - ) - message = Column(Text) - status = Column( - Enum(*TASK_STATUSES, name='task_status'), - nullable=False, - default='running' - ) - progress = Column(Integer, default=0) - cache = Column(JSON, default={}) - result = Column(JSON, default={}) - parent_id = Column(Integer, ForeignKey('tasks.id')) - subtasks = relationship( - "Task", - backref=backref('parent', remote_side=[id]) - ) - notifications = relationship( - "Notification", - backref=backref('task', remote_side=[id]) - ) - # Task weight is used to calculate supertask progress - # sum([t.progress * t.weight for t in supertask.subtasks]) / - # sum([t.weight for t in supertask.subtasks]) - weight = Column(Float, default=1.0) - - def __repr__(self): - return "".format( - self.name, - self.uuid, - self.cluster_id, - self.status - ) - - def create_subtask(self, name): - if not name: - raise ValueError("Subtask name not specified") - - task = Task(name=name, cluster=self.cluster) - - self.subtasks.append(task) - db().commit() - return task - - -class Notification(Base): - __tablename__ = 'notifications' - - NOTIFICATION_STATUSES = ( - 'read', - 'unread', - ) - - NOTIFICATION_TOPICS = ( - 'discover', - 'done', - 'error', - 'warning', - ) - - id = Column(Integer, primary_key=True) - cluster_id = Column( - Integer, - ForeignKey('clusters.id', ondelete='SET NULL') - ) - node_id = Column(Integer, ForeignKey('nodes.id', ondelete='SET NULL')) - task_id = Column(Integer, ForeignKey('tasks.id', ondelete='SET NULL')) - topic = Column( - Enum(*NOTIFICATION_TOPICS, name='notif_topic'), - nullable=False - ) - message = Column(Text) - status = Column( - Enum(*NOTIFICATION_STATUSES, name='notif_status'), - nullable=False, - default='unread' - ) - datetime = Column(DateTime, nullable=False) - - -class L2Topology(Base): - __tablename__ = 'l2_topologies' - id = Column(Integer, primary_key=True) - network_id = Column( - Integer, - ForeignKey('network_groups.id', ondelete="CASCADE"), - nullable=False - ) - - -class L2Connection(Base): - __tablename__ = 'l2_connections' - id = Column(Integer, primary_key=True) - topology_id = Column( - Integer, - ForeignKey('l2_topologies.id', ondelete="CASCADE"), - nullable=False - ) - interface_id = Column( - Integer, - # If interface is removed we should somehow remove - # all L2Topologes which include this interface. - ForeignKey('node_nic_interfaces.id', ondelete="CASCADE"), - nullable=False - ) - - -class AllowedNetworks(Base): - __tablename__ = 'allowed_networks' - id = Column(Integer, primary_key=True) - network_id = Column( - Integer, - ForeignKey('network_groups.id', ondelete="CASCADE"), - nullable=False - ) - interface_id = Column( - Integer, - ForeignKey('node_nic_interfaces.id', ondelete="CASCADE"), - nullable=False - ) - - -class NetworkAssignment(Base): - __tablename__ = 'net_assignments' - id = Column(Integer, primary_key=True) - network_id = Column( - Integer, - ForeignKey('network_groups.id', ondelete="CASCADE"), - nullable=False - ) - interface_id = Column( - Integer, - ForeignKey('node_nic_interfaces.id', ondelete="CASCADE"), - nullable=False - ) - - -class NodeNICInterface(Base): - __tablename__ = 'node_nic_interfaces' - id = Column(Integer, primary_key=True) - node_id = Column( - Integer, - ForeignKey('nodes.id', ondelete="CASCADE"), - nullable=False - ) - name = Column(String(128), nullable=False) - mac = Column(String(32), nullable=False) - max_speed = Column(Integer) - current_speed = Column(Integer) - allowed_networks = relationship( - "NetworkGroup", - secondary=AllowedNetworks.__table__, - ) - assigned_networks = relationship( - "NetworkGroup", - secondary=NetworkAssignment.__table__, - ) - - -class Plugin(Base): - __tablename__ = 'plugins' - TYPES = ('nailgun', 'fuel') - - id = Column(Integer, primary_key=True) - type = Column(Enum(*TYPES, name='plugin_type'), nullable=False) - name = Column(String(128), nullable=False, unique=True) - state = Column(String(128), nullable=False, default='registered') - version = Column(String(128), nullable=False) - - -class RedHatAccount(Base): - __tablename__ = 'red_hat_accounts' - LICENSE_TYPES = ('rhsm', 'rhn') - - id = Column(Integer, primary_key=True) - username = Column(String(100), nullable=False) - password = Column(String(100), nullable=False) - license_type = Column(Enum(*LICENSE_TYPES, name='license_type'), - nullable=False) - satellite = Column(String(250)) - activation_key = Column(String(300)) diff --git a/nailgun/nailgun/api/serializers/__init__.py b/nailgun/nailgun/api/serializers/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/api/serializers/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/api/serializers/base.py b/nailgun/nailgun/api/serializers/base.py deleted file mode 100644 index 297850302..000000000 --- a/nailgun/nailgun/api/serializers/base.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -class BasicSerializer(object): - - handlers = {} - - @classmethod - def load_handlers(cls, handlers): - if not cls.handlers: - cls.handlers = handlers - return cls.handlers - - @classmethod - def serialize(cls, instance, fields=None): - data_dict = {} - use_fields = fields if fields else cls.fields - if not use_fields: - raise ValueError("No fields for serialize") - for field in use_fields: - if isinstance(field, (tuple,)): - if field[1] == '*': - subfields = None - else: - subfields = field[1:] - - value = getattr(instance, field[0]) - rel = getattr( - instance.__class__, field[0]).impl.__class__.__name__ - if value is None: - pass - elif rel == 'ScalarObjectAttributeImpl': - handler = cls.handlers[value.__class__.__name__] - data_dict[field[0]] = handler.render( - value, fields=subfields - ) - elif rel == 'CollectionAttributeImpl': - if not value: - data_dict[field[0]] = [] - else: - handler = cls.handlers[value[0].__class__.__name__] - data_dict[field[0]] = [ - handler.render(v, fields=subfields) for v in value - ] - else: - value = getattr(instance, field) - if value is None: - data_dict[field] = value - else: - f = getattr(instance.__class__, field) - if hasattr(f, "impl"): - rel = f.impl.__class__.__name__ - if rel == 'ScalarObjectAttributeImpl': - data_dict[field] = value.id - elif rel == 'CollectionAttributeImpl': - data_dict[field] = [v.id for v in value] - else: - data_dict[field] = value - else: - data_dict[field] = value - return data_dict diff --git a/nailgun/nailgun/api/serializers/network_configuration.py b/nailgun/nailgun/api/serializers/network_configuration.py deleted file mode 100644 index 8cf61acc1..000000000 --- a/nailgun/nailgun/api/serializers/network_configuration.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.serializers.base import BasicSerializer -from nailgun.network.manager import NetworkManager - - -class NetworkConfigurationSerializer(BasicSerializer): - - fields = ('id', 'cluster_id', 'name', 'cidr', 'netmask', - 'gateway', 'vlan_start', 'network_size', 'amount') - - @classmethod - def serialize_network_group(cls, instance, fields=None): - data_dict = BasicSerializer.serialize(instance, fields=cls.fields) - data_dict["ip_ranges"] = [ - [ir.first, ir.last] for ir in instance.ip_ranges - ] - data_dict.setdefault("netmask", "") - data_dict.setdefault("gateway", "") - return data_dict - - @classmethod - def serialize_for_cluster(cls, cluster): - result = {} - result['net_manager'] = cluster.net_manager - result['networks'] = map( - cls.serialize_network_group, - cluster.network_groups - ) - - if cluster.is_ha_mode: - net_manager = NetworkManager() - result['management_vip'] = net_manager.assign_vip( - cluster.id, 'management') - result['public_vip'] = net_manager.assign_vip( - cluster.id, 'public') - return result diff --git a/nailgun/nailgun/api/urls.py b/nailgun/nailgun/api/urls.py deleted file mode 100644 index d7b539d4c..000000000 --- a/nailgun/nailgun/api/urls.py +++ /dev/null @@ -1,162 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import web - -from nailgun.api.handlers.cluster import ClusterAttributesDefaultsHandler -from nailgun.api.handlers.cluster import ClusterAttributesHandler -from nailgun.api.handlers.cluster import ClusterChangesHandler -from nailgun.api.handlers.cluster import ClusterCollectionHandler -from nailgun.api.handlers.cluster import ClusterGeneratedData -from nailgun.api.handlers.cluster import ClusterHandler -from nailgun.api.handlers.disks import NodeDefaultsDisksHandler -from nailgun.api.handlers.disks import NodeDisksHandler -from nailgun.api.handlers.disks import NodeVolumesInformationHandler - -from nailgun.api.handlers.logs import LogEntryCollectionHandler -from nailgun.api.handlers.logs import LogPackageHandler -from nailgun.api.handlers.logs import LogSourceByNodeCollectionHandler -from nailgun.api.handlers.logs import LogSourceCollectionHandler - -from nailgun.api.handlers.network_configuration \ - import NetworkConfigurationHandler -from nailgun.api.handlers.network_configuration \ - import NetworkConfigurationVerifyHandler - -from nailgun.api.handlers.node import NodeCollectionHandler -from nailgun.api.handlers.node import NodeHandler -from nailgun.api.handlers.node import NodesAllocationStatsHandler - -from nailgun.api.handlers.node import NodeCollectionNICsDefaultHandler -from nailgun.api.handlers.node import NodeCollectionNICsHandler -from nailgun.api.handlers.node import NodeNICsDefaultHandler -from nailgun.api.handlers.node import NodeNICsHandler -from nailgun.api.handlers.node import NodeNICsVerifyHandler - -from nailgun.api.handlers.notifications import NotificationCollectionHandler -from nailgun.api.handlers.notifications import NotificationHandler - -from nailgun.api.handlers.orchestrator import DefaultDeploymentInfo -from nailgun.api.handlers.orchestrator import DefaultProvisioningInfo -from nailgun.api.handlers.orchestrator import DeploymentInfo -from nailgun.api.handlers.orchestrator import ProvisioningInfo - -from nailgun.api.handlers.plugin import PluginCollectionHandler -from nailgun.api.handlers.plugin import PluginHandler - -from nailgun.api.handlers.redhat import RedHatAccountHandler -from nailgun.api.handlers.redhat import RedHatSetupHandler -from nailgun.api.handlers.registration import FuelKeyHandler -from nailgun.api.handlers.release import ReleaseCollectionHandler -from nailgun.api.handlers.release import ReleaseHandler - -from nailgun.api.handlers.tasks import TaskCollectionHandler -from nailgun.api.handlers.tasks import TaskHandler - -from nailgun.api.handlers.version import VersionHandler - - -urls = ( - r'/releases/?$', - ReleaseCollectionHandler, - r'/releases/(?P\d+)/?$', - ReleaseHandler, - - r'/clusters/?$', - ClusterCollectionHandler, - r'/clusters/(?P\d+)/?$', - ClusterHandler, - r'/clusters/(?P\d+)/changes/?$', - ClusterChangesHandler, - r'/clusters/(?P\d+)/attributes/?$', - ClusterAttributesHandler, - r'/clusters/(?P\d+)/attributes/defaults/?$', - ClusterAttributesDefaultsHandler, - r'/clusters/(?P\d+)/network_configuration/?$', - NetworkConfigurationHandler, - r'/clusters/(?P\d+)/network_configuration/verify/?$', - NetworkConfigurationVerifyHandler, - - r'/clusters/(?P\d+)/orchestrator/deployment/?$', - DeploymentInfo, - r'/clusters/(?P\d+)/orchestrator/deployment/defaults/?$', - DefaultDeploymentInfo, - r'/clusters/(?P\d+)/orchestrator/provisioning/?$', - ProvisioningInfo, - r'/clusters/(?P\d+)/orchestrator/provisioning/defaults/?$', - DefaultProvisioningInfo, - r'/clusters/(?P\d+)/generated/?$', - ClusterGeneratedData, - - r'/nodes/?$', - NodeCollectionHandler, - r'/nodes/(?P\d+)/?$', - NodeHandler, - r'/nodes/(?P\d+)/disks/?$', - NodeDisksHandler, - r'/nodes/(?P\d+)/disks/defaults/?$', - NodeDefaultsDisksHandler, - r'/nodes/(?P\d+)/volumes/?$', - NodeVolumesInformationHandler, - r'/nodes/interfaces/?$', - NodeCollectionNICsHandler, - r'/nodes/interfaces/default_assignment?$', - NodeCollectionNICsDefaultHandler, - r'/nodes/(?P\d+)/interfaces/?$', - NodeNICsHandler, - r'/nodes/(?P\d+)/interfaces/default_assignment?$', - NodeNICsDefaultHandler, - r'/nodes/interfaces_verify/?$', - NodeNICsVerifyHandler, - r'/nodes/allocation/stats/?$', - NodesAllocationStatsHandler, - r'/tasks/?$', - TaskCollectionHandler, - r'/tasks/(?P\d+)/?$', - TaskHandler, - - r'/notifications/?$', - NotificationCollectionHandler, - r'/notifications/(?P\d+)/?$', - NotificationHandler, - - r'/logs/?$', - LogEntryCollectionHandler, - r'/logs/package/?$', - LogPackageHandler, - r'/logs/sources/?$', - LogSourceCollectionHandler, - r'/logs/sources/nodes/(?P\d+)/?$', - LogSourceByNodeCollectionHandler, - - r'/registration/key/?$', - FuelKeyHandler, - - r'/version/?$', - VersionHandler, - - r'/plugins/?$', - PluginCollectionHandler, - r'/plugins/(?P\d+)/?$', - PluginHandler, - r'/redhat/account/?$', - RedHatAccountHandler, - r'/redhat/setup/?$', - RedHatSetupHandler, -) - -urls = [i if isinstance(i, str) else i.__name__ for i in urls] -app = web.application(urls, locals()) diff --git a/nailgun/nailgun/api/validators/__init__.py b/nailgun/nailgun/api/validators/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/api/validators/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/api/validators/base.py b/nailgun/nailgun/api/validators/base.py deleted file mode 100644 index 1f16635e6..000000000 --- a/nailgun/nailgun/api/validators/base.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -from jsonschema import validate - -from nailgun.errors import errors - - -class BasicValidator(object): - - @classmethod - def validate_json(cls, data): - if data: - try: - res = json.loads(data) - except Exception: - raise errors.InvalidData( - "Invalid json received", - log_message=True - ) - else: - raise errors.InvalidData( - "Empty request received", - log_message=True - ) - return res - - @classmethod - def validate(cls, data): - return cls.validate_json(data) - - @classmethod - def validate_schema(cls, data, schema): - try: - validate(data, schema) - except Exception as exc: - raise errors.InvalidData(exc.message) diff --git a/nailgun/nailgun/api/validators/cluster.py b/nailgun/nailgun/api/validators/cluster.py deleted file mode 100644 index d9a417e91..000000000 --- a/nailgun/nailgun/api/validators/cluster.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.models import Cluster -from nailgun.api.models import Release -from nailgun.api.validators.base import BasicValidator -from nailgun.db import db -from nailgun.errors import errors - - -class ClusterValidator(BasicValidator): - @classmethod - def validate(cls, data): - d = cls.validate_json(data) - if d.get("name"): - if db().query(Cluster).filter_by( - name=d["name"] - ).first(): - raise errors.AlreadyExists( - "Environment with this name already exists", - log_message=True - ) - if d.get("release"): - release = db().query(Release).get(d.get("release")) - if not release: - raise errors.InvalidData( - "Invalid release id", - log_message=True - ) - return d - - -class AttributesValidator(BasicValidator): - @classmethod - def validate(cls, data): - d = cls.validate_json(data) - if "generated" in d: - raise errors.InvalidData( - "It is not allowed to update generated attributes", - log_message=True - ) - if "editable" in d and not isinstance(d["editable"], dict): - raise errors.InvalidData( - "Editable attributes should be a dictionary", - log_message=True - ) - return d - - @classmethod - def validate_fixture(cls, data): - """Here we just want to be sure that data is logically valid. - We try to generate "generated" parameters. If there will not - be any error during generating then we assume data is - logically valid. - """ - d = cls.validate_json(data) - if "generated" in d: - cls.traverse(d["generated"]) diff --git a/nailgun/nailgun/api/validators/json_schema/__init__.py b/nailgun/nailgun/api/validators/json_schema/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/api/validators/json_schema/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/api/validators/json_schema/disks.py b/nailgun/nailgun/api/validators/json_schema/disks.py deleted file mode 100644 index deb010861..000000000 --- a/nailgun/nailgun/api/validators/json_schema/disks.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -disks_simple_format_schema = { - '$schema': 'http://json-schema.org/draft-04/schema#', - 'title': 'Disks', - 'description': 'Array of disks in simple format', - 'type': 'array', - 'items': { - 'type': 'object', - 'required': ['id', 'size', 'volumes'], - 'properties': { - 'id': { - 'description': 'The unique identifier for a disk', - 'type': 'string' - }, - 'size': { - 'description': 'Disk size in megabytes', - 'type': 'integer' - }, - 'volumes': { - 'description': 'Volumes for disk', - 'type': 'array', - 'items': { - 'type': 'object', - 'required': ['size', 'name'], - 'properties': { - 'name': { - 'description': 'Volume name', - 'type': 'string' - }, - 'size': { - 'description': 'Volume size', - 'type': 'integer' - } - } - } - } - } - } -} diff --git a/nailgun/nailgun/api/validators/network.py b/nailgun/nailgun/api/validators/network.py deleted file mode 100644 index 06a80a330..000000000 --- a/nailgun/nailgun/api/validators/network.py +++ /dev/null @@ -1,204 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from netaddr import AddrFormatError -from netaddr import IPNetwork - -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.api.validators.base import BasicValidator -from nailgun.db import db -from nailgun.errors import errors - - -class NetworkConfigurationValidator(BasicValidator): - @classmethod - def validate_networks_update(cls, data): - d = cls.validate_json(data) - networks = d['networks'] - - if not d: - raise errors.InvalidData( - "No valid data received", - log_message=True - ) - if not isinstance(networks, list): - raise errors.InvalidData( - "It's expected to receive array, not a single object", - log_message=True - ) - for i in networks: - if 'id' not in i: - raise errors.InvalidData( - "No 'id' param for '{0}'".format(i), - log_message=True - ) - - if i.get('name') == 'public': - try: - IPNetwork('0.0.0.0/' + i['netmask']) - except (AddrFormatError, KeyError): - raise errors.InvalidData( - "Invalid netmask for public network", - log_message=True - ) - return d - - -class NetAssignmentValidator(BasicValidator): - @classmethod - def validate(cls, node): - if not isinstance(node, dict): - raise errors.InvalidData( - "Each node should be dict", - log_message=True - ) - if 'id' not in node: - raise errors.InvalidData( - "Each node should have ID", - log_message=True - ) - if 'interfaces' not in node or \ - not isinstance(node['interfaces'], list): - raise errors.InvalidData( - "There is no 'interfaces' list in node '%d'" % node['id'], - log_message=True - ) - - net_ids = set() - for iface in node['interfaces']: - if not isinstance(iface, dict): - raise errors.InvalidData( - "Node '%d': each interface should be dict (got '%s')" % ( - node['id'], - str(iface) - ), - log_message=True - ) - if 'id' not in iface: - raise errors.InvalidData( - "Node '%d': each interface should have ID" % node['id'], - log_message=True - ) - if 'assigned_networks' not in iface or \ - not isinstance(iface['assigned_networks'], list): - raise errors.InvalidData( - "There is no 'assigned_networks' list" - " in interface '%d' in node '%d'" % - (iface['id'], node['id']), - log_message=True - ) - - for net in iface['assigned_networks']: - if not isinstance(net, dict): - raise errors.InvalidData( - "Node '%d', interface '%d':" - " each assigned network should be dict" % - (iface['id'], node['id']), - log_message=True - ) - if 'id' not in net: - raise errors.InvalidData( - "Node '%d', interface '%d':" - " each assigned network should have ID" % - (iface['id'], node['id']), - log_message=True - ) - if net['id'] in net_ids: - raise errors.InvalidData( - "Assigned networks for node '%d' have" - " a duplicate network '%d' (second" - " occurrence in interface '%d')" % - (node['id'], net['id'], iface['id']), - log_message=True - ) - net_ids.add(net['id']) - return node - - @classmethod - def validate_structure(cls, webdata): - node_data = cls.validate_json(webdata) - return cls.validate(node_data) - - @classmethod - def validate_collection_structure(cls, webdata): - data = cls.validate_json(webdata) - if not isinstance(data, list): - raise errors.InvalidData( - "Data should be list of nodes", - log_message=True - ) - for node_data in data: - cls.validate(node_data) - return data - - @classmethod - def verify_data_correctness(cls, node): - db_node = db().query(Node).filter_by(id=node['id']).first() - if not db_node: - raise errors.InvalidData( - "There is no node with ID '%d' in DB" % node['id'], - log_message=True - ) - interfaces = node['interfaces'] - db_interfaces = db_node.interfaces - if len(interfaces) != len(db_interfaces): - raise errors.InvalidData( - "Node '%d' has different amount of interfaces" % node['id'], - log_message=True - ) - # FIXIT: we should use not all networks but appropriate for this - # node only. - db_network_groups = db().query(NetworkGroup).filter_by( - cluster_id=db_node.cluster_id - ).all() - if not db_network_groups: - raise errors.InvalidData( - "There are no networks related to" - " node '%d' in DB" % node['id'], - log_message=True - ) - network_group_ids = set([ng.id for ng in db_network_groups]) - - for iface in interfaces: - db_iface = filter( - lambda i: i.id == iface['id'], - db_interfaces - ) - if not db_iface: - raise errors.InvalidData( - "There is no interface with ID '%d'" - " for node '%d' in DB" % - (iface['id'], node['id']), - log_message=True - ) - db_iface = db_iface[0] - - for net in iface['assigned_networks']: - if net['id'] not in network_group_ids: - raise errors.InvalidData( - "Node '%d' shouldn't be connected to" - " network with ID '%d'" % - (node['id'], net['id']), - log_message=True - ) - network_group_ids.remove(net['id']) - - # Check if there are unassigned networks for this node. - if network_group_ids: - raise errors.InvalidData( - "Too few networks to assign to node '%d'" % node['id'], - log_message=True - ) diff --git a/nailgun/nailgun/api/validators/node.py b/nailgun/nailgun/api/validators/node.py deleted file mode 100644 index 1cbd2941a..000000000 --- a/nailgun/nailgun/api/validators/node.py +++ /dev/null @@ -1,227 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.models import Node -from nailgun.api.validators.base import BasicValidator -from nailgun.api.validators.json_schema.disks \ - import disks_simple_format_schema -from nailgun.db import db -from nailgun.errors import errors - - -class MetaInterfacesValidator(BasicValidator): - @classmethod - def _validate_data(cls, interfaces): - if not isinstance(interfaces, list): - raise errors.InvalidInterfacesInfo( - "Meta.interfaces should be list", - log_message=True - ) - - return interfaces - - @classmethod - def validate_create(cls, interfaces): - interfaces = cls._validate_data(interfaces) - - def filter_valid_nic(nic): - for key in ('mac', 'name'): - if not key in nic or not isinstance(nic[key], basestring)\ - or not nic[key]: - return False - return True - - return filter(filter_valid_nic, interfaces) - - @classmethod - def validate_update(cls, interfaces): - interfaces = cls._validate_data(interfaces) - - for nic in interfaces: - if not isinstance(nic, dict): - raise errors.InvalidInterfacesInfo( - "Interface in meta.interfaces must be dict", - log_message=True - ) - - return interfaces - - -class MetaValidator(BasicValidator): - @classmethod - def _validate_data(cls, meta): - if not isinstance(meta, dict): - raise errors.InvalidMetadata( - "Invalid data: 'meta' should be dict", - log_message=True - ) - - @classmethod - def validate_create(cls, meta): - cls._validate_data(meta) - if 'interfaces' in meta: - meta['interfaces'] = MetaInterfacesValidator.validate_create( - meta['interfaces'] - ) - else: - raise errors.InvalidInterfacesInfo( - "Failed to discover node: " - "invalid interfaces info", - log_message=True - ) - return meta - - @classmethod - def validate_update(cls, meta): - cls._validate_data(meta) - if 'interfaces' in meta: - meta['interfaces'] = MetaInterfacesValidator.validate_update( - meta['interfaces'] - ) - return meta - - -class NodeValidator(BasicValidator): - @classmethod - def validate(cls, data): - d = cls.validate_json(data) - if not isinstance(d, dict): - raise errors.InvalidData( - "Node data must be dict", - log_message=True - ) - if "mac" not in d: - raise errors.InvalidData( - "No mac address specified", - log_message=True - ) - else: - q = db().query(Node) - if q.filter(Node.mac == d["mac"]).first(): - raise errors.AlreadyExists( - "Node with mac {0} already " - "exists - doing nothing".format(d["mac"]), - log_level="info" - ) - if cls.validate_existent_node_mac_create(d): - raise errors.AlreadyExists( - "Node with mac {0} already " - "exists - doing nothing".format(d["mac"]), - log_level="info" - ) - if 'meta' in d: - MetaValidator.validate_create(d['meta']) - return d - - # TODO(NAME): fix this using DRY - @classmethod - def validate_existent_node_mac_create(cls, data): - if 'meta' in data: - data['meta'] = MetaValidator.validate_create(data['meta']) - if 'interfaces' in data['meta']: - existent_node = db().query(Node).filter(Node.mac.in_( - [n['mac'] for n in data['meta']['interfaces']])).first() - return existent_node - - @classmethod - def validate_existent_node_mac_update(cls, data): - if 'meta' in data: - data['meta'] = MetaValidator.validate_update(data['meta']) - if 'interfaces' in data['meta']: - existent_node = db().query(Node).filter(Node.mac.in_( - [n['mac'] for n in data['meta']['interfaces']])).first() - return existent_node - - @classmethod - def validate_roles(cls, data, node): - if 'roles' in data: - if not isinstance(data['roles'], list) or \ - any(not isinstance(role, ( - str, unicode)) for role in data['roles']): - raise errors.InvalidData( - "Role list must be list of strings", - log_message=True - ) - - @classmethod - def validate_update(cls, data): - d = cls.validate_json(data) - if "status" in d and d["status"] not in Node.NODE_STATUSES: - raise errors.InvalidData( - "Invalid status for node", - log_message=True - ) - if 'roles' in d and 'id' in d: - node = db().query(Node).get(d['id']) - cls.validate_roles(d, node) - if 'meta' in d: - d['meta'] = MetaValidator.validate_update(d['meta']) - return d - - @classmethod - def validate_collection_update(cls, data): - d = cls.validate_json(data) - if not isinstance(d, list): - raise errors.InvalidData( - "Invalid json list", - log_message=True - ) - - q = db().query(Node) - for nd in d: - if not "mac" in nd and not "id" in nd: - raise errors.InvalidData( - "MAC or ID is not specified", - log_message=True - ) - else: - if "mac" in nd: - existent_node = q.filter_by(mac=nd["mac"]).first() \ - or cls.validate_existent_node_mac_update(nd) - if not existent_node: - raise errors.InvalidData( - "Invalid MAC specified", - log_message=True - ) - if "id" in nd: - existent_node = q.get(nd["id"]) - if not existent_node: - raise errors.InvalidData( - "Invalid ID specified", - log_message=True - ) - if 'roles' in nd: - cls.validate_roles(nd, existent_node) - if 'meta' in nd: - nd['meta'] = MetaValidator.validate_update(nd['meta']) - return d - - -class NodeDisksValidator(BasicValidator): - @classmethod - def validate(cls, data): - dict_data = cls.validate_json(data) - cls.validate_schema(dict_data, disks_simple_format_schema) - cls.sum_of_volumes_not_greater_than_disk_size(dict_data) - return dict_data - - @classmethod - def sum_of_volumes_not_greater_than_disk_size(cls, data): - for disk in data: - volumes_size = sum([volume['size'] for volume in disk['volumes']]) - - if volumes_size > disk['size']: - raise errors.InvalidData( - u'Not enough free space on disk: %s' % disk) diff --git a/nailgun/nailgun/api/validators/notification.py b/nailgun/nailgun/api/validators/notification.py deleted file mode 100644 index c665e6d02..000000000 --- a/nailgun/nailgun/api/validators/notification.py +++ /dev/null @@ -1,74 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.models import Notification -from nailgun.api.validators.base import BasicValidator -from nailgun.db import db -from nailgun.errors import errors - - -class NotificationValidator(BasicValidator): - @classmethod - def validate_update(cls, data): - - valid = {} - d = cls.validate_json(data) - - status = d.get("status", None) - if status in Notification.NOTIFICATION_STATUSES: - valid["status"] = status - else: - raise errors.InvalidData( - "Bad status", - log_message=True - ) - - return valid - - @classmethod - def validate_collection_update(cls, data): - d = cls.validate_json(data) - if not isinstance(d, list): - raise errors.InvalidData( - "Invalid json list", - log_message=True - ) - - q = db().query(Notification) - valid_d = [] - for nd in d: - valid_nd = {} - if "id" not in nd: - raise errors.InvalidData( - "ID is not set correctly", - log_message=True - ) - - if "status" not in nd: - raise errors.InvalidData( - "ID is not set correctly", - log_message=True - ) - - if not q.get(nd["id"]): - raise errors.InvalidData( - "Invalid ID specified", - log_message=True - ) - - valid_nd["id"] = nd["id"] - valid_nd["status"] = nd["status"] - valid_d.append(valid_nd) - return valid_d diff --git a/nailgun/nailgun/api/validators/redhat.py b/nailgun/nailgun/api/validators/redhat.py deleted file mode 100644 index ef78b071e..000000000 --- a/nailgun/nailgun/api/validators/redhat.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.validators.base import BasicValidator -from nailgun.errors import errors - - -class RedHatAccountValidator(BasicValidator): - @classmethod - def validate(cls, data): - d = cls.validate_json(data) - if "release_id" not in d: - raise errors.InvalidData( - "No Release ID specified", - ) - if "license_type" not in d: - raise errors.InvalidData( - "No License Type specified" - ) - if d["license_type"] not in ["rhsm", "rhn"]: - raise errors.InvalidData( - "Invalid License Type" - ) - if "username" not in d or "password" not in d: - raise errors.InvalidData( - "Username or password not specified" - ) - - if d["license_type"] == "rhn": - if "satellite" not in d or "activation_key" not in d: - raise errors.InvalidData( - "Satellite hostname or activation key not specified", - ) - return d diff --git a/nailgun/nailgun/api/validators/release.py b/nailgun/nailgun/api/validators/release.py deleted file mode 100644 index e541e6886..000000000 --- a/nailgun/nailgun/api/validators/release.py +++ /dev/null @@ -1,72 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.models import Attributes -from nailgun.api.models import Release -from nailgun.api.validators.base import BasicValidator -from nailgun.db import db -from nailgun.errors import errors -from nailgun.settings import settings - - -class ReleaseValidator(BasicValidator): - - @classmethod - def validate(cls, data): - d = cls.validate_json(data) - if "name" not in d: - raise errors.InvalidData( - "No release name specified", - log_message=True - ) - if "version" not in d: - raise errors.InvalidData( - "No release version specified", - log_message=True - ) - if db().query(Release).filter_by( - name=d["name"], - version=d["version"] - ).first(): - raise errors.AlreadyExists( - "Release with the same name and version " - "already exists", - log_message=True - ) - if "networks_metadata" in d: - for network in d["networks_metadata"]: - if not "name" in network or not "access" in network: - raise errors.InvalidData( - "Invalid network data: %s" % str(network), - log_message=True - ) - if network["access"] not in settings.NETWORK_POOLS: - raise errors.InvalidData( - "Invalid access mode for network", - log_message=True - ) - else: - d["networks_metadata"] = [] - if "attributes_metadata" not in d: - d["attributes_metadata"] = {} - else: - try: - Attributes.validate_fixture(d["attributes_metadata"]) - except Exception: - raise errors.InvalidData( - "Invalid logical structure of attributes metadata", - log_message=True - ) - return d diff --git a/nailgun/nailgun/autoapidoc.py b/nailgun/nailgun/autoapidoc.py deleted file mode 100644 index b96bad3d2..000000000 --- a/nailgun/nailgun/autoapidoc.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import inspect -import json - -from nailgun.api.handlers.base import JSONHandler -from nailgun.test.base import reverse - - -class SampleGenerator(object): - - @classmethod - def gen_sample_data(cls): - def process(app, what_, name, obj, options, lines): - if cls._ishandler(obj): - lines.insert(0, cls.generate_handler_url_doc(obj)) - lines.insert(1, "") - - if lines and lines[-1]: - lines.append("") - return process - - @classmethod - def _ishandler(cls, obj): - return inspect.isclass(obj) and issubclass(obj, JSONHandler) - - @classmethod - def _ishandlermethod(cls, obj): - return inspect.ismethod(obj) and issubclass(obj.im_class, JSONHandler) - - @classmethod - def generate_handler_url_doc(cls, handler): - http_methods = ["GET", "POST", "PUT", "DELETE"] - sample_method = None - for field in http_methods: - if hasattr(handler, field): - sample_method = getattr(handler, field) - break - args = inspect.getargspec(sample_method).args[1:] - test_url_data = dict([ - (arg, "%{0}%".format(arg)) for arg in args - ]) - return "URL: **{0}**".format( - reverse(handler.__name__, test_url_data) - ) - - @classmethod - def gen_json_block(cls, data): - return "\n.. code-block:: javascript\n\n{0}\n\n".format( - "\n".join([ - " " + s - for s in json.dumps(data, indent=4).split("\n") - ]) - ) - - -def setup(app): - app.connect( - 'autodoc-process-docstring', - SampleGenerator.gen_sample_data() - ) diff --git a/nailgun/nailgun/db.py b/nailgun/nailgun/db.py deleted file mode 100644 index 1bd15549c..000000000 --- a/nailgun/nailgun/db.py +++ /dev/null @@ -1,106 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import contextlib -import web -from sqlalchemy.orm import scoped_session, sessionmaker -from sqlalchemy import create_engine -from sqlalchemy.orm.query import Query - -from nailgun.settings import settings - - -db_str = "{engine}://{user}:{passwd}@{host}:{port}/{name}".format( - **settings.DATABASE) - - -engine = create_engine(db_str, client_encoding='utf8') - - -class NoCacheQuery(Query): - """Override for common Query class. - Needed for automatic refreshing objects - from database during every query for evading - problems with multiple sessions - """ - def __init__(self, *args, **kwargs): - self._populate_existing = True - super(NoCacheQuery, self).__init__(*args, **kwargs) - - -db = scoped_session( - sessionmaker( - autoflush=True, - autocommit=False, - bind=engine, - query_cls=NoCacheQuery - ) -) - - -def load_db_driver(handler): - try: - return handler() - except web.HTTPError: - db().commit() - raise - except Exception: - db().rollback() - raise - finally: - db().commit() - db().expire_all() - - -def syncdb(): - from nailgun.api.models import Base - Base.metadata.create_all(engine) - - -def dropdb(): - tables = [name for (name,) in db().execute( - "SELECT tablename FROM pg_tables WHERE schemaname = 'public'")] - for table in tables: - db().execute("DROP TABLE IF EXISTS %s CASCADE" % table) - - # sql query to list all types, equivalent to psql's \dT+ - types = [name for (name,) in db().execute(""" - SELECT t.typname as type FROM pg_type t - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace - WHERE (t.typrelid = 0 OR ( - SELECT c.relkind = 'c' FROM pg_catalog.pg_class c - WHERE c.oid = t.typrelid - )) - AND NOT EXISTS( - SELECT 1 FROM pg_catalog.pg_type el - WHERE el.oid = t.typelem AND el.typarray = t.oid - ) - AND n.nspname = 'public' - """)] - for type_ in types: - db().execute("DROP TYPE IF EXISTS %s CASCADE" % type_) - db().commit() - - -def flush(): - """Delete all data from all tables within nailgun metadata - """ - from nailgun.api.models import Base - with contextlib.closing(engine.connect()) as con: - trans = con.begin() - for table in reversed(Base.metadata.sorted_tables): - con.execute(table.delete()) - trans.commit() diff --git a/nailgun/nailgun/errors/__init__.py b/nailgun/nailgun/errors/__init__.py deleted file mode 100644 index 9a98312d3..000000000 --- a/nailgun/nailgun/errors/__init__.py +++ /dev/null @@ -1,84 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.errors.base import NailgunException - -default_messages = { - # common errors - "InvalidData": "Invalid data received", - "AlreadyExists": "Object already exists", - "DumpRunning": "Dump already running", - - # node discovering errors - "InvalidInterfacesInfo": "Invalid interfaces info", - "InvalidMetadata": "Invalid metadata specified for node", - "CannotFindNodeIDForDiscovering": "Cannot find node for discovering", - - # deployment errors - "CheckBeforeDeploymentError": "Pre-Deployment check wasn't successful", - "DeploymentAlreadyStarted": "Deployment already started", - "DeletionAlreadyStarted": "Environment removal already started", - "FailedProvisioning": "Failed to start provisioning", - "WrongNodeStatus": "Wrong node status", - "NodeOffline": "Node is offline", - "NotEnoughControllers": "Not enough controllers", - "RedHatSetupError": "Red Hat setup error", - - # disk errors - "NotEnoughFreeSpace": "Not enough free space", - "CannotFindVolumesInfoForRole": "Cannot find volumes info for role", - - # network errors - "AdminNetworkNotFound": "Admin network info not found", - "InvalidNetworkAccess": "Invalid network access", - "AssignIPError": "Failed to assign IP to node", - "NetworkCheckError": "Network checking failed", - "OutOfVLANs": "Not enough available VLAN IDs", - "OutOfIPs": "Not enough free IP addresses in pool", - "NoSuitableCIDR": "Cannot find suitable CIDR", - "CanNotFindInterface": "Cannot find interface", - "CanNotDetermineEndPointIP": "Cannot determine end point IP", - "CanNotFindNetworkForNode": "Cannot find network for node", - - # plugin errors - "PluginDownloading": "Cannot install plugin", - "PluginInitialization": "Cannot initialize plugin", - - # unknown - "UnknownError": "Unknown error" -} - - -class ErrorFactory(object): - - def __init__(self): - for name, msg in default_messages.iteritems(): - setattr(self, name, self._build_exc(name, msg)) - - def _build_exc(self, name, msg): - return type( - name, - (NailgunException,), - { - "message": msg - } - ) - - def __getattr__(self, name): - return self._build_exc(name, default_messages["UnknownError"]) - - -errors = ErrorFactory() diff --git a/nailgun/nailgun/errors/base.py b/nailgun/nailgun/errors/base.py deleted file mode 100644 index 6444c7e8f..000000000 --- a/nailgun/nailgun/errors/base.py +++ /dev/null @@ -1,66 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import web - -from nailgun.logger import logger - - -class NailgunException(Exception): - - def __init__(self, - message="", - log_traceback=False, - log_message=False, - log_level='warning', - add_client=True, - notify_user=False): - self.log_traceback = log_traceback - self.log_message = log_message - self.notify_user = notify_user - if message: - self.message = message - - if add_client: - client = self._get_client() - if client: - self.message = "[{0}] ".format( - client - ) + self.message - - if self.log_message: - getattr(logger, log_level)(self.message) - super(NailgunException, self).__init__() - - def _get_client(self): - """web.ctx.env is a thread-local object, - this hack is for getting client IP to add it - inside error message - """ - if not hasattr(web.ctx, "env"): - return None - - if 'HTTP_X_REAL_IP' in web.ctx.env: - return web.ctx.env['HTTP_X_REAL_IP'] - elif 'REMOTE_ADDR' in web.ctx.env: - return web.ctx.env['REMOTE_ADDR'] - else: - return None - - def __str__(self): - return self.message - - def __unicode__(self): - return self.message diff --git a/nailgun/nailgun/fixtures/__init__.py b/nailgun/nailgun/fixtures/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/fixtures/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/fixtures/admin_network.json b/nailgun/nailgun/fixtures/admin_network.json deleted file mode 100644 index 3fca1f6a4..000000000 --- a/nailgun/nailgun/fixtures/admin_network.json +++ /dev/null @@ -1,40 +0,0 @@ -[ - { - "pk": 1, - "model": "nailgun.network_group", - "fields": { - "name": "fuelweb_admin", - "access": "admin", - "cidr": "{{settings.ADMIN_NETWORK['cidr']}}", - "netmask": "{{settings.ADMIN_NETWORK['netmask']}}", - "network_size": "{{settings.ADMIN_NETWORK['size']}}", - "vlan_start": "1" - } - }, - { - "pk": 1, - "model": "nailgun.vlan", - "fields": { - } - }, - { - "pk": 1, - "model": "nailgun.network", - "fields": { - "name": "fuelweb_admin", - "access": "admin", - "network_group": 1, - "cidr": "{{settings.ADMIN_NETWORK['cidr']}}", - "vlan": 1 - } - }, - { - "pk": 1, - "model": "nailgun.i_p_addr_range", - "fields": { - "network_group": 1, - "first": "{{settings.ADMIN_NETWORK['first']}}", - "last": "{{settings.ADMIN_NETWORK['last']}}" - } - } -] \ No newline at end of file diff --git a/nailgun/nailgun/fixtures/fixman.py b/nailgun/nailgun/fixtures/fixman.py deleted file mode 100644 index 2bece590c..000000000 --- a/nailgun/nailgun/fixtures/fixman.py +++ /dev/null @@ -1,203 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from datetime import datetime -import itertools -import jinja2 -import json -import os.path -import Queue -import StringIO -import sys - -from sqlalchemy import orm -import sqlalchemy.types - -from nailgun.api import models -from nailgun.db import db as ormgen -from nailgun.logger import logger -from nailgun.network.manager import NetworkManager -from nailgun.settings import settings - -db = ormgen() - - -def capitalize_model_name(model_name): - return ''.join(map(lambda s: s.capitalize(), model_name.split('_'))) - - -def template_fixture(fileobj, config=None): - if not config: - config = settings - t = jinja2.Template(fileobj.read()) - return StringIO.StringIO(t.render(settings=config)) - - -def upload_fixture(fileobj): - db.expunge_all() - fixture = json.load(template_fixture(fileobj)) - - queue = Queue.Queue() - keys = {} - - for obj in fixture: - pk = obj["pk"] - model_name = obj["model"].split(".")[1] - - try: - itertools.dropwhile( - lambda m: not hasattr(models, m), - [model_name.capitalize(), - "".join(map(lambda n: n.capitalize(), model_name.split("_")))] - ).next() - except StopIteration: - raise Exception("Couldn't find model {0}".format(model_name)) - - obj['model'] = getattr(models, capitalize_model_name(model_name)) - keys[obj['model'].__tablename__] = {} - - # Check if it's already uploaded - obj_from_db = db.query(obj['model']).get(pk) - if obj_from_db: - logger.info("Fixture model '%s' with pk='%s' already" - " uploaded. Skipping", model_name, pk) - continue - queue.put(obj) - - pending_objects = [] - - while True: - try: - obj = queue.get_nowait() - except Exception: - break - - new_obj = obj['model']() - - fk_fields = {} - for field, value in obj["fields"].iteritems(): - f = getattr(obj['model'], field) - impl = getattr(f, 'impl', None) - fk_model = None - try: - if hasattr(f.comparator.prop, "argument"): - if hasattr(f.comparator.prop.argument, "__call__"): - fk_model = f.comparator.prop.argument() - else: - fk_model = f.comparator.prop.argument.class_ - except AttributeError: - pass - - if fk_model: - if value not in keys[fk_model.__tablename__]: - if obj not in pending_objects: - queue.put(obj) - pending_objects.append(obj) - continue - else: - logger.error( - u"Can't resolve foreign key " - "'{0}' for object '{1}'".format( - field, - obj["model"] - ) - ) - break - else: - value = keys[fk_model.__tablename__][value].id - - if isinstance(impl, orm.attributes.ScalarObjectAttributeImpl): - if value: - fk_fields[field] = (value, fk_model) - elif isinstance(impl, orm.attributes.CollectionAttributeImpl): - if value: - fk_fields[field] = (value, fk_model) - elif hasattr(f, 'property') and isinstance( - f.property.columns[0].type, sqlalchemy.types.DateTime - ): - if value: - setattr( - new_obj, - field, - datetime.strptime(value, "%d-%m-%Y %H:%M:%S") - ) - else: - setattr( - new_obj, - field, - datetime.now() - ) - else: - setattr(new_obj, field, value) - - for field, data in fk_fields.iteritems(): - if isinstance(data[0], int): - setattr(new_obj, field, db.query(data[1]).get(data[0])) - elif isinstance(data[0], list): - for v in data[0]: - getattr(new_obj, field).append( - db.query(data[1]).get(v) - ) - db.add(new_obj) - db.commit() - keys[obj['model'].__tablename__][obj["pk"]] = new_obj - - # UGLY HACK for testing - if new_obj.__class__.__name__ == 'Node': - new_obj.attributes = models.NodeAttributes() - db.commit() - new_obj.attributes.volumes = \ - new_obj.volume_manager.gen_volumes_info() - network_manager = NetworkManager() - network_manager.update_interfaces_info(new_obj.id) - db.commit() - - -def upload_fixtures(): - fns = [] - for path in settings.FIXTURES_TO_UPLOAD: - if not os.path.isabs(path): - path = os.path.abspath(os.path.join(os.path.dirname(__file__), - path)) - fns.append(path) - - for fn in fns: - with open(fn, "r") as fileobj: - upload_fixture(fileobj) - logger.info("Fixture has been uploaded from file: %s" % fn) - - -def dump_fixture(model_name): - dump = [] - app_name = 'nailgun' - model = getattr(models, capitalize_model_name(model_name)) - for obj in db.query(model).all(): - obj_dump = {} - obj_dump['pk'] = getattr(obj, model.__mapper__.primary_key[0].name) - obj_dump['model'] = "%s.%s" % (app_name, model_name) - obj_dump['fields'] = {} - dump.append(obj_dump) - for prop in model.__mapper__.iterate_properties: - if isinstance(prop, sqlalchemy.orm.ColumnProperty): - field = str(prop.key) - value = getattr(obj, field) - if value is None: - continue - if not isinstance(value, ( - list, dict, str, unicode, int, float, bool)): - value = "" - obj_dump['fields'][field] = value - sys.stdout.write(json.dumps(dump, indent=4)) diff --git a/nailgun/nailgun/fixtures/openstack.json b/nailgun/nailgun/fixtures/openstack.json deleted file mode 100644 index 8738f3df1..000000000 --- a/nailgun/nailgun/fixtures/openstack.json +++ /dev/null @@ -1,1081 +0,0 @@ -[ - { - "pk": 1, - "model": "nailgun.release", - "fields": { - "name": "Grizzly on CentOS 6.4", - "version": "2013.1.3", - "operating_system": "CentOS", - "description": "This option will install the OpenStack Grizzly packages using CentOS as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment.", - "state": "available", - "roles": ["controller", "compute", "cinder", "ceph-osd"], - "roles_metadata": { - "controller": { - "name": "Controller", - "description": "Controller description", - "conflicts": ["compute"] - }, - "compute": { - "name": "Compute", - "description": "Compute description", - "conflicts": ["controller"] - }, - "cinder": { - "name": "Cinder", - "description": ["Cinder"] - }, - "ceph-osd": { - "name": "Ceph OSD", - "description": ["Ceph Storage Node"] - } - }, - "networks_metadata": [ - {"name": "floating", "access": "public"}, - {"name": "public", "access": "public"}, - {"name": "management", "access": "private192"}, - {"name": "storage", "access": "private192"}, - {"name": "fixed", "access": "private10"} - ], - "volumes_metadata": { - "volumes_roles_mapping": { - "controller": ["os", "image"], - "compute": ["os", "vm"], - "ceph-osd": ["os", "cephjournal", "ceph"], - "cinder": ["os", "cinder"], - "other": ["os"] - }, - "volumes": [ - { - "id": "ceph", - "type": "partition", - "min_size": {"generator": "calc_min_ceph_size"}, - "label": "Ceph", - "name": "Ceph", - "mount": "none", - "disk_label": "cephosd", - "file_system": "xfs" - }, - { - "id": "cephjournal", - "type": "partition", - "min_size": 0, - "name": "Ceph Journal", - "label": "Ceph Journal", - "mount": "/var/lib/ceph/journal", - "disk_label": "cephjournal", - "file_system": "xfs" - }, - { - "id": "os", - "type": "vg", - "min_size": {"generator": "calc_min_os_size"}, - "label": "Base System", - "volumes": [ - { - "mount": "/", - "type": "lv", - "name": "root", - "size": {"generator": "calc_total_root_vg"}, - "file_system": "ext4" - }, - { - "mount": "swap", - "type": "lv", - "name": "swap", - "size": {"generator": "calc_swap_size"}, - "file_system": "swap" - } - ] - }, - { - "id": "vm", - "type": "vg", - "min_size": {"generator": "calc_min_vm_size"}, - "label": "Virtual Storage", - "volumes": [ - { - "mount": "{{settings.NOVA_STATE_PATH}}", - "type": "lv", - "name": "nova", - "size": { - "generator": "calc_total_vg", - "generator_args": ["vm"] - }, - "file_system": "xfs" - } - ] - }, - { - "id": "image", - "type": "vg", - "min_size": {"generator": "calc_min_glance_size"}, - "label": "Image Storage", - "volumes": [ - { - "mount": "/var/lib/glance", - "type": "lv", - "name": "glance", - "size": { - "generator": "calc_total_vg", - "generator_args": ["image"] - }, - "file_system": "xfs" - } - ] - }, - { - "id": "cinder", - "type": "vg", - "label": "Cinder", - "min_size": {"generator": "calc_min_cinder_size"}, - "volumes": [] - } - ] - }, - "attributes_metadata": { - "editable": { - "access": { - "user": { - "value": "admin", - "label": "username", - "description": "Username for Administrator", - "weight": 10, - "type": "text" - }, - "email": { - "value": "admin@example.org", - "label": "email", - "description": "Email address for Administrator", - "weight": 40, - "type": "text" - }, - "tenant": { - "value": "admin", - "label": "tenant", - "description": "Tenant (project) name for Administrator", - "weight": 30, - "type": "text" - }, - "password": { - "value": "admin", - "label": "password", - "description": "Password for Administrator", - "weight": 20, - "type": "password" - } - }, - "common": { - "auto_assign_floating_ip": { - "value": false, - "label": "Auto assign floating IP", - "description": "If true, OpenStack will automatically assign a floating IP to a new instance", - "weight": 40, - "type": "checkbox" - }, - "libvirt_type": { - "value": "qemu", - "values": [ - { - "data": "kvm", - "display_name": "KVM", - "description": "Choose this type of hypervisor if you run OpenStack on hardware" - }, - { - "data": "qemu", - "display_name": "QEMU", - "description": "Choose this type of hypervisor if you run OpenStack on virtual hosts." - } - ], - "label": "Hypervisor type", - "weight": 10, - "type": "radio" - }, - "start_guests_on_host_boot": { - "value": true, - "label": "Start guests on host boot", - "description": "Whether to (re-)start guests when the host reboots. If enabled, this option causes guests assigned to the host to be unconditionally restarted when nova-compute starts. If the guest is found to be stopped, it starts. If it is found to be running, it reboots.", - "weight": 50, - "type": "checkbox" - }, - "use_cow_images": { - "value": true, - "label": "Use qcow format for images", - "description": "For most cases you will want qcow format. If it's set to false, raw image format will be used to run VMs. OpenStack with raw format currently does not support snapshotting.", - "weight": 30, - "type": "checkbox" - }, - "compute_scheduler_driver": { - "value": "nova.scheduler.filter_scheduler.FilterScheduler", - "values": [ - { - "data": "nova.scheduler.filter_scheduler.FilterScheduler", - "display_name": "Filter scheduler", - "description": "Currently the most advanced OpenStack scheduler. See the OpenStack documentation for details." - }, - { - "data": "nova.scheduler.simple.SimpleScheduler", - "display_name": "Simple scheduler", - "description": "This is 'naive' scheduler which tries to find the least loaded host" - } - ], - "label": "Scheduler driver", - "weight": 20, - "type": "radio" - }, - "auth_key": { - "value": "", - "label": "Public Key", - "description": "Public key(s) to include in authorized_keys on deployed nodes", - "weight": 60, - "type": "text" - } - }, - "glance": { - "image_cache_max_size": { - "value": "10737418240", - "label": "Glance image cache maximum size (in bytes) ", - "weight": 70, - "type": "text" - } - }, - "syslog": { - "syslog_transport": { - "value": "udp", - "values": [ - { - "data": "udp", - "display_name": "UDP", - "description": "" - }, - { - "data": "tcp", - "display_name": "TCP", - "description": "" - } - ], - "label": "Syslog transport protocol", - "weight": 30, - "type": "radio" - }, - "syslog_server": { - "value": "", - "label": "Hostname", - "description": "Remote syslog hostname", - "weight": 10, - "type": "text" - }, - "syslog_port": { - "value": "514", - "label": "Port", - "description": "Remote syslog port", - "weight": 20, - "type": "text" - } - }, - "storage": { - "cinder": { - "value": "lvm", - "values": [ - { - "data": "ceph", - "display_name": "Ceph", - "description": "" - }, - { - "data": "lvm", - "display_name": "LVM", - "description": "" - } - ], - "label": "Storage backend for Cinder", - "weight": 30, - "type": "radio" - }, - "glance": { - "value": "swift", - "values": [ - { - "data": "ceph", - "display_name": "Ceph", - "description": "" - }, - { - "data": "swift", - "display_name": "Swift", - "description": "" - } - ], - "label": "Storage backend for Glance", - "weight": 40, - "type": "radio" - } - } - }, - "generated": { - "mysql": { - "root_password": { - "generator": "password" - } - }, - "keystone": { - "db_password": { - "generator": "password" - }, - "admin_token": { - "generator": "password" - } - }, - "glance": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - } - }, - "nova": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - }, - "state_path": "{{settings.NOVA_STATE_PATH}}" - }, - "rabbit": { - "password": { - "generator": "password" - } - }, - "swift": { - "user_password": { - "generator": "password" - } - }, - "cinder": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - } - }, - "base_syslog": { - "syslog_server": { - "generator": "ip", - "generator_arg": "admin" - }, - "syslog_port": { - "generator": "identical", - "generator_arg": "514" - } - }, - "cobbler": { - "profile": { - "generator": "identical", - "generator_arg": "centos-x86_64" - } - } - } - } - } - }, - { - "pk": 2, - "model": "nailgun.release", - "fields": { - "name": "RHOS 3.0 for RHEL 6.4", - "version": "2013.1.2", - "operating_system": "RHEL", - "description": "This option will install the Red Hat Enterprise Linux OpenStack Platform using RHEL as a base operating system. With high availability features built in, you are getting a robust enterprise-grade OpenStack deployment.", - "state": "not_available", - "roles": ["controller", "compute", "cinder"], - "roles_metadata": { - "controller": { - "name": "Controller", - "description": "Controller description", - "conflicts": ["compute"] - }, - "compute": { - "name": "Compute", - "description": "Compute description", - "conflicts": ["controller"] - }, - "cinder": { - "name": "Cinder", - "description": ["Cinder"] - } - }, - "networks_metadata": [ - {"name": "floating", "access": "public"}, - {"name": "public", "access": "public"}, - {"name": "management", "access": "private192"}, - {"name": "storage", "access": "private192"}, - {"name": "fixed", "access": "private10"} - ], - "volumes_metadata": { - "volumes_roles_mapping": { - "controller": ["os", "image"], - "compute": ["os", "vm"], - "cinder": ["os", "cinder"], - "other": ["os"] - }, - "volumes": [ - { - "id": "os", - "type": "vg", - "min_size": {"generator": "calc_min_os_size"}, - "label": "Base System", - "volumes": [ - { - "mount": "/", - "type": "lv", - "name": "root", - "size": {"generator": "calc_total_root_vg"}, - "file_system": "ext4" - }, - { - "mount": "swap", - "type": "lv", - "name": "swap", - "size": {"generator": "calc_swap_size"}, - "file_system": "swap" - } - ] - }, - { - "id": "vm", - "type": "vg", - "min_size": {"generator": "calc_min_vm_size"}, - "label": "Virtual Storage", - "volumes": [ - { - "mount": "{{settings.NOVA_STATE_PATH}}", - "type": "lv", - "name": "nova", - "size": { - "generator": "calc_total_vg", - "generator_args": ["vm"] - }, - "file_system": "xfs" - } - ] - }, - { - "id": "image", - "type": "vg", - "min_size": {"generator": "calc_min_glance_size"}, - "label": "Image Storage", - "volumes": [ - { - "mount": "/var/lib/glance", - "type": "lv", - "name": "glance", - "size": { - "generator": "calc_total_vg", - "generator_args": ["image"] - }, - "file_system": "xfs" - } - ] - }, - { - "id": "cinder", - "type": "vg", - "label": "Cinder", - "min_size": {"generator": "calc_min_cinder_size"}, - "volumes": [] - } - ] - }, - "attributes_metadata": { - "editable": { - "access": { - "user": { - "value": "admin", - "label": "username", - "description": "Username for Administrator", - "weight": 10, - "type": "text" - }, - "email": { - "value": "admin@example.org", - "label": "email", - "description": "Email address for Administrator", - "weight": 40, - "type": "text" - }, - "tenant": { - "value": "admin", - "label": "tenant", - "description": "Tenant (project) name for Administrator", - "weight": 30, - "type": "text" - }, - "password": { - "value": "admin", - "label": "password", - "description": "Password for Administrator", - "weight": 20, - "type": "password" - } - }, - "common": { - "auto_assign_floating_ip": { - "value": false, - "label": "Auto assign floating IP", - "description": "If true, OpenStack will automatically assign a floating IP to a new instance", - "weight": 40, - "type": "checkbox" - }, - "libvirt_type": { - "value": "qemu", - "values": [ - { - "data": "kvm", - "display_name": "KVM", - "description": "Choose this type of hypervisor if you run OpenStack on hardware" - }, - { - "data": "qemu", - "display_name": "QEMU", - "description": "Choose this type of hypervisor if you run OpenStack on virtual hosts." - } - ], - "label": "Hypervisor type", - "weight": 10, - "type": "radio" - }, - "start_guests_on_host_boot": { - "value": true, - "label": "Start guests on host boot", - "description": "Whether to (re-)start guests when the host reboots. If enabled, this option causes guests assigned to the host to be unconditionally restarted when nova-compute starts. If the guest is found to be stopped, it starts. If it is found to be running, it reboots.", - "weight": 50, - "type": "checkbox" - }, - "use_cow_images": { - "value": true, - "label": "Use qcow format for images", - "description": "For most cases you will want qcow format. If it's set to false, raw image format will be used to run VMs. OpenStack with raw format currently does not support snapshotting.", - "weight": 30, - "type": "checkbox" - }, - "compute_scheduler_driver": { - "value": "nova.scheduler.filter_scheduler.FilterScheduler", - "values": [ - { - "data": "nova.scheduler.filter_scheduler.FilterScheduler", - "display_name": "Filter scheduler", - "description": "Currently the most advanced OpenStack scheduler. See the OpenStack documentation for details." - }, - { - "data": "nova.scheduler.simple.SimpleScheduler", - "display_name": "Simple scheduler", - "description": "This is 'naive' scheduler which tries to find the least loaded host" - } - ], - "label": "Scheduler driver", - "weight": 20, - "type": "radio" - }, - "auth_key": { - "value": "", - "label": "Public Key", - "description": "Public key(s) to include in authorized_keys on deployed nodes", - "weight": 60, - "type": "text" - } - }, - "glance": { - "image_cache_max_size": { - "value": "10737418240", - "label": "Glance image cache maximum size (in bytes) ", - "weight": 70, - "type": "text" - } - }, - "syslog": { - "syslog_transport": { - "value": "udp", - "values": [ - { - "data": "udp", - "display_name": "UDP", - "description": "" - }, - { - "data": "tcp", - "display_name": "TCP", - "description": "" - } - ], - "label": "Syslog transport protocol", - "weight": 30, - "type": "radio" - }, - "syslog_server": { - "value": "", - "label": "Hostname", - "description": "Remote syslog hostname", - "weight": 10, - "type": "text" - }, - "syslog_port": { - "value": "514", - "label": "Port", - "description": "Remote syslog port", - "weight": 20, - "type": "text" - } - } - }, - "generated": { - "mysql": { - "root_password": { - "generator": "password" - } - }, - "keystone": { - "db_password": { - "generator": "password" - }, - "admin_token": { - "generator": "password" - } - }, - "glance": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - } - }, - "nova": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - }, - "state_path": "{{settings.NOVA_STATE_PATH}}" - }, - "rabbit": { - "password": { - "generator": "password" - } - }, - "swift": { - "user_password": { - "generator": "password" - } - }, - "cinder": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - } - }, - "base_syslog": { - "syslog_server": { - "generator": "ip", - "generator_arg": "admin" - }, - "syslog_port": { - "generator": "identical", - "generator_arg": "514" - } - }, - "cobbler": { - "profile": { - "generator": "identical", - "generator_arg": "rhel-x86_64" - } - } - } - } - } - }, - { - "pk": 3, - "model": "nailgun.release", - "fields": { - "name": "Grizzly on Ubuntu 12.04", - "version": "2013.1.3", - "operating_system": "Ubuntu", - "description": "This option will install the OpenStack Grizzly packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment.", - "state": "available", - "roles": ["controller", "compute", "cinder", "ceph-osd"], - "roles_metadata": { - "controller": { - "name": "Controller", - "description": "Controller description", - "conflicts": ["compute"] - }, - "compute": { - "name": "Compute", - "description": "Compute description", - "conflicts": ["controller"] - }, - "cinder": { - "name": "Cinder", - "description": ["Cinder"] - }, - "ceph-osd": { - "name": "Ceph OSD", - "description": ["Ceph Storage Node"] - } - }, - "networks_metadata": [ - {"name": "floating", "access": "public"}, - {"name": "public", "access": "public"}, - {"name": "management", "access": "private192"}, - {"name": "storage", "access": "private192"}, - {"name": "fixed", "access": "private10"} - ], - "volumes_metadata": { - "volumes_roles_mapping": { - "controller": ["os", "image"], - "compute": ["os", "vm"], - "ceph-osd": ["os", "cephjournal", "ceph"], - "cinder": ["os", "cinder"], - "other": ["os"] - }, - "volumes": [ - { - "id": "ceph", - "type": "partition", - "min_size": {"generator": "calc_min_ceph_size"}, - "label": "Ceph", - "mount": "none", - "disk_label": "cephosd", - "file_system": "xfs" - }, - { - "id": "cephjournal", - "type": "raid", - "min_size": 0, - "name": "Ceph Journal", - "label": "Ceph Journal", - "mount": "/var/lib/ceph/journal", - "disk_label": "cephjournal", - "file_system": "xfs" - }, - { - "id": "os", - "type": "vg", - "min_size": {"generator": "calc_min_os_size"}, - "label": "Base System", - "volumes": [ - { - "mount": "/", - "type": "lv", - "name": "root", - "size": {"generator": "calc_total_root_vg"}, - "file_system": "ext4" - }, - { - "mount": "swap", - "type": "lv", - "name": "swap", - "size": {"generator": "calc_swap_size"}, - "file_system": "swap" - } - ] - }, - { - "id": "vm", - "type": "vg", - "min_size": {"generator": "calc_min_vm_size"}, - "label": "Virtual Storage", - "volumes": [ - { - "mount": "{{settings.NOVA_STATE_PATH}}", - "type": "lv", - "name": "nova", - "size": { - "generator": "calc_total_vg", - "generator_args": ["vm"] - }, - "file_system": "xfs" - } - ] - }, - { - "id": "image", - "type": "vg", - "min_size": {"generator": "calc_min_glance_size"}, - "label": "Image Storage", - "volumes": [ - { - "mount": "/var/lib/glance", - "type": "lv", - "name": "glance", - "size": { - "generator": "calc_total_vg", - "generator_args": ["image"] - }, - "file_system": "xfs" - } - ] - }, - { - "id": "cinder", - "type": "vg", - "label": "Cinder", - "min_size": {"generator": "calc_min_cinder_size"}, - "volumes": [] - } - ] - }, - "attributes_metadata": { - "editable": { - "access": { - "user": { - "value": "admin", - "label": "username", - "description": "Username for Administrator", - "weight": 10, - "type": "text" - }, - "email": { - "value": "admin@example.org", - "label": "email", - "description": "Email address for Administrator", - "weight": 40, - "type": "text" - }, - "tenant": { - "value": "admin", - "label": "tenant", - "description": "Tenant (project) name for Administrator", - "weight": 30, - "type": "text" - }, - "password": { - "value": "admin", - "label": "password", - "description": "Password for Administrator", - "weight": 20, - "type": "password" - } - }, - "common": { - "auto_assign_floating_ip": { - "value": false, - "label": "Auto assign floating IP", - "description": "If true, OpenStack will automatically assign a floating IP to a new instance", - "weight": 40, - "type": "checkbox" - }, - "libvirt_type": { - "value": "qemu", - "values": [ - { - "data": "kvm", - "display_name": "KVM", - "description": "Choose this type of hypervisor if you run OpenStack on hardware" - }, - { - "data": "qemu", - "display_name": "QEMU", - "description": "Choose this type of hypervisor if you run OpenStack on virtual hosts." - } - ], - "label": "Hypervisor type", - "weight": 10, - "type": "radio" - }, - "start_guests_on_host_boot": { - "value": true, - "label": "Start guests on host boot", - "description": "Whether to (re-)start guests when the host reboots. If enabled, this option causes guests assigned to the host to be unconditionally restarted when nova-compute starts. If the guest is found to be stopped, it starts. If it is found to be running, it reboots.", - "weight": 50, - "type": "checkbox" - }, - "use_cow_images": { - "value": true, - "label": "Use qcow format for images", - "description": "For most cases you will want qcow format. If it's set to false, raw image format will be used to run VMs. OpenStack with raw format currently does not support snapshotting.", - "weight": 30, - "type": "checkbox" - }, - "compute_scheduler_driver": { - "value": "nova.scheduler.filter_scheduler.FilterScheduler", - "values": [ - { - "data": "nova.scheduler.filter_scheduler.FilterScheduler", - "display_name": "Filter scheduler", - "description": "Currently the most advanced OpenStack scheduler. See the OpenStack documentation for details." - }, - { - "data": "nova.scheduler.simple.SimpleScheduler", - "display_name": "Simple scheduler", - "description": "This is 'naive' scheduler which tries to find the least loaded host" - } - ], - "label": "Scheduler driver", - "weight": 20, - "type": "radio" - }, - "auth_key": { - "value": "", - "label": "Public Key", - "description": "Public key(s) to include in authorized_keys on deployed nodes", - "weight": 60, - "type": "text" - } - }, - "glance": { - "image_cache_max_size": { - "value": "10737418240", - "label": "Glance image cache maximum size (in bytes) ", - "weight": 70, - "type": "text" - } - }, - "syslog": { - "syslog_transport": { - "value": "udp", - "values": [ - { - "data": "udp", - "display_name": "UDP", - "description": "" - }, - { - "data": "tcp", - "display_name": "TCP", - "description": "" - } - ], - "label": "Syslog transport protocol", - "weight": 30, - "type": "radio" - }, - "syslog_server": { - "value": "", - "label": "Hostname", - "description": "Remote syslog hostname", - "weight": 10, - "type": "text" - }, - "syslog_port": { - "value": "514", - "label": "Port", - "description": "Remote syslog port", - "weight": 20, - "type": "text" - } - }, - "storage": { - "cinder": { - "value": "lvm", - "values": [ - { - "data": "ceph", - "display_name": "Ceph", - "description": "" - }, - { - "data": "lvm", - "display_name": "LVM", - "description": "" - } - ], - "label": "Storage backend for Cinder", - "weight": 30, - "type": "radio" - }, - "glance": { - "value": "swift", - "values": [ - { - "data": "ceph", - "display_name": "Ceph", - "description": "" - }, - { - "data": "swift", - "display_name": "Swift", - "description": "" - } - ], - "label": "Storage backend for Glance", - "weight": 40, - "type": "radio" - } - } - }, - "generated": { - "mysql": { - "root_password": { - "generator": "password" - } - }, - "keystone": { - "db_password": { - "generator": "password" - }, - "admin_token": { - "generator": "password" - } - }, - "glance": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - } - }, - "nova": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - }, - "state_path": "{{settings.NOVA_STATE_PATH}}" - }, - "rabbit": { - "password": { - "generator": "password" - } - }, - "swift": { - "user_password": { - "generator": "password" - } - }, - "cinder": { - "db_password": { - "generator": "password" - }, - "user_password": { - "generator": "password" - } - }, - "base_syslog": { - "syslog_server": { - "generator": "ip", - "generator_arg": "admin" - }, - "syslog_port": { - "generator": "identical", - "generator_arg": "514" - } - }, - "cobbler": { - "profile": { - "generator": "identical", - "generator_arg": "ubuntu_1204_x86_64" - } - } - } - } - } - } -] diff --git a/nailgun/nailgun/fixtures/sample_environment.json b/nailgun/nailgun/fixtures/sample_environment.json deleted file mode 100644 index 7693356dd..000000000 --- a/nailgun/nailgun/fixtures/sample_environment.json +++ /dev/null @@ -1,1146 +0,0 @@ -[ - { - "pk": 1, - "model": "nailgun.node", - "fields": { - "status": "discover", - "name": "Supermicro X9DRW", - "ip": "172.18.67.168", - "online": true, - "pending_addition": false, - "platform_name": "X9DRW", - "mac": "00:25:90:6A:B1:10", - "meta": { - "cpu": { - "real": 2, - "total": 24, - "spec": [ - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - } - ] - }, - "interfaces": [ - { - "mac": "00:25:90:6A:B1:10", - "max_speed": 1000, - "name": "eth0", - "current_speed": 1000 - }, - { - "mac": "00:25:90:6A:B1:11", - "max_speed": 1000, - "name": "eth1", - "current_speed": null - } - ], - "disks": [ - { - "model": "TOSHIBA MK1002TS", - "name": "sda", - "disk": "sda", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sdb", - "disk": "sdb", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sdc", - "disk": "sdc", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sdd", - "disk": "sdd", - "size": 1000204886016 - }, - { - "model": "Virtual Floppy0", - "name": "sde", - "disk": "sde", - "size": 0 - }, - { - "model": "Virtual HDisk0", - "name": "sdf", - "disk": "sdf", - "size": 0 - } - ], - "system": { - "product": "X9DRW", - "family": "To be filled by O.E.M.", - "fqdn": "srv08-srt.srt.mirantis.net", - "version": "0123456789", - "serial": "0123456789", - "manufacturer": "Supermicro" - }, - "memory": { - "slots": 1, - "total": 137455730688, - "maximum_capacity": 274894684160, - "devices": [ - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "type": "Flash", - "size": 16777216 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "ubuntu", - "manufacturer": "Supermicro" - } - }, - { - "pk": 2, - "model": "nailgun.node", - "fields": { - "status": "discover", - "name": "Dell Inspiron", - "ip": "10.20.0.1", - "online": true, - "pending_addition": false, - "platform_name": "Inspiron N5110", - "mac": "58:91:CF:2A:C4:1B", - "meta": { - "memory": { - "slots": 2, - "total": 8589934592, - "maximum_capacity": 17179869184, - "devices": [ - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - } - ] - }, - "interfaces": [ - { - "ip": "192.168.70.234", - "mac": "58:91:CF:2A:C4:1B", - "netmask": "255.255.255.0", - "current_speed": null, - "name": "wlan0" - }, - { - "mac": "24:B6:FD:53:63:00", - "max_speed": 100, - "name": "eth0", - "current_speed": 10 - } - ], - "disks": [ - { - "model": "Silicon-Power16G", - "name": "sdb", - "disk": "sdb", - "size": 15518924800 - }, - { - "model": "WDC WD3200BPVT-7", - "name": "sda", - "disk": "sda", - "size": 320072933376 - } - ], - "system": { - "product": "Inspiron N5110", - "serial": "044ED881", - "fqdn": "lab-10", - "manufacturer": "80AD" - }, - "cpu": { - "real": 1, - "total": 8, - "spec": [ - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - }, - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - }, - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - }, - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - }, - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - }, - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - }, - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - }, - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2201 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "ubuntu", - "manufacturer": "80AD" - } - }, - { - "pk": 3, - "model": "nailgun.node", - "fields": { - "status": "discover", - "name": "Supermicro X9SCD", - "ip": "172.18.67.167", - "online": true, - "pending_addition": false, - "platform_name": "X9SCD", - "mac": "00:25:90:67:9F:B7", - "meta": { - "memory": { - "slots": 4, - "total": 17179869184, - "maximum_capacity": 34359738368, - "devices": [ - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - } - ] - }, - "interfaces": [ - { - "name": "eth1", - "ip": "172.18.67.167", - "netmask": "255.255.255.240", - "mac": "00:25:90:67:9F:B7", - "max_speed": 1000, - "current_speed": 1000 - }, - { - "mac": "00:25:90:67:9F:B6", - "max_speed": 1000, - "name": "eth0", - "current_speed": null - } - ], - "disks": [ - { - "model": "TOSHIBA MK1002TS", - "name": "sdb", - "disk": "sdb", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sda", - "disk": "sda", - "size": 1000204886016 - } - ], - "system": { - "product": "X9SCD", - "family": "To be filled by O.E.M.", - "fqdn": "mc0n1-srt.srt.mirantis.net", - "version": "0123456789", - "serial": "0123456789", - "manufacturer": "Supermicro" - }, - "cpu": { - "real": 1, - "total": 8, - "spec": [ - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "ubuntu", - "manufacturer": "Supermicro" - } - }, - { - "pk": 4, - "model": "nailgun.node", - "fields": { - "status": "discover", - "name": "Supermicro X9SCD (offline)", - "ip": "172.18.67.173", - "online": false, - "pending_addition": false, - "platform_name": "X9SCD", - "mac": "00:25:90:67:9D:24", - "meta": { - "memory": { - "slots": 4, - "total": 17179869184, - "maximum_capacity": 34359738368, - "devices": [ - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - } - ] - }, - "interfaces": [ - { - "mac": "00:25:90:67:9D:25", - "max_speed": 1000, - "name": "eth1", - "current_speed": null - }, - { - "name": "eth0", - "ip": "172.18.67.173", - "netmask": "255.255.255.240", - "mac": "00:25:90:67:9D:24", - "max_speed": 1000, - "current_speed": 1000 - } - ], - "disks": [ - { - "model": "TOSHIBA MK1002TS", - "name": "sdb", - "disk": "sdb", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sda", - "disk": "sda", - "size": 1000204886016 - } - ], - "system": { - "product": "X9SCD", - "family": "To be filled by O.E.M.", - "fqdn": "mc0n2-srt", - "version": "0123456789", - "serial": "0123456789", - "manufacturer": "Supermicro" - }, - "cpu": { - "real": 1, - "total": 8, - "spec": [ - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "ubuntu", - "manufacturer": "Supermicro" - } - }, - { - "pk": 5, - "model": "nailgun.node", - "fields": { - "status": "error", - "error_msg": "You need more money", - "name": "Supermicro X9SCD (error)", - "ip": "172.18.82.135", - "online": true, - "pending_addition": false, - "platform_name": "X9SCD", - "mac": "00:25:90:67:9C:9C", - "meta": { - "memory": { - "slots": 4, - "total": 17179869184, - "maximum_capacity": 34359738368, - "devices": [ - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 4294967296 - } - ] - }, - "interfaces": [ - { - "mac": "00:25:90:67:9C:9D", - "max_speed": 1000, - "name": "eth1", - "current_speed": null - }, - { - "name": "eth0", - "ip": "172.18.82.135", - "netmask": "255.255.255.224", - "mac": "00:25:90:67:9C:9C", - "max_speed": 1000, - "current_speed": 1000 - } - ], - "disks": [ - { - "model": "TOSHIBA MK1002TS", - "name": "sdb", - "disk": "sdb", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sda", - "disk": "sda", - "size": 1000204886016 - } - ], - "system": { - "product": "X9SCD", - "family": "To be filled by O.E.M.", - "fqdn": "mc0n6-srt", - "version": "0123456789", - "serial": "0123456789", - "manufacturer": "Supermicro" - }, - "cpu": { - "real": 1, - "total": 8, - "spec": [ - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - }, - { - "model": "Intel(R) Xeon(R) CPU E31230 @ 3.20GHz", - "frequency": 3201 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "ubuntu", - "manufacturer": "Supermicro" - } - }, - { - "pk": 6, - "model": "nailgun.node", - "fields": { - "status": "discover", - "name": "VirtualBox", - "ip": "10.20.0.63", - "online": true, - "pending_addition": false, - "mac": "08:00:27:22:AB:AA", - "meta": { - "memory": { - "total": 778887168 - }, - "interfaces": [ - { - "name": "eth0", - "ip": "10.20.0.63", - "netmask": "255.255.255.0", - "mac": "08:00:27:22:AB:AA", - "max_speed": 100, - "current_speed": 100 - } - ], - "disks": [ - { - "model": "VBOX HARDDISK", - "name": "sda", - "disk": "sda", - "size": 68719476736 - } - ], - "system": { - "serial": "0", - "version": "1.2", - "fqdn": "bootstrap", - "family": "Virtual Machine", - "manufacturer": "VirtualBox" - }, - "cpu": { - "real": 0, - "total": 1, - "spec": [ - { - "model": "Intel(R) Core(TM) i7-2670QM CPU @ 2.20GHz", - "frequency": 2185 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "centos", - "manufacturer": "VirtualBox" - } - }, - { - "pk": 7, - "model": "nailgun.node", - "fields": { - "status": "discover", - "name": "KVM", - "ip": "10.20.0.226", - "online": true, - "pending_addition": false, - "mac": "52:54:00:0E:B8:F5", - "meta": { - "memory": { - "slots": 1, - "total": 10737418240, - "maximum_capacity": 10737418240, - "devices": [ - { - "type": "RAM", - "size": 10737418240 - } - ] - }, - "interfaces": [ - { - "name": "eth0", - "ip": "10.20.0.226", - "netmask": "255.255.255.0", - "mac": "52:54:00:0E:B8:F5", - "max_speed": 100, - "current_speed": 100 - } - ], - "disks": [ - { - "model": "QEMU HARDDISK", - "name": "sda", - "disk": "sda", - "size": 68719476736 - } - ], - "system": { - "fqdn": "bootstrap", - "manufacturer": "KVM" - }, - "cpu": { - "real": 0, - "total": 1, - "spec": [ - { - "model": "QEMU Virtual CPU version 1.0", - "frequency": 1999 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "centos", - "manufacturer": "KVM" - } - }, - { - "pk": 8, - "model": "nailgun.node", - "fields": { - "status": "discover", - "name": "Supermicro X9DRW (srv07)", - "ip": "172.18.67.170", - "online": true, - "pending_addition": false, - "fqdn": "slave-15.domain.tld", - "platform_name": "X9DRW", - "mac": "00:25:90:6A:B1:84", - "meta": { - "cpu": { - "real": 2, - "total": 24, - "spec": [ - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - }, - { - "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz", - "frequency": 2001 - } - ] - }, - "interfaces": [ - { - "name": "p2p1", - "ip": "172.18.67.170", - "netmask": "255.255.255.240", - "mac": "00:25:90:6A:B1:84", - "max_speed": 1000, - "current_speed": 1000 - }, - { - "mac": "00:25:90:6A:B1:85", - "max_speed": 1000, - "name": "p2p2", - "current_speed": null - } - ], - "disks": [ - { - "model": "Virtual HDisk0", - "name": "sdf", - "disk": "sdf", - "size": 0 - }, - { - "model": "Virtual Floppy0", - "name": "sde", - "disk": "sde", - "size": 0 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sdd", - "disk": "sdd", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sdc", - "disk": "sdc", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sdb", - "disk": "sdb", - "size": 1000204886016 - }, - { - "model": "TOSHIBA MK1002TS", - "name": "sda", - "disk": "sda", - "size": 1000204886016 - } - ], - "system": { - "product": "X9DRW", - "family": "To be filled by O.E.M.", - "fqdn": "srv07-srt.srt.mirantis.net", - "version": "0123456789", - "serial": "0123456789", - "manufacturer": "Supermicro" - }, - "memory": { - "slots": 8, - "total": 137438953472, - "maximum_capacity": 274877906944, - "devices": [ - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - }, - { - "frequency": 1333, - "type": "DDR3", - "size": 8589934592 - } - ] - } - }, - "timestamp": "", - "progress": 0, - "pending_deletion": false, - "os_platform": "ubuntu", - "manufacturer": "Supermicro" - } - } -] diff --git a/nailgun/nailgun/fixtures/start_notification.json b/nailgun/nailgun/fixtures/start_notification.json deleted file mode 100644 index e4ed6a1d9..000000000 --- a/nailgun/nailgun/fixtures/start_notification.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "pk": 1, - "model": "nailgun.notification", - "fields": { - "topic": "done", - "datetime": "", - "message": "Master node installation has been completed successfully. Now you can boot new nodes over PXE, they will be discovered and become available for installing OpenStack on them" - } - } -] \ No newline at end of file diff --git a/nailgun/nailgun/fsm/__init__.py b/nailgun/nailgun/fsm/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/fsm/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/fsm/state_list.py b/nailgun/nailgun/fsm/state_list.py deleted file mode 100644 index 015261863..000000000 --- a/nailgun/nailgun/fsm/state_list.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -class StateList: - def __init__(self, *state_list): - self.state_list = state_list - self.__dict__.update(dict(zip(state_list, state_list))) - - def all_exclude(self, excluded_states): - return filter( - lambda state: not state in excluded_states, - self.state_list) diff --git a/nailgun/nailgun/keepalive/__init__.py b/nailgun/nailgun/keepalive/__init__.py deleted file mode 100644 index 73ec948c6..000000000 --- a/nailgun/nailgun/keepalive/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -from watcher import KeepAliveThread - -keep_alive = KeepAliveThread() diff --git a/nailgun/nailgun/keepalive/watcher.py b/nailgun/nailgun/keepalive/watcher.py deleted file mode 100644 index f1573217b..000000000 --- a/nailgun/nailgun/keepalive/watcher.py +++ /dev/null @@ -1,84 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from datetime import datetime -from datetime import timedelta -from itertools import repeat -from sqlalchemy.sql import not_ -import threading -import time -import traceback - -from nailgun.api.models import Node -from nailgun.db import db -from nailgun.logger import logger -from nailgun import notifier -from nailgun.settings import settings - - -class KeepAliveThread(threading.Thread): - - def __init__(self, interval=None, timeout=None): - super(KeepAliveThread, self).__init__() - self.stop_status_checking = threading.Event() - self.interval = interval or settings.KEEPALIVE['interval'] - self.timeout = timeout or settings.KEEPALIVE['timeout'] - - def reset_nodes_timestamp(self): - db().query(Node).update({'timestamp': datetime.now()}) - db().commit() - - def join(self, timeout=None): - self.stop_status_checking.set() - super(KeepAliveThread, self).join(timeout) - - def sleep(self, interval=None): - map( - lambda i: not self.stop_status_checking.isSet() and time.sleep(i), - repeat(1, interval or self.interval) - ) - - def run(self): - while True: - try: - self.reset_nodes_timestamp() - while not self.stop_status_checking.isSet(): - self.update_status_nodes() - self.sleep() - except Exception: - logger.error(traceback.format_exc()) - time.sleep(1) - - if self.stop_status_checking.isSet(): - break - - def update_status_nodes(self): - to_update = db().query(Node).filter( - not_(Node.status == 'provisioning') - ).filter( - datetime.now() > (Node.timestamp + timedelta(seconds=self.timeout)) - ).filter_by( - online=True - ) - for node_db in to_update: - notifier.notify( - "error", - u"Node '{0}' has gone away".format( - node_db.human_readable_name), - node_id=node_db.id - ) - to_update.update({"online": False}) - db().commit() diff --git a/nailgun/nailgun/logger.py b/nailgun/nailgun/logger.py deleted file mode 100644 index cbf06913d..000000000 --- a/nailgun/nailgun/logger.py +++ /dev/null @@ -1,99 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import logging -from logging.handlers import WatchedFileHandler -from StringIO import StringIO - -from nailgun.settings import settings - -logger = logging.getLogger("nailgun") -api_logger = logging.getLogger("nailgun-api") - -SERVER_ERROR_MSG = '500 Internal Server Error' -DATEFORMAT = '%Y-%m-%d %H:%M:%S' -LOGFORMAT = '%(asctime)s %(levelname)s (%(module)s) %(message)s' - - -class WriteLogger(logging.Logger, object): - - def __init__(self, logger, level=logging.DEBUG): - super(WriteLogger, self).__init__(logger) - self.logger = logger - - def write(self, message): - if message.strip() != '': - self.logger(message) - - -class HTTPLoggerMiddleware(object): - def __init__(self, application): - self.application = application - log_file = WatchedFileHandler(settings.API_LOG) - log_format = logging.Formatter(LOGFORMAT, DATEFORMAT) - log_file.setFormatter(log_format) - api_logger.setLevel(logging.DEBUG) - api_logger.addHandler(log_file) - - def __call__(self, env, start_response): - env['wsgi.errors'] = WriteLogger(api_logger.error) - self.__logging_request(env) - - def start_response_with_logging(status, headers, *args): - self.__logging_response(env, status) - return start_response(status, headers, *args) - - return self.application(env, start_response_with_logging) - - def __logging_response(self, env, response_code): - response_info = "Response code '%s' for %s %s from %s:%s" % ( - response_code, - env['REQUEST_METHOD'], - env['REQUEST_URI'], - self.__get_remote_ip(env), - env['REMOTE_PORT'], - ) - - if response_code == SERVER_ERROR_MSG: - api_logger.error(response_info) - else: - api_logger.debug(response_info) - - def __logging_request(self, env): - length = int(env.get('CONTENT_LENGTH', 0)) - body = '' - - if length != 0: - body = env['wsgi.input'].read(length) - env['wsgi.input'] = StringIO(body) - - request_info = "Request %s %s from %s:%s %s" % ( - env['REQUEST_METHOD'], - env['REQUEST_URI'], - self.__get_remote_ip(env), - env['REMOTE_PORT'], - body - ) - - api_logger.debug(request_info) - - def __get_remote_ip(self, env): - if 'HTTP_X_REAL_IP' in env: - return env['HTTP_X_REAL_IP'] - elif 'REMOTE_ADDR' in env: - return env['REMOTE_ADDR'] - else: - return 'can not determine ip' diff --git a/nailgun/nailgun/network/__init__.py b/nailgun/nailgun/network/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/network/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/network/manager.py b/nailgun/nailgun/network/manager.py deleted file mode 100644 index baba02d91..000000000 --- a/nailgun/nailgun/network/manager.py +++ /dev/null @@ -1,850 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from itertools import chain -from itertools import ifilter -from itertools import imap -from itertools import islice -import math - -from netaddr import IPAddress -from netaddr import IPNetwork -from netaddr import IPRange -from netaddr import IPSet -from sqlalchemy.sql import not_ - -from nailgun.api.models import Cluster -from nailgun.api.models import IPAddr -from nailgun.api.models import IPAddrRange -from nailgun.api.models import Network -from nailgun.api.models import NetworkAssignment -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.api.models import NodeNICInterface -from nailgun.api.models import Vlan -from nailgun.db import db -from nailgun.errors import errors -from nailgun.logger import logger -from nailgun.settings import settings - - -class NetworkManager(object): - - def update_ranges_from_cidr(self, network_group, cidr): - """Update network ranges for cidr - """ - db().query(IPAddrRange).filter_by( - network_group_id=network_group.id).delete() - - new_cidr = IPNetwork(cidr) - ip_range = IPAddrRange( - network_group_id=network_group.id, - first=str(new_cidr[2]), - last=str(new_cidr[-2])) - - db().add(ip_range) - db().commit() - - def get_admin_network_id(self, fail_if_not_found=True): - '''Method for receiving Admin Network ID. - - :param fail_if_not_found: Raise an error - if admin network is not found in database. - :type fail_if_not_found: bool - :returns: Admin Network ID or None. - :raises: errors.AdminNetworkNotFound - ''' - admin_net = db().query(Network).filter_by( - name="fuelweb_admin" - ).first() - if not admin_net and fail_if_not_found: - raise errors.AdminNetworkNotFound() - return admin_net.id - - def create_network_groups(self, cluster_id): - '''Method for creation of network groups for cluster. - - :param cluster_id: Cluster database ID. - :type cluster_id: int - :returns: None - :raises: errors.OutOfVLANs, errors.OutOfIPs, - errors.NoSuitableCIDR - ''' - used_nets = [] - used_vlans = [] - - cluster_db = db().query(Cluster).get(cluster_id) - - networks_metadata = cluster_db.release.networks_metadata - - def _free_vlans(): - free_vlans = set( - range( - int(settings.VLANS_RANGE_START), - int(settings.VLANS_RANGE_END) - ) - ) - set(used_vlans) - if not free_vlans or len(free_vlans) < len(networks_metadata): - raise errors.OutOfVLANs() - return sorted(list(free_vlans)) - - public_vlan = _free_vlans()[0] - used_vlans.append(public_vlan) - for network in networks_metadata: - free_vlans = _free_vlans() - vlan_start = public_vlan if network['access'] == 'public' \ - else free_vlans[0] - - logger.debug("Found free vlan: %s", vlan_start) - pool = settings.NETWORK_POOLS[network['access']] - if not pool: - raise errors.InvalidNetworkAccess( - u"Invalid access '{0}' for network '{1}'".format( - network['access'], - network['name'] - ) - ) - nets_free_set = IPSet(pool) -\ - IPSet(settings.NET_EXCLUDE) -\ - IPSet( - IPRange( - settings.ADMIN_NETWORK["first"], - settings.ADMIN_NETWORK["last"] - ) - ) -\ - IPSet(used_nets) - if not nets_free_set: - raise errors.OutOfIPs() - - free_cidrs = sorted(list(nets_free_set._cidrs)) - new_net = None - for fcidr in free_cidrs: - for n in fcidr.subnet(24, count=1): - new_net = n - break - if new_net: - break - if not new_net: - raise errors.NoSuitableCIDR() - - new_ip_range = IPAddrRange( - first=str(new_net[2]), - last=str(new_net[-2]) - ) - - nw_group = NetworkGroup( - release=cluster_db.release.id, - name=network['name'], - access=network['access'], - cidr=str(new_net), - netmask=str(new_net.netmask), - gateway=str(new_net[1]), - cluster_id=cluster_id, - vlan_start=vlan_start, - amount=1 - ) - db().add(nw_group) - db().commit() - nw_group.ip_ranges.append(new_ip_range) - db().commit() - self.create_networks(nw_group) - - used_vlans.append(vlan_start) - used_nets.append(str(new_net)) - - def create_networks(self, nw_group): - '''Method for creation of networks for network group. - - :param nw_group: NetworkGroup object. - :type nw_group: NetworkGroup - :returns: None - ''' - fixnet = IPNetwork(nw_group.cidr) - subnet_bits = int(math.ceil(math.log(nw_group.network_size, 2))) - logger.debug("Specified network size requires %s bits", subnet_bits) - subnets = list(fixnet.subnet(32 - subnet_bits, - count=nw_group.amount)) - logger.debug("Base CIDR sliced on subnets: %s", subnets) - - for net in nw_group.networks: - logger.debug("Deleting old network with id=%s, cidr=%s", - net.id, net.cidr) - ips = db().query(IPAddr).filter( - IPAddr.network == net.id - ).all() - map(db().delete, ips) - db().delete(net) - db().commit() - # Dmitry's hack for clearing VLANs without networks - self.clear_vlans() - db().commit() - nw_group.networks = [] - - for n in xrange(nw_group.amount): - vlan_id = None - if nw_group.vlan_start is not None: - vlan_db = db().query(Vlan).get(nw_group.vlan_start + n) - if vlan_db: - logger.warning("Intersection with existing vlan_id: %s", - vlan_db.id) - else: - vlan_db = Vlan(id=nw_group.vlan_start + n) - db().add(vlan_db) - vlan_id = vlan_db.id - logger.debug("Created VLAN object, vlan_id=%s", vlan_id) - gateway = None - if nw_group.gateway: - gateway = nw_group.gateway - net_db = Network( - release=nw_group.release, - name=nw_group.name, - access=nw_group.access, - cidr=str(subnets[n]), - vlan_id=vlan_id, - gateway=gateway, - network_group_id=nw_group.id) - db().add(net_db) - db().commit() - - def assign_admin_ips(self, node_id, num=1): - '''Method for assigning admin IP addresses to nodes. - - :param node_id: Node database ID. - :type node_id: int - :param num: Number of IP addresses for node. - :type num: int - :returns: None - ''' - admin_net_id = self.get_admin_network_id() - node_admin_ips = db().query(IPAddr).filter_by( - node=node_id, - network=admin_net_id - ).all() - - if not node_admin_ips or len(node_admin_ips) < num: - admin_net = db().query(Network).get(admin_net_id) - logger.debug( - u"Trying to assign admin ips: node=%s count=%s", - node_id, - num - len(node_admin_ips) - ) - free_ips = self.get_free_ips( - admin_net.network_group.id, - num=num - len(node_admin_ips) - ) - logger.info(len(free_ips)) - for ip in free_ips: - ip_db = IPAddr( - node=node_id, - ip_addr=ip, - network=admin_net_id - ) - db().add(ip_db) - db().commit() - - def assign_ips(self, nodes_ids, network_name): - """Idempotent assignment IP addresses to nodes. - - All nodes passed as first argument get IP address - from network, referred by network_name. - If node already has IP address from this network, - it remains unchanged. If one of the nodes is the - node from other cluster, this func will fail. - - :param node_ids: List of nodes IDs in database. - :type node_ids: list - :param network_name: Network name - :type network_name: str - :returns: None - :raises: Exception, errors.AssignIPError - """ - - cluster_id = db().query(Node).get(nodes_ids[0]).cluster_id - for node_id in nodes_ids: - node = db().query(Node).get(node_id) - if node.cluster_id != cluster_id: - raise Exception( - u"Node id='{0}' doesn't belong to cluster_id='{1}'".format( - node_id, - cluster_id - ) - ) - - network = db().query(Network).join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == cluster_id).\ - filter_by(name=network_name).first() - - if not network: - raise errors.AssignIPError( - u"Network '%s' for cluster_id=%s not found." % - (network_name, cluster_id) - ) - - for node_id in nodes_ids: - node_ips = imap( - lambda i: i.ip_addr, - self._get_ips_except_admin( - node_id=node_id, - network_id=network.id - ) - ) - # check if any of node_ips in required ranges - - ip_already_assigned = False - - for ip in node_ips: - if self.check_ip_belongs_to_net(ip, network): - logger.info( - u"Node id='{0}' already has an IP address " - "inside '{1}' network.".format( - node_id, - network.name - ) - ) - ip_already_assigned = True - break - - if ip_already_assigned: - continue - - # IP address has not been assigned, let's do it - free_ip = self.get_free_ips(network.network_group.id)[0] - ip_db = IPAddr( - network=network.id, - node=node_id, - ip_addr=free_ip - ) - db().add(ip_db) - db().commit() - - def assign_vip(self, cluster_id, network_name): - """Idempotent assignment VirtualIP addresses to cluster. - Returns VIP for given cluster and network. - - It's required for HA deployment to have IP address - not assigned to any of nodes. Currently we need one - VIP per network in cluster. If cluster already has - IP address from this network, it remains unchanged. - If one of the nodes is the node from other cluster, - this func will fail. - - :param cluster_id: Cluster database ID. - :type cluster_id: int - :param network_name: Network name - :type network_name: str - :returns: None - :raises: Exception - """ - - cluster = db().query(Cluster).get(cluster_id) - if not cluster: - raise Exception(u"Cluster id='%s' not found" % cluster_id) - - network = db().query(Network).join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == cluster_id).\ - filter_by(name=network_name).first() - - if not network: - raise Exception(u"Network '%s' for cluster_id=%s not found." % - (network_name, cluster_id)) - - admin_net_id = self.get_admin_network_id() - cluster_ips = [ne.ip_addr for ne in db().query(IPAddr).filter_by( - network=network.id, - node=None - ).filter( - not_(IPAddr.network == admin_net_id) - ).all()] - # check if any of used_ips in required cidr: network.cidr - ips_belongs_to_net = False - for ip in cluster_ips: - if self.check_ip_belongs_to_net(ip, network): - ips_belongs_to_net = True - break - - if ips_belongs_to_net: - vip = cluster_ips[0] - else: - # IP address has not been assigned, let's do it - vip = self.get_free_ips(network.network_group.id)[0] - ne_db = IPAddr(network=network.id, ip_addr=vip) - db().add(ne_db) - db().commit() - return vip - - def clear_vlans(self): - """Removes from DB all Vlans without Networks assigned to them. - """ - map( - db().delete, - db().query(Vlan).filter_by(network=None) - ) - db().commit() - - @classmethod - def _chunked_range(cls, iterable, chunksize=64): - """We want to be able to iterate over iterable chunk by chunk. - We instantiate iter object from itarable. We then yield - iter instance slice in infinite loop. Iter slice starts - from the last used position and finishes on the position - which is offset with chunksize from the last used position. - - :param iterable: Iterable object. - :type iterable: iterable - :param chunksize: Size of chunk to iterate through. - :type chunksize: int - :yields: iterator - :raises: StopIteration - """ - it = iter(iterable) - while True: - s = islice(it, chunksize) - # Here we check if iterator is not empty calling - # next() method which raises StopInteration if - # iter is empty. If iter is not empty we yield - # iterator which is concatenation of fisrt element in - # slice and the ramained elements. - yield chain([s.next()], s) - - def check_ip_belongs_to_net(self, ip_addr, network): - addr = IPAddress(ip_addr) - ipranges = imap( - lambda ir: IPRange(ir.first, ir.last), - network.network_group.ip_ranges - ) - for r in ipranges: - if addr in r: - return True - return False - - def _iter_free_ips(self, network_group): - """Represents iterator over free IP addresses - in all ranges for given Network Group - """ - for ip_addr in ifilter( - lambda ip: db().query(IPAddr).filter_by( - ip_addr=str(ip) - ).first() is None and not ip == network_group.gateway, - chain(*[ - IPRange(ir.first, ir.last) - for ir in network_group.ip_ranges - ]) - ): - yield ip_addr - - def get_free_ips(self, network_group_id, num=1): - """Returns list of free IP addresses for given Network Group - """ - ng = db().query(NetworkGroup).get(network_group_id) - free_ips = [] - for ip in self._iter_free_ips(ng): - free_ips.append(str(ip)) - if len(free_ips) == num: - break - if len(free_ips) < num: - raise errors.OutOfIPs() - return free_ips - - def _get_free_ips_from_range(self, iterable, num=1): - """Method for receiving free IP addresses from range. - - :param iterable: Iterable object with IP addresses. - :type iterable: iterable - :param num: Number of IP addresses to return. - :type num: int - :returns: List of free IP addresses from given range. - :raises: errors.OutOfIPs - """ - free_ips = [] - for chunk in self._chunked_range(iterable): - from_range = set(chunk) - diff = from_range - set( - [i.ip_addr for i in db().query(IPAddr). - filter(IPAddr.ip_addr.in_(from_range))] - ) - while len(free_ips) < num: - try: - free_ips.append(diff.pop()) - except KeyError: - break - if len(free_ips) == num: - return free_ips - raise errors.OutOfIPs() - - def _get_ips_except_admin(self, node_id=None, network_id=None): - """Method for receiving IP addresses for node or network - excluding Admin Network IP address. - - :param node_id: Node database ID. - :type node_id: int - :param network_id: Network database ID. - :type network_id: int - :returns: List of free IP addresses as SQLAlchemy objects. - """ - ips = db().query(IPAddr).order_by(IPAddr.id) - if node_id: - ips = ips.filter_by(node=node_id) - if network_id: - ips = ips.filter_by(network=network_id) - - admin_net_id = self.get_admin_network_id(False) - if admin_net_id: - ips = ips.filter( - not_(IPAddr.network == admin_net_id) - ) - - return ips.all() - - def get_main_nic(self, node_id): - node_db = db().query(Node).get(node_id) - for nic in node_db.interfaces: - if node_db.mac == nic.mac: - return nic.id - # we need at least one interface here - so let's - # take the first one - if node_db.interfaces: - return node_db.interfaces[0].id - - def clear_all_allowed_networks(self, node_id): - node_db = db().query(Node).get(node_id) - for nic in node_db.interfaces: - while nic.allowed_networks: - nic.allowed_networks.pop() - db().commit() - - def clear_assigned_networks(self, node_id): - node_db = db().query(Node).get(node_id) - for nic in node_db.interfaces: - while nic.assigned_networks: - nic.assigned_networks.pop() - db().commit() - - def get_cluster_networkgroups_by_node(self, node_id): - """Method for receiving cluster network groups by node. - - :param node: Node object. - :type node: Node - :returns: List of network groups for cluster node belongs to. - """ - node_db = db().query(Node).get(node_id) - if node_db.cluster: - return [ng.id for ng in node_db.cluster.network_groups] - return [] - - def allow_network_assignment_to_all_interfaces(self, node_id): - """Method adds all network groups from cluster - to allowed_networks list for all interfaces - of specified node. - - :param node: Node object. - :type node: Node - """ - node_db = db().query(Node).get(node_id) - for nic in node_db.interfaces: - for net_group_id in self.get_cluster_networkgroups_by_node( - node_id - ): - ng_db = db().query(NetworkGroup).get(net_group_id) - nic.allowed_networks.append(ng_db) - db().commit() - - def assign_networks_to_main_interface(self, node_id): - self.clear_assigned_networks(node_id) - main_nic_id = self.get_main_nic(node_id) - if main_nic_id: - main_nic = db().query(NodeNICInterface).get(main_nic_id) - for net_group_id in self.get_cluster_networkgroups_by_node( - node_id - ): - ng_db = db().query(NetworkGroup).get(net_group_id) - main_nic.assigned_networks.append(ng_db) - db().commit() - - def get_node_networks(self, node_id): - """Method for receiving network data for a given node. - - :param node_id: Node database ID. - :type node_id: int - :returns: List of network info for node. - """ - node_db = db().query(Node).get(node_id) - cluster_db = node_db.cluster - if cluster_db is None: - # Node doesn't belong to any cluster, so it should not have nets - return [] - - ips = self._get_ips_except_admin(node_id=node_id) - network_data = [] - network_ids = [] - for i in ips: - net = db().query(Network).get(i.network) - interface = self._get_interface_by_network_name( - node_db.id, - net.name - ) - - # Get prefix from netmask instead of cidr - # for public network - if net.name == 'public': - network_group = db().query(NetworkGroup).get( - net.network_group_id) - - # Convert netmask to prefix - prefix = str(IPNetwork( - '0.0.0.0/' + network_group.netmask).prefixlen) - netmask = network_group.netmask - else: - prefix = str(IPNetwork(net.cidr).prefixlen) - netmask = str(IPNetwork(net.cidr).netmask) - - network_data.append({ - 'name': net.name, - 'vlan': net.vlan_id, - 'ip': i.ip_addr + '/' + prefix, - 'netmask': netmask, - 'brd': str(IPNetwork(net.cidr).broadcast), - 'gateway': net.gateway, - 'dev': interface.name}) - network_ids.append(net.id) - - # And now let's add networks w/o IP addresses - nets = db().query(Network).join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == cluster_db.id) - if network_ids: - nets = nets.filter(not_(Network.id.in_(network_ids))) - - # For now, we pass information about all networks, - # so these vlans will be created on every node we call this func for - # However it will end up with errors if we precreate vlans in VLAN mode - # in fixed network. We are skipping fixed nets in Vlan mode. - for net in nets.order_by(Network.id).all(): - interface = self._get_interface_by_network_name( - node_db.id, - net.name - ) - - if net.name == 'fixed' and cluster_db.net_manager == 'VlanManager': - continue - network_data.append({ - 'name': net.name, - 'vlan': net.vlan_id, - 'dev': interface.name}) - - network_data.append(self._get_admin_network(node_db)) - - return network_data - - def _update_attrs(self, node_data): - node_db = db().query(Node).get(node_data['id']) - interfaces = node_data['interfaces'] - interfaces_db = node_db.interfaces - for iface in interfaces: - current_iface = filter( - lambda i: i.id == iface['id'], - interfaces_db - )[0] - # Remove all old network's assignment for this interface. - db().query(NetworkAssignment).filter_by( - interface_id=current_iface.id - ).delete() - for net in iface['assigned_networks']: - net_assignment = NetworkAssignment() - net_assignment.network_id = net['id'] - net_assignment.interface_id = current_iface.id - db().add(net_assignment) - db().commit() - return node_db.id - - def update_interfaces_info(self, node_id): - node = db().query(Node).get(node_id) - if "interfaces" not in node.meta: - raise Exception("No interfaces metadata specified for node") - - for interface in node.meta["interfaces"]: - interface_db = db().query(NodeNICInterface).filter_by( - mac=interface['mac']).first() - if interface_db: - self.__update_existing_interface(interface_db.id, interface) - else: - self.__add_new_interface(node, interface) - - self.__delete_not_found_interfaces(node, node.meta["interfaces"]) - - def __add_new_interface(self, node, interface_attrs): - interface = NodeNICInterface() - interface.node_id = node.id - self.__set_interface_attributes(interface, interface_attrs) - db().add(interface) - db().commit() - node.interfaces.append(interface) - - def __update_existing_interface(self, interface_id, interface_attrs): - interface = db().query(NodeNICInterface).get(interface_id) - self.__set_interface_attributes(interface, interface_attrs) - db().commit() - - def __set_interface_attributes(self, interface, interface_attrs): - interface.name = interface_attrs["name"] - interface.mac = interface_attrs["mac"] - - interface.current_speed = interface_attrs.get("current_speed") - interface.max_speed = interface_attrs.get("max_speed") - - def __delete_not_found_interfaces(self, node, interfaces): - interfaces_mac_addresses = map( - lambda interface: interface['mac'], interfaces) - - interfaces_to_delete = db().query(NodeNICInterface).filter( - NodeNICInterface.node_id == node.id).filter( - not_(NodeNICInterface.mac.in_( - interfaces_mac_addresses))).all() - - if interfaces_to_delete: - mac_addresses = ' '.join( - map(lambda i: i.mac, interfaces_to_delete)) - - node_name = node.name or node.mac - logger.info("Interfaces %s removed from node %s" % ( - mac_addresses, node_name)) - - map(db().delete, interfaces_to_delete) - - def get_default_nic_networkgroups(self, node_id, nic_id): - main_nic_id = self.get_main_nic(node_id) - return self.get_all_cluster_networkgroups(node_id) \ - if nic_id == main_nic_id else [] - - def get_all_cluster_networkgroups(self, node_id): - node_db = db().query(Node).get(node_id) - if node_db.cluster: - return [ng.id for ng in node_db.cluster.network_groups] - return [] - - def get_allowed_nic_networkgroups(self, node_id, nic_id): - """nic_id is not used now, but this logic will be improved - in the future, so let it be - """ - return self.get_all_cluster_networkgroups(node_id) - - def _get_admin_network(self, node): - """Node contain mac address which sent ohai, - when node was loaded. By this mac address - we can identify interface name for admin network. - """ - for interface in node.meta.get('interfaces', []): - if interface['mac'] == node.mac: - return { - 'name': u'admin', - 'dev': interface['name']} - - raise errors.CanNotFindInterface() - - def _get_interface_by_network_name(self, node_id, network_name): - """Return network device which has appointed - network with specified network name - """ - node_db = db().query(Node).get(node_id) - for interface in node_db.interfaces: - for network in interface.assigned_networks: - if network.name == network_name: - return interface - - raise errors.CanNotFindInterface() - - def get_end_point_ip(self, cluster_id): - cluster_db = db().query(Cluster).get(cluster_id) - ip = None - if cluster_db.is_ha_mode: - ip = self.assign_vip(cluster_db.id, "public") - elif cluster_db.mode in ('singlenode', 'multinode'): - controller = db().query(Node).filter_by( - cluster_id=cluster_id - ).filter(Node.role_list.any(name='controller')).first() - - public_net = filter( - lambda network: network['name'] == 'public', - controller.network_data)[0] - - if public_net.get('ip'): - ip = public_net['ip'].split('/')[0] - - if not ip: - raise errors.CanNotDetermineEndPointIP( - u'Can not determine end point IP for cluster %s' % - cluster_db.full_name) - - return ip - - def get_horizon_url(self, cluster_id): - return 'http://%s/' % self.get_end_point_ip(cluster_id) - - def get_keystone_url(self, cluster_id): - return 'http://%s:5000/' % self.get_end_point_ip(cluster_id) - - def is_range_in_cidr(self, ip_network, ip_range): - """Takes two objects that represent IP address range - and checks if those ranges are intersecting. - - :arg* IPNetwork, IPRange: - valid object with IP range - :returns bool: - is networks intersecting - :raises ValueError: if arg* neither IPNetwork or IPRange - """ - l_range_addr, r_range_addr = self.get_min_max_addr(ip_range) - l_network_addr, r_network_addr = self.get_min_max_addr(ip_network) - if l_network_addr != l_range_addr: - if l_network_addr < l_range_addr: - return r_network_addr > l_range_addr - else: - return r_range_addr > l_network_addr - else: - return True - - def get_min_max_addr(self, range_object): - """takes object which implicitly has IP range - and returns min and max address as tuple of two IPAddress elements - - :range_object IPNetwork, IPRange: - object with ip range - :return (IPAddress, IPAddress): - """ - if isinstance(range_object, IPRange): - return map( - IPAddress, - str(range_object).split('-') - ) - else: - prefix_length = range_object.prefixlen - bin_addr = range_object.ip.bits().replace('.', '') - min_max_bin_addr = [bin_addr[0:prefix_length] + - x * (32 - prefix_length) for x in ('0', '1')] - return map( - self.bin_to_ip_addr, - min_max_bin_addr - ) - - def bin_to_ip_addr(self, bin): - """converts string of 32 digits to IP address - - :bin str: is binary representation of IP address, must be 32 character - long with ones and zeros (ex: '00101100110011000011001100110011' ) - :returns IPAddress: returns object of IPAddress class - """ - return IPAddress('.'.join( - map( - lambda x: str(int(''.join(x), 2)), - zip(*[iter(bin)] * 8) - ) - ) - ) diff --git a/nailgun/nailgun/network/topology.py b/nailgun/nailgun/network/topology.py deleted file mode 100644 index ae1f328bc..000000000 --- a/nailgun/nailgun/network/topology.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -from nailgun.api.models import Node -from nailgun.db import db - - -class TopoChecker(object): - @classmethod - def _is_assignment_allowed_for_node(cls, node): - db_node = db().query(Node).filter_by(id=node['id']).first() - interfaces = node['interfaces'] - db_interfaces = db_node.interfaces - allowed_network_ids = set([n.id for n in db_node.allowed_networks]) - for iface in interfaces: - db_iface = filter( - lambda i: i.id == iface['id'], - db_interfaces - ) - db_iface = db_iface[0] - for net in iface['assigned_networks']: - if net['id'] not in allowed_network_ids: - return False - return True - - @classmethod - def is_assignment_allowed(cls, data): - for node in data: - if not cls._is_assignment_allowed_for_node(node): - return False - return True - - @classmethod - def resolve_topo_conflicts(cls, data): - raise NotImplementedError("Will be implemented later") diff --git a/nailgun/nailgun/notifier.py b/nailgun/nailgun/notifier.py deleted file mode 100644 index f29e7b6d0..000000000 --- a/nailgun/nailgun/notifier.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from datetime import datetime - -from nailgun.api.models import Notification -from nailgun.api.models import Task -from nailgun.db import db -from nailgun.errors import errors -from nailgun.logger import logger - - -def notify(topic, message, - cluster_id=None, node_id=None, task_uuid=None): - if topic == 'discover' and node_id is None: - raise errors.CannotFindNodeIDForDiscovering( - "No node id in discover notification") - task = None - if task_uuid: - task = db().query(Task).filter_by(uuid=task_uuid).first() - - exist = None - if node_id and task: - exist = db().query(Notification).filter_by( - node_id=node_id, - message=message, - task=task - ).first() - - if not exist: - notification = Notification() - notification.topic = topic - notification.message = message - notification.cluster_id = cluster_id - notification.node_id = node_id - if task: - notification.task_id = task.id - notification.datetime = datetime.now() - db().add(notification) - db().commit() - logger.info( - "Notification: topic: %s message: %s" % (topic, message) - ) diff --git a/nailgun/nailgun/orchestrator/__init__.py b/nailgun/nailgun/orchestrator/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/orchestrator/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py deleted file mode 100644 index 3cf0ec515..000000000 --- a/nailgun/nailgun/orchestrator/deployment_serializers.py +++ /dev/null @@ -1,467 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -"""Deployment serializers for orchestrator""" - -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.db import db -from nailgun.errors import errors -from nailgun.network.manager import NetworkManager -from nailgun.settings import settings -from nailgun.task.helpers import TaskHelper -from netaddr import IPNetwork -from sqlalchemy import and_ - - -class Priority(object): - """Node with priority 0 will be deployed first. - We have step equal 100 because we want to allow - user redefine deployment order and he can use free space - between prioriries. - """ - - def __init__(self): - self.step = 100 - self.priority = 0 - - @property - def next(self): - self.priority += self.step - return self.priority - - @property - def current(self): - return self.priority - - -class OrchestratorSerializer(object): - """Base class for orchestrator searilization.""" - - @classmethod - def serialize(cls, cluster): - """Method generates facts which - through an orchestrator passes to puppet - """ - common_attrs = cls.get_common_attrs(cluster) - nodes = cls.serialize_nodes(cls.get_nodes_to_serialization(cluster)) - - if cluster.net_manager == 'VlanManager': - cls.add_vlan_interfaces(nodes) - - cls.set_deployment_priorities(nodes) - - # Merge attributes of nodes with common attributes - def merge(dict1, dict2): - return dict(dict1.items() + dict2.items()) - - return map( - lambda node: merge(node, common_attrs), - nodes) - - @classmethod - def get_common_attrs(cls, cluster): - """Common attributes for all facts - """ - attrs = cls.serialize_cluster_attrs(cluster) - - attrs['controller_nodes'] = cls.controller_nodes(cluster) - attrs['nodes'] = cls.node_list(cls.get_nodes_to_serialization(cluster)) - - for node in attrs['nodes']: - if node['role'] in 'cinder': - attrs['use_cinder'] = True - - return attrs - - @classmethod - def serialize_cluster_attrs(cls, cluster): - """Cluster attributes - """ - attrs = cluster.attributes.merged_attrs_values() - attrs['deployment_mode'] = cluster.mode - attrs['deployment_id'] = cluster.id - attrs['master_ip'] = settings.MASTER_IP - attrs['novanetwork_parameters'] = cls.novanetwork_attrs(cluster) - attrs.update(cls.network_ranges(cluster)) - - return attrs - - @classmethod - def get_nodes_to_serialization(cls, cluster): - """Nodes which need to serialize - """ - return db().query(Node).filter( - and_(Node.cluster == cluster, - False == Node.pending_deletion)).order_by(Node.id) - - @classmethod - def novanetwork_attrs(cls, cluster): - """Network configuration - """ - attrs = {} - attrs['network_manager'] = cluster.net_manager - - fixed_net = db().query(NetworkGroup).filter_by( - cluster_id=cluster.id).filter_by(name='fixed').first() - - # network_size is required for all managers, otherwise - # puppet will use default (255) - attrs['network_size'] = fixed_net.network_size - if attrs['network_manager'] == 'VlanManager': - attrs['num_networks'] = fixed_net.amount - attrs['vlan_start'] = fixed_net.vlan_start - - return attrs - - @classmethod - def add_vlan_interfaces(cls, nodes): - """Assign fixed_interfaces and vlan_interface. - They should be equal. - """ - netmanager = NetworkManager() - for node in nodes: - node_db = db().query(Node).get(node['uid']) - - fixed_interface = netmanager._get_interface_by_network_name( - node_db.id, 'fixed') - - node['fixed_interface'] = fixed_interface.name - node['vlan_interface'] = fixed_interface.name - - @classmethod - def network_ranges(cls, cluster): - """Returns ranges for network groups - except range for public network - """ - ng_db = db().query(NetworkGroup).filter_by(cluster_id=cluster.id).all() - attrs = {} - for net in ng_db: - net_name = net.name + '_network_range' - - if net.name == 'floating': - attrs[net_name] = cls.get_ip_ranges_first_last(net) - elif net.name == 'public': - # We shouldn't pass public_network_range attribute - continue - else: - attrs[net_name] = net.cidr - - return attrs - - @classmethod - def get_ip_ranges_first_last(cls, network_group): - """Get all ip ranges in "10.0.0.0-10.0.0.255" format - """ - return [ - "{0}-{1}".format(ip_range.first, ip_range.last) - for ip_range in network_group.ip_ranges - ] - - @classmethod - def controller_nodes(cls, cluster): - """Serialize nodes in same format - as cls.node_list do that but only - controller nodes. - """ - nodes = cls.get_nodes_to_serialization(cluster) - - # If role has more than one role - # then node_list return serialized node - # for each role - ctrl_nodes = filter( - lambda n: n['role'] == 'controller', - cls.node_list(nodes)) - - return ctrl_nodes - - @classmethod - def serialize_nodes(cls, nodes): - """Serialize node for each role. - For example if node has two roles then - in orchestrator will be passed two serialized - nodes. - """ - serialized_nodes = [] - for node in nodes: - for role in set(node.pending_roles + node.roles): - serialized_node = cls.serialize_node(node, role) - serialized_nodes.append(serialized_node) - - return serialized_nodes - - @classmethod - def serialize_node(cls, node, role): - """Serialize node, then it will be - merged with common attributes - """ - network_data = node.network_data - interfaces = cls.configure_interfaces(network_data) - cls.__add_hw_interfaces(interfaces, node.meta['interfaces']) - node_attrs = { - # Yes, uid is really should be a string - 'uid': str(node.id), - 'fqdn': node.fqdn, - 'status': node.status, - 'role': role, - - # Interfaces assingment - 'network_data': interfaces, - - # TODO (eli): need to remove, requried - # for fucking fake thread only - 'online': node.online, - } - node_attrs.update(cls.interfaces_list(network_data)) - - return node_attrs - - @classmethod - def node_list(cls, nodes): - """Generate nodes list. Represents - as "nodes" parameter in facts. - """ - node_list = [] - - for node in nodes: - network_data = node.network_data - - for role in set(node.pending_roles + node.roles): - node_list.append({ - # Yes, uid is really should be a string - 'uid': str(node.id), - 'fqdn': node.fqdn, - 'name': TaskHelper.make_slave_name(node.id), - 'role': role, - - # Addresses - 'internal_address': cls.get_addr(network_data, - 'management')['ip'], - 'internal_netmask': cls.get_addr(network_data, - 'management')['netmask'], - 'storage_address': cls.get_addr(network_data, - 'storage')['ip'], - 'storage_netmask': cls.get_addr(network_data, - 'storage')['netmask'], - 'public_address': cls.get_addr(network_data, - 'public')['ip'], - 'public_netmask': cls.get_addr(network_data, - 'public')['netmask']}) - - return node_list - - @classmethod - def get_addr(cls, network_data, name): - """Get addr for network by name - """ - nets = filter( - lambda net: net['name'] == name, - network_data) - - if not nets or 'ip' not in nets[0]: - raise errors.CanNotFindNetworkForNode( - 'Cannot find network with name: %s' % name) - - net = nets[0]['ip'] - return { - 'ip': str(IPNetwork(net).ip), - 'netmask': str(IPNetwork(net).netmask) - } - - @classmethod - def interfaces_list(cls, network_data): - """Generate list of interfaces - """ - interfaces = {} - for network in network_data: - interfaces['%s_interface' % network['name']] = \ - cls.__make_interface_name( - network.get('dev'), - network.get('vlan')) - - return interfaces - - @classmethod - def configure_interfaces(cls, network_data): - """Configre interfaces - """ - interfaces = {} - for network in network_data: - network_name = network['name'] - - # floating and public are on the same interface - # so, just skip floating - if network_name == 'floating': - continue - - name = cls.__make_interface_name(network.get('dev'), - network.get('vlan')) - - if name not in interfaces: - interfaces[name] = { - 'interface': name, - 'ipaddr': [], - '_name': network_name} - - interface = interfaces[name] - - if network_name == 'admin': - interface['ipaddr'] = 'dhcp' - elif network.get('ip'): - interface['ipaddr'].append(network.get('ip')) - - # Add gateway for public - if network_name == 'public' and network.get('gateway'): - interface['gateway'] = network['gateway'] - - if len(interface['ipaddr']) == 0: - interface['ipaddr'] = 'none' - - interfaces['lo'] = {'interface': 'lo', 'ipaddr': ['127.0.0.1/8']} - - return interfaces - - @classmethod - def by_role(cls, nodes, role): - return filter(lambda node: node['role'] == role, nodes) - - @classmethod - def not_roles(cls, nodes, roles): - return filter(lambda node: node['role'] not in roles, nodes) - - @classmethod - def set_deployment_priorities(cls, nodes): - """Set priorities of deployment.""" - prior = Priority() - - for n in cls.by_role(nodes, 'controller'): - n['priority'] = prior.next - - other_nodes_prior = prior.next - for n in cls.not_roles(nodes, 'controller'): - n['priority'] = other_nodes_prior - - @classmethod - def __make_interface_name(cls, name, vlan): - """Make interface name - """ - if name and vlan: - return '.'.join([name, str(vlan)]) - return name - - @classmethod - def __add_hw_interfaces(cls, interfaces, hw_interfaces): - """Add interfaces which not represents in - interfaces list but they are represented on node - """ - for hw_interface in hw_interfaces: - if hw_interface['name'] not in interfaces: - interfaces[hw_interface['name']] = { - 'interface': hw_interface['name'], - 'ipaddr': "none" - } - - -class OrchestratorHASerializer(OrchestratorSerializer): - - @classmethod - def node_list(cls, nodes): - """Node list - """ - node_list = super(OrchestratorHASerializer, cls).node_list(nodes) - - for node in node_list: - node['swift_zone'] = node['uid'] - - return node_list - - @classmethod - def get_common_attrs(cls, cluster): - """Common attributes for all facts - """ - common_attrs = super(OrchestratorHASerializer, cls).get_common_attrs( - cluster) - - netmanager = NetworkManager() - common_attrs['management_vip'] = netmanager.assign_vip( - cluster.id, 'management') - common_attrs['public_vip'] = netmanager.assign_vip( - cluster.id, 'public') - - common_attrs['last_controller'] = sorted( - common_attrs['controller_nodes'], - key=lambda node: node['uid'])[-1]['name'] - - first_controller = filter( - lambda node: 'controller' in node['role'], - common_attrs['nodes'])[0] - - first_controller['role'] = 'primary-controller' - - common_attrs['mp'] = [ - {'point': '1', 'weight': '1'}, - {'point': '2', 'weight': '2'}] - - common_attrs['mountpoints'] = '1 1\\n2 2\\n' - - return common_attrs - - @classmethod - def set_deployment_priorities(cls, nodes): - """Set priorities of deployment for HA mode.""" - prior = Priority() - - primary_swift_proxy_piror = prior.next - for n in cls.by_role(nodes, 'primary-swift-proxy'): - n['priority'] = primary_swift_proxy_piror - - swift_proxy_prior = prior.next - for n in cls.by_role(nodes, 'swift-proxy'): - n['priority'] = swift_proxy_prior - - storage_prior = prior.next - for n in cls.not_roles(nodes, 'storage'): - n['priority'] = storage_prior - - # Controllers deployed one by one - for n in cls.by_role(nodes, 'primary-controller'): - n['priority'] = prior.next - - for n in cls.by_role(nodes, 'controller'): - n['priority'] = prior.next - - other_nodes_prior = prior.next - for n in cls.not_roles(nodes, ['primary-swift-proxy', - 'swift-proxy', - 'storage', - 'primary-controller', - 'controller', - 'quantum']): - n['priority'] = other_nodes_prior - - -def serialize(cluster): - """Serialization depends on deployment mode - """ - cluster.prepare_for_deployment() - - if cluster.mode == 'multinode': - serializer = OrchestratorSerializer - elif cluster.is_ha_mode: - # Same serializer for all ha - serializer = OrchestratorHASerializer - - return serializer.serialize(cluster) diff --git a/nailgun/nailgun/orchestrator/provisioning_serializers.py b/nailgun/nailgun/orchestrator/provisioning_serializers.py deleted file mode 100644 index 59f6c97cd..000000000 --- a/nailgun/nailgun/orchestrator/provisioning_serializers.py +++ /dev/null @@ -1,163 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -"""Provisioning serializers for orchestrator""" - -import json - -from nailgun.api.models import IPAddr -from nailgun.db import db -from nailgun.logger import logger -from nailgun.network.manager import NetworkManager -from nailgun.settings import settings -from nailgun.task.helpers import TaskHelper - - -class ProvisioningSerializer(object): - """Provisioning serializer""" - - @classmethod - def serialize(cls, cluster): - """Serialize cluster for provisioning.""" - - serialized_nodes = cls.serialize_nodes(cluster) - - return { - 'engine': { - 'url': settings.COBBLER_URL, - 'username': settings.COBBLER_USER, - 'password': settings.COBBLER_PASSWORD}, - 'nodes': serialized_nodes} - - @classmethod - def serialize_nodes(cls, cluster): - """Serialize nodes.""" - nodes_to_provision = TaskHelper.nodes_to_provision(cluster) - cluster_attrs = cluster.attributes.merged_attrs_values() - - serialized_nodes = [] - for node in nodes_to_provision: - serialized_node = cls.serialize_node(cluster_attrs, node) - serialized_nodes.append(serialized_node) - - return serialized_nodes - - @classmethod - def serialize_node(cls, cluster_attrs, node): - """Serialize a single node.""" - - serialized_node = { - 'power_address': node.ip, - 'name': TaskHelper.make_slave_name(node.id), - 'hostname': node.fqdn, - 'power_pass': cls.get_ssh_key_path(node), - - 'profile': cluster_attrs['cobbler']['profile'], - 'power_type': 'ssh', - 'power_user': 'root', - 'name_servers': '\"%s\"' % settings.DNS_SERVERS, - 'name_servers_search': '\"%s\"' % settings.DNS_SEARCH, - 'netboot_enabled': '1', - 'ks_meta': { - 'ks_spaces': "\"%s\"" % json.dumps( - node.attributes.volumes).replace("\"", "\\\""), - - 'puppet_auto_setup': 1, - 'puppet_master': settings.PUPPET_MASTER_HOST, - 'puppet_version': settings.PUPPET_VERSION, - 'puppet_enable': 0, - 'mco_auto_setup': 1, - 'install_log_2_syslog': 1, - 'mco_pskey': settings.MCO_PSKEY, - 'mco_vhost': settings.MCO_VHOST, - 'mco_host': settings.MCO_HOST, - 'mco_user': settings.MCO_USER, - 'mco_password': settings.MCO_PASSWORD, - 'mco_connector': settings.MCO_CONNECTOR, - 'mco_enable': 1, - 'auth_key': "\"%s\"" % cluster_attrs.get('auth_key', '')}} - - serialized_node.update(cls.serialize_interfaces(node)) - - return serialized_node - - @classmethod - def serialize_interfaces(cls, node): - interfaces = {} - interfaces_extra = {} - admin_ips = cls.get_admin_ips(node) - - for interface in node.meta.get('interfaces', []): - name = interface['name'] - - interfaces[name] = { - 'mac_address': interface['mac'], - 'static': '0', - 'netmask': settings.ADMIN_NETWORK['netmask'], - 'ip_address': admin_ips.pop()} - - # interfaces_extra field in cobbler ks_meta - # means some extra data for network interfaces - # configuration. It is used by cobbler snippet. - # For example, cobbler interface model does not - # have 'peerdns' field, but we need this field - # to be configured. So we use interfaces_extra - # branch in order to set this unsupported field. - interfaces_extra[name] = { - 'peerdns': 'no', - 'onboot': 'no'} - - # We want node to be able to PXE boot via any of its - # interfaces. That is why we add all discovered - # interfaces into cobbler system. But we want - # assignted fqdn to be resolved into one IP address - # because we don't completely support multiinterface - # configuration yet. - if interface['mac'] == node.mac: - interfaces[name]['dns_name'] = node.fqdn - interfaces_extra[name]['onboot'] = 'yes' - - return { - 'interfaces': interfaces, - 'interfaces_extra': interfaces_extra} - - @classmethod - def get_admin_ips(cls, node): - netmanager = NetworkManager() - admin_net_id = netmanager.get_admin_network_id() - admin_ips = set([ - i.ip_addr for i in db().query(IPAddr). - filter_by(node=node.id). - filter_by(network=admin_net_id)]) - - return admin_ips - - @classmethod - def get_ssh_key_path(cls, node): - """Assign power pass depend on node state.""" - if node.status == "discover": - logger.info( - u'Node %s seems booted with bootstrap image', node.full_name) - return settings.PATH_TO_BOOTSTRAP_SSH_KEY - - logger.info(u'Node %s seems booted with real system', node.full_name) - return settings.PATH_TO_SSH_KEY - - -def serialize(cluster): - """Serialize cluster for provisioning.""" - cluster.prepare_for_provisioning() - return ProvisioningSerializer.serialize(cluster) diff --git a/nailgun/nailgun/plugin/__init__.py b/nailgun/nailgun/plugin/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/plugin/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/plugin/fsm.py b/nailgun/nailgun/plugin/fsm.py deleted file mode 100644 index 124d56c1a..000000000 --- a/nailgun/nailgun/plugin/fsm.py +++ /dev/null @@ -1,129 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from fysom import Fysom -from nailgun.api.models import Plugin -from nailgun.db import db -from nailgun.fsm.state_list import StateList -from nailgun.logger import logger -import re - - -# All possible states -state = StateList( - 'registered', - 'downloading', - 'downloaded', - 'downloading_error', - - 'initializing', - 'initialized', - 'initializing_error', - - 'running', - 'stopped', - 'deleted', - 'updating' -) - -# All possible transactions between events -s = state -events = [ - {'name': 'install', - 'src': s.registered, - 'dst': s.downloading}, - {'name': 'downloading_error', - 'src': s.downloading, - 'dst': s.downloading_error}, - {'name': 'redownload', - 'src': s.downloading_error, - 'dst': s.downloading}, - {'name': 'delete', - 'src': s.downloading_error, - 'dst': s.deleted}, - {'name': 'downloaded', - 'src': s.downloading, - 'dst': s.downloaded}, - - {'name': 'initialize', - 'src': s.downloaded, - 'dst': s.initializing}, - {'name': 'initialized', - 'src': s.initializing, - 'dst': s.initialized}, - {'name': 'initializing_error', - 'src': s.initializing, - 'dst': s.initializing_error}, - {'name': 'reinitialize', - 'src': s.initializing_error, - 'dst': s.initializing}, - {'name': 'delete', - 'src': s.initializing_error, - 'dst': s.deleted}, - {'name': 'run', - 'src': s.initialized, - 'dst': s.running}, - - {'name': 'stop', - 'src': s.running, - 'dst': s.stopped}, - {'name': 'delete', - 'src': s.stopped, - 'dst': s.deleted}, - {'name': 'run', - 'src': s.stopped, - 'dst': s.running}, -] - - -class PluginFSM(Fysom): - def __init__(self, plugin_id, current_state): - Fysom.__init__(self, { - 'initial': current_state, - 'events': events, - 'callbacks': { - 'oninstall': self.install, - 'oninitialize': self.initialize - } - }) - - self.plugin_id = plugin_id - self.current_state = current_state - self.onchangestate = self._onchangestate - - @property - def is_error(self): - return bool(re.search('_error$', self.current)) - - @property - def plugin(self): - return db().query(Plugin).get(self.plugin_id) - - def _onchangestate(self, event): - logger.debug( - 'Plugin: %s src: %s dst: %s' % - (self.plugin.name, event.src, event.dst)) - - self.plugin.state = event.dst - db().commit() - - def install(self, event): - # Downloading - self.downloaded() - - def initialize(self, event): - # Initializing - self.initialized() diff --git a/nailgun/nailgun/plugin/manager.py b/nailgun/nailgun/plugin/manager.py deleted file mode 100644 index bfd60deda..000000000 --- a/nailgun/nailgun/plugin/manager.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.models import Plugin -from nailgun.api.models import Task -from nailgun.db import db -from nailgun.errors import errors -from nailgun.plugin.fsm import PluginFSM -from nailgun.plugin.thread import get_queue - - -class PluginManager(object): - - def __init__(self): - self.queue = get_queue() - - def add_install_plugin_task(self, plugin_data): - # TODO(NAME): check if plugin already installed - plugin = Plugin( - version=plugin_data['version'], - name=plugin_data['name'], - type=plugin_data['type']) - db().add(plugin) - db().commit() - - task = Task(name='install_plugin', cache={'plugin_id': plugin.id}) - db().add(task) - db().commit() - - self.queue.put(task.uuid) - return task - - def process(self, task_uuid): - task = db().query(Task).filter_by(uuid=task_uuid).first() - plugin_id = task.cache['plugin_id'] - - if task.name == 'install_plugin': - self.install_plugin(plugin_id) - - def install_plugin(self, plugin_id): - plugin_db = db().query(Plugin).get(plugin_id) - plugin = PluginFSM(plugin_db.id, plugin_db.state) - - plugin.install() - if plugin.is_error: - raise errors.PluginDownloading() - - plugin.initialize() - if plugin.is_error: - raise errors.PluginInitialization() - - plugin.run() diff --git a/nailgun/nailgun/plugin/thread.py b/nailgun/nailgun/plugin/thread.py deleted file mode 100644 index e6ea3aa6e..000000000 --- a/nailgun/nailgun/plugin/thread.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from Queue import Queue -import threading -import time -import traceback - -from nailgun.api.models import Task -from nailgun.db import db -from nailgun.logger import logger - -PLUGIN_PROCESSING_QUEUE = None - - -def get_queue(): - global PLUGIN_PROCESSING_QUEUE - if not PLUGIN_PROCESSING_QUEUE: - PLUGIN_PROCESSING_QUEUE = Queue() - - return PLUGIN_PROCESSING_QUEUE - - -class PluginThread(threading.Thread): - """Separate thread. When plugin added in the queue - thread started to processing plugin - """ - def __init__(self): - threading.Thread.__init__(self) - self._stop = threading.Event() - self.queue = get_queue() - - from nailgun.plugin.manager import PluginManager - self.plugin_manager = PluginManager() - - def soft_stop(self): - self._stop.set() - - @property - def stopped(self): - return self._stop.isSet() - - def run(self): - while not self.stopped: - task_uuid = None - try: - if not self.queue.empty(): - task_uuid = self.queue.get_nowait() - self.plugin_manager.process(task_uuid) - except Exception as exc: - if task_uuid: - self.set_error(task_uuid, exc) - logger.error(traceback.format_exc()) - - if self.queue.empty(): - time.sleep(1) - - def set_error(self, task_uuid, msg): - db().query(Task).filter_by(uuid=task_uuid).update({ - 'status': 'error', - 'progress': 100, - 'message': str(msg)}) - db().commit() diff --git a/nailgun/nailgun/rpc/__init__.py b/nailgun/nailgun/rpc/__init__.py deleted file mode 100644 index d2685172e..000000000 --- a/nailgun/nailgun/rpc/__init__.py +++ /dev/null @@ -1,72 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from kombu import Connection -from kombu import Exchange -from kombu import Queue - -from nailgun.logger import logger -from nailgun.settings import settings - -creds = ( - ("userid", "guest"), - ("password", "guest"), - ("hostname", "localhost"), - ("port", "5672"), -) - -conn_str = 'amqp://{0}:{1}@{2}:{3}//'.format( - *[settings.RABBITMQ.get(*cred) for cred in creds] -) - -naily_exchange = Exchange( - 'naily', - 'topic', - durable=True -) - -naily_queue = Queue( - 'naily', - exchange=naily_exchange, - routing_key='naily' -) - -nailgun_exchange = Exchange( - 'nailgun', - 'topic', - durable=True -) - -nailgun_queue = Queue( - 'nailgun', - exchange=nailgun_exchange, - routing_key='nailgun' -) - - -def cast(name, message): - logger.debug( - "RPC cast to orchestrator:\n{0}".format( - json.dumps(message, indent=4) - ) - ) - with Connection(conn_str) as conn: - with conn.Producer(serializer='json') as producer: - producer.publish(message, - exchange=naily_exchange, routing_key=name, - declare=[naily_queue]) diff --git a/nailgun/nailgun/rpc/receiver.py b/nailgun/nailgun/rpc/receiver.py deleted file mode 100644 index 53c709da6..000000000 --- a/nailgun/nailgun/rpc/receiver.py +++ /dev/null @@ -1,826 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import collections -import itertools -import json -import netifaces -import os -import traceback - - -from sqlalchemy import or_ - -from nailgun.api.models import IPAddr -from nailgun.api.models import Node -from nailgun.api.models import Release -from nailgun.api.models import Task -from nailgun.db import db -from nailgun.logger import logger -from nailgun.network.manager import NetworkManager -from nailgun import notifier -from nailgun.settings import settings -from nailgun.task.helpers import TaskHelper - - -class TaskNotFound(Exception): - pass - - -class NailgunReceiver(object): - - @classmethod - def remove_nodes_resp(cls, **kwargs): - logger.info( - "RPC method remove_nodes_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - nodes = kwargs.get('nodes') or [] - error_nodes = kwargs.get('error_nodes') or [] - inaccessible_nodes = kwargs.get('inaccessible_nodes') or [] - error_msg = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - - for node in nodes: - node_db = db().query(Node).get(node['uid']) - if not node_db: - logger.error( - u"Failed to delete node '%s': node doesn't exist", - str(node) - ) - break - db().delete(node_db) - - for node in inaccessible_nodes: - # Nodes which not answered by rpc just removed from db - node_db = db().query(Node).get(node['uid']) - if node_db: - logger.warn( - u'Node %s not answered by RPC, removing from db', - node_db.human_readable_name) - db().delete(node_db) - - for node in error_nodes: - node_db = db().query(Node).get(node['uid']) - if not node_db: - logger.error( - u"Failed to delete node '%s' marked as error from Naily:" - " node doesn't exist", str(node) - ) - break - node_db.pending_deletion = False - node_db.status = 'error' - db().add(node_db) - node['name'] = node_db.name - db().commit() - - success_msg = u"No nodes were removed" - err_msg = u"No errors occurred" - if nodes: - success_msg = u"Successfully removed {0} node(s)".format( - len(nodes) - ) - notifier.notify("done", success_msg) - if error_nodes: - err_msg = u"Failed to remove {0} node(s): {1}".format( - len(error_nodes), - ', '.join( - [n.get('name') or "ID: {0}".format(n['uid']) - for n in error_nodes]) - ) - notifier.notify("error", err_msg) - if not error_msg: - error_msg = ". ".join([success_msg, err_msg]) - - TaskHelper.update_task_status(task_uuid, status, progress, error_msg) - - @classmethod - def remove_cluster_resp(cls, **kwargs): - network_manager = NetworkManager() - logger.info( - "RPC method remove_cluster_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - - cls.remove_nodes_resp(**kwargs) - - task = db().query(Task).filter_by(uuid=task_uuid).first() - cluster = task.cluster - - if task.status in ('ready',): - logger.debug("Removing environment itself") - cluster_name = cluster.name - - nws = itertools.chain( - *[n.networks for n in cluster.network_groups] - ) - ips = db().query(IPAddr).filter( - IPAddr.network.in_([n.id for n in nws]) - ) - map(db().delete, ips) - db().commit() - - db().delete(cluster) - db().commit() - - # Dmitry's hack for clearing VLANs without networks - network_manager.clear_vlans() - - notifier.notify( - "done", - u"Environment '%s' and all its nodes are deleted" % ( - cluster_name - ) - ) - - elif task.status in ('error',): - cluster.status = 'error' - db().add(cluster) - db().commit() - if not task.message: - task.message = "Failed to delete nodes:\n{0}".format( - cls._generate_error_message( - task, - error_types=('deletion',) - ) - ) - notifier.notify( - "error", - task.message, - cluster.id - ) - - @classmethod - def deploy_resp(cls, **kwargs): - logger.info( - "RPC method deploy_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - nodes = kwargs.get('nodes') or [] - message = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - - task = db().query(Task).filter_by(uuid=task_uuid).first() - if not task: - # No task found - nothing to do here, returning - logger.warning( - u"No task with uuid '{0}'' found - nothing changed".format( - task_uuid - ) - ) - return - if not status: - status = task.status - - # First of all, let's update nodes in database - for node in nodes: - node_db = db().query(Node).get(node['uid']) - - if not node_db: - logger.warning( - u"No node found with uid '{0}' - nothing changed".format( - node['uid'] - ) - ) - continue - - update_fields = ( - 'error_msg', - 'error_type', - 'status', - 'progress', - 'online' - ) - for param in update_fields: - if param in node: - logger.debug( - u"Updating node {0} - set {1} to {2}".format( - node['uid'], - param, - node[param] - ) - ) - setattr(node_db, param, node[param]) - - if param == 'progress' and node.get('status') == 'error' \ - or node.get('online') is False: - # If failure occurred with node - # it's progress should be 100 - node_db.progress = 100 - # Setting node error_msg for offline nodes - if node.get('online') is False \ - and not node_db.error_msg: - node_db.error_msg = u"Node is offline" - # Notification on particular node failure - notifier.notify( - "error", - u"Failed to deploy node '{0}': {1}".format( - node_db.name, - node_db.error_msg or "Unknown error" - ), - cluster_id=task.cluster_id, - node_id=node['uid'], - task_uuid=task_uuid - ) - - db().add(node_db) - db().commit() - - # We should calculate task progress by nodes info - task = db().query(Task).filter_by(uuid=task_uuid).first() - coeff = settings.PROVISIONING_PROGRESS_COEFF or 0.3 - if nodes and not progress: - nodes_progress = [] - nodes_db = db().query(Node).filter_by( - cluster_id=task.cluster_id).all() - for node in nodes_db: - if node.status == "discover": - nodes_progress.append(0) - elif not node.online: - nodes_progress.append(100) - elif node.status in ['provisioning', 'provisioned'] or \ - node.needs_reprovision: - nodes_progress.append(float(node.progress) * coeff) - elif node.status in ['deploying', 'ready'] or \ - node.needs_redeploy: - nodes_progress.append( - 100.0 * coeff + float(node.progress) * (1.0 - coeff) - ) - if nodes_progress: - progress = int( - float(sum(nodes_progress)) / len(nodes_progress) - ) - - # Let's check the whole task status - if status in ('error',): - cls._error_action(task, status, progress, message) - elif status in ('ready',): - cls._success_action(task, status, progress) - else: - TaskHelper.update_task_status(task.uuid, status, progress, message) - - @classmethod - def provision_resp(cls, **kwargs): - # For now provision task is nothing more than just adding - # system into cobbler and rebooting node. Then we think task - # is ready. We don't wait for end of node provisioning. - logger.info( - "RPC method provision_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - message = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - - task = db().query(Task).filter_by(uuid=task_uuid).first() - if not task: - logger.warning(u"No task with uuid %s found", task_uuid) - return - - TaskHelper.update_task_status(task.uuid, status, progress, message) - - @classmethod - def _generate_error_message(cls, task, error_types, names_only=False): - nodes_info = [] - error_nodes = db().query(Node).filter_by( - cluster_id=task.cluster_id - ).filter( - or_( - Node.status == 'error', - Node.online == (False) - ) - ).filter( - Node.error_type.in_(error_types) - ).all() - for n in error_nodes: - if names_only: - nodes_info.append( - "'{0}'".format(n.name) - ) - else: - nodes_info.append( - u"'{0}': {1}".format( - n.name, - n.error_msg - ) - ) - if nodes_info: - if names_only: - message = u", ".join(nodes_info) - else: - message = u"\n".join(nodes_info) - else: - message = u"Unknown error" - return message - - @classmethod - def _error_action(cls, task, status, progress, message=None): - if message: - message = u"Deployment has failed. {0}".format(message) - else: - message = u"Deployment has failed. Check these nodes:\n{0}".format( - cls._generate_error_message( - task, - error_types=('deploy', 'provision'), - names_only=True - ) - ) - notifier.notify( - "error", - message, - task.cluster_id - ) - TaskHelper.update_task_status(task.uuid, status, progress, message) - - @classmethod - def _success_action(cls, task, status, progress): - network_manager = NetworkManager() - # check if all nodes are ready - if any(map(lambda n: n.status == 'error', - task.cluster.nodes)): - cls._error_action(task, 'error', 100) - return - - if task.cluster.mode in ('singlenode', 'multinode'): - # determining horizon url - it's an IP - # of a first cluster controller - controller = db().query(Node).filter_by( - cluster_id=task.cluster_id - ).filter(Node.role_list.any(name='controller')).first() - if controller: - logger.debug( - u"Controller is found, node_id=%s, " - "getting it's IP addresses", - controller.id - ) - public_net = filter( - lambda n: n['name'] == 'public' and 'ip' in n, - network_manager.get_node_networks(controller.id) - ) - if public_net: - horizon_ip = public_net[0]['ip'].split('/')[0] - message = ( - u"Deployment of environment '{0}' is done. " - "Access the OpenStack dashboard (Horizon) at " - "http://{1}/ or via internal network at http://{2}/" - ).format( - task.cluster.name, - horizon_ip, - controller.ip - ) - else: - message = ( - u"Deployment of environment '{0}' is done" - ).format(task.cluster.name) - logger.warning( - u"Public ip for controller node " - "not found in '{0}'".format(task.cluster.name) - ) - else: - message = ( - u"Deployment of environment" - " '{0}' is done" - ).format(task.cluster.name) - logger.warning(u"Controller node not found in '{0}'".format( - task.cluster.name - )) - elif task.cluster.is_ha_mode: - # determining horizon url in HA mode - it's vip - # from a public network saved in task cache - try: - netmanager = NetworkManager() - message = ( - u"Deployment of environment '{0}' is done. " - "Access the OpenStack dashboard (Horizon) at {1}" - ).format( - task.cluster.name, - netmanager.get_horizon_url(task.cluster.id) - ) - except Exception as exc: - logger.error(": ".join([ - str(exc), - traceback.format_exc() - ])) - message = ( - u"Deployment of environment" - " '{0}' is done" - ).format(task.cluster.name) - logger.warning( - u"Cannot find virtual IP for '{0}'".format( - task.cluster.name - ) - ) - - notifier.notify( - "done", - message, - task.cluster_id - ) - TaskHelper.update_task_status(task.uuid, status, progress, message) - - @classmethod - def verify_networks_resp(cls, **kwargs): - logger.info( - "RPC method verify_networks_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - nodes = kwargs.get('nodes') - error_msg = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - - # We simply check that each node received all vlans for cluster - task = db().query(Task).filter_by(uuid=task_uuid).first() - if not task: - logger.error("verify_networks_resp: task \ - with UUID %s not found!", task_uuid) - return - result = [] - # We expect that 'nodes' contains all nodes which we test. - # Situation when some nodes not answered must be processed - # in orchestrator early. - if nodes is None: - # If no nodes in kwargs then we update progress or status only. - pass - elif isinstance(nodes, list): - cached_nodes = task.cache['args']['nodes'] - node_uids = [str(n['uid']) for n in nodes] - cached_node_uids = [str(n['uid']) for n in cached_nodes] - forgotten_uids = set(cached_node_uids) - set(node_uids) - - if forgotten_uids: - absent_nodes = db().query(Node).filter( - Node.id.in_(forgotten_uids) - ).all() - absent_node_names = [] - for n in absent_nodes: - if n.name: - absent_node_names.append(n.name) - else: - absent_node_names.append('id: %s' % n.id) - if not error_msg: - error_msg = 'Node(s) {0} didn\'t return data.'.format( - ', '.join(absent_node_names) - ) - status = 'error' - elif len(nodes) < 2: - status = 'error' - if not error_msg: - error_msg = 'At least two nodes are required to be in '\ - 'the environment for network verification.' - else: - error_nodes = [] - for node in nodes: - cached_nodes_filtered = filter( - lambda n: str(n['uid']) == str(node['uid']), - cached_nodes - ) - - if not cached_nodes_filtered: - logger.warning( - "verify_networks_resp: arguments contain node " - "data which is not in the task cache: %r", - node - ) - continue - - cached_node = cached_nodes_filtered[0] - - for cached_network in cached_node['networks']: - received_networks_filtered = filter( - lambda n: n['iface'] == cached_network['iface'], - node.get('networks', []) - ) - - if received_networks_filtered: - received_network = received_networks_filtered[0] - absent_vlans = list( - set(cached_network['vlans']) - - set(received_network['vlans']) - ) - else: - logger.warning( - "verify_networks_resp: arguments don't contain" - " data for interface: uid=%s iface=%s", - node['uid'], cached_network['iface'] - ) - absent_vlans = cached_network['vlans'] - - if absent_vlans: - data = {'uid': node['uid'], - 'interface': received_network['iface'], - 'absent_vlans': absent_vlans} - node_db = db().query(Node).get(node['uid']) - if node_db: - data['name'] = node_db.name - db_nics = filter( - lambda i: - i.name == received_network['iface'], - node_db.interfaces - ) - if db_nics: - data['mac'] = db_nics[0].mac - else: - logger.warning( - "verify_networks_resp: can't find " - "interface %r for node %r in DB", - received_network['iface'], node_db.id - ) - data['mac'] = 'unknown' - else: - logger.warning( - "verify_networks_resp: can't find node " - "%r in DB", - node['uid'] - ) - - error_nodes.append(data) - - if error_nodes: - result = error_nodes - status = 'error' - else: - error_msg = (error_msg or - 'verify_networks_resp: argument "nodes"' - ' have incorrect type') - status = 'error' - logger.error(error_msg) - - TaskHelper.update_task_status(task_uuid, status, - progress, error_msg, result) - - @classmethod - def _master_networks_gen(cls, ifaces): - for iface in ifaces: - iface_data = netifaces.ifaddresses(iface) - if netifaces.AF_LINK in iface_data: - yield netifaces.ifaddresses(iface)[netifaces.AF_LINK] - - @classmethod - def _get_master_macs(cls): - return itertools.chain(*cls._master_networks_gen( - netifaces.interfaces())) - - @classmethod - def check_dhcp_resp(cls, **kwargs): - """Receiver method for check_dhcp task - For example of kwargs check FakeCheckingDhcpThread - """ - logger.info( - "RPC method check_dhcp_resp received: %s" % - json.dumps(kwargs) - ) - messages = [] - result = collections.defaultdict(list) - message_template = ("Dhcp server on {server_id} - {mac}." - "Discovered from node {yiaddr} on {iface}.") - - task_uuid = kwargs.get('task_uuid') - nodes = kwargs.get('nodes') - error_msg = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - - macs = [item['addr'] for item in cls._get_master_macs()] - logger.debug('Mac addr on master node %s', macs) - - if nodes: - for node in nodes: - if node['status'] == 'ready': - for row in node.get('data', []): - if row['mac'] not in macs: - messages.append(message_template.format(**row)) - result[node['uid']].append(row) - elif node['status'] == 'error': - messages.append(node.get('error_msg', - ('Dhcp check method failed.' - ' Check logs for details.'))) - status = status if not messages else "error" - error_msg = '\n'.join(messages) if messages else error_msg - TaskHelper.update_task_status(task_uuid, status, - progress, error_msg, result) - - # Red Hat related callbacks - - @classmethod - def check_redhat_credentials_resp(cls, **kwargs): - logger.info( - "RPC method check_redhat_credentials_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - error_msg = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - - task = db().query(Task).filter_by(uuid=task_uuid).first() - if not task: - logger.error("check_redhat_credentials_resp: task \ - with UUID %s not found!", task_uuid) - return - - release_info = task.cache['args']['release_info'] - release_id = release_info['release_id'] - release = db().query(Release).get(release_id) - if not release: - logger.error("download_release_resp: Release" - " with ID %s not found", release_id) - return - - if error_msg: - status = 'error' - cls._update_release_state(release_id, 'error') - # TODO(NAME): remove this ugly checks - if 'Unknown error' in error_msg: - error_msg = 'Failed to check Red Hat ' \ - 'credentials' - if error_msg != 'Task aborted': - notifier.notify('error', error_msg) - - result = { - "release_info": { - "release_id": release_id - } - } - - TaskHelper.update_task_status( - task_uuid, - status, - progress, - error_msg, - result - ) - - @classmethod - def redhat_check_licenses_resp(cls, **kwargs): - logger.info( - "RPC method redhat_check_licenses_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - error_msg = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - notify = kwargs.get('msg') - - task = db().query(Task).filter_by(uuid=task_uuid).first() - if not task: - logger.error("redhat_check_licenses_resp: task \ - with UUID %s not found!", task_uuid) - return - - release_info = task.cache['args']['release_info'] - release_id = release_info['release_id'] - release = db().query(Release).get(release_id) - if not release: - logger.error("download_release_resp: Release" - " with ID %s not found", release_id) - return - - if error_msg: - status = 'error' - cls._update_release_state(release_id, 'error') - # TODO(NAME): remove this ugly checks - if 'Unknown error' in error_msg: - error_msg = 'Failed to check Red Hat licenses ' - if error_msg != 'Task aborted': - notifier.notify('error', error_msg) - - if notify: - notifier.notify('error', notify) - - result = { - "release_info": { - "release_id": release_id - } - } - - TaskHelper.update_task_status( - task_uuid, - status, - progress, - error_msg, - result - ) - - @classmethod - def download_release_resp(cls, **kwargs): - logger.info( - "RPC method download_release_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - error_msg = kwargs.get('error') - status = kwargs.get('status') - progress = kwargs.get('progress') - - task = db().query(Task).filter_by(uuid=task_uuid).first() - if not task: - logger.error("download_release_resp: task" - " with UUID %s not found", task_uuid) - return - - release_info = task.cache['args']['release_info'] - release_id = release_info['release_id'] - release = db().query(Release).get(release_id) - if not release: - logger.error("download_release_resp: Release" - " with ID %s not found", release_id) - return - - if error_msg: - status = 'error' - error_msg = "{0} download and preparation " \ - "has failed.".format(release.name) - cls._download_release_error( - release_id, - error_msg - ) - elif progress == 100 and status == 'ready': - cls._download_release_completed(release_id) - - result = { - "release_info": { - "release_id": release_id - } - } - - TaskHelper.update_task_status( - task_uuid, - status, - progress, - error_msg, - result - ) - - @classmethod - def _update_release_state(cls, release_id, state): - release = db().query(Release).get(release_id) - release.state = state - db.add(release) - db.commit() - - @classmethod - def _download_release_completed(cls, release_id): - release = db().query(Release).get(release_id) - release.state = 'available' - db().commit() - success_msg = u"Successfully downloaded {0}".format( - release.name - ) - notifier.notify("done", success_msg) - - @classmethod - def _download_release_error( - cls, - release_id, - error_message - ): - release = db().query(Release).get(release_id) - release.state = 'error' - db().commit() - # TODO(NAME): remove this ugly checks - if error_message != 'Task aborted': - notifier.notify('error', error_message) - - @classmethod - def dump_environment_resp(cls, **kwargs): - logger.info( - "RPC method dump_environment_resp received: %s" % - json.dumps(kwargs) - ) - task_uuid = kwargs.get('task_uuid') - status = kwargs.get('status') - progress = kwargs.get('progress') - error = kwargs.get('error') - msg = kwargs.get('msg') - if status == 'error': - notifier.notify('error', error) - TaskHelper.update_task_status(task_uuid, status, 100, error) - elif status == 'ready': - dumpfile = os.path.basename(msg) - notifier.notify('done', 'Snapshot is ready. ' - 'Visit Support page to download') - TaskHelper.update_task_status( - task_uuid, status, progress, - '/dump/{1}'.format(dumpfile)) diff --git a/nailgun/nailgun/rpc/threaded.py b/nailgun/nailgun/rpc/threaded.py deleted file mode 100644 index 9a444b010..000000000 --- a/nailgun/nailgun/rpc/threaded.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import threading -import traceback - -from kombu import Connection -from kombu.mixins import ConsumerMixin - -from nailgun.db import db -from nailgun.logger import logger -import nailgun.rpc as rpc -from nailgun.rpc.receiver import NailgunReceiver - - -class RPCConsumer(ConsumerMixin): - - def __init__(self, connection, receiver): - self.connection = connection - self.receiver = receiver - - def get_consumers(self, Consumer, channel): - return [Consumer(queues=[rpc.nailgun_queue], - callbacks=[self.consume_msg])] - - def consume_msg(self, body, msg): - callback = getattr(self.receiver, body["method"]) - try: - callback(**body["args"]) - db().commit() - except Exception: - logger.error(traceback.format_exc()) - db().rollback() - finally: - msg.ack() - db().expire_all() - - -class RPCKombuThread(threading.Thread): - - def __init__(self, rcvr_class=NailgunReceiver): - super(RPCKombuThread, self).__init__() - self.stoprequest = threading.Event() - self.receiver = rcvr_class - self.connection = None - - def join(self, timeout=None): - self.stoprequest.set() - # this should interrupt inner kombu event loop - # actually, it doesn't - self.consumer.should_stop = True - super(RPCKombuThread, self).join(timeout) - - def run(self): - with Connection(rpc.conn_str) as conn: - self.consumer = RPCConsumer(conn, self.receiver) - self.consumer.run() diff --git a/nailgun/nailgun/settings.py b/nailgun/nailgun/settings.py deleted file mode 100644 index 4a9c73afb..000000000 --- a/nailgun/nailgun/settings.py +++ /dev/null @@ -1,87 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import logging -import logging.config -import os.path -import sys - -import yaml - - -class NailgunSettings(object): - def __init__(self): - logger = logging.getLogger("nailgun") - logger.setLevel(logging.DEBUG) - formatter = logging.Formatter( - "%(asctime)s %(levelname)s (%(module)s) %(message)s", - "%Y-%m-%d %H:%M:%S" - ) - handler = logging.StreamHandler(sys.stdout) - handler.setFormatter(formatter) - logger.addHandler(handler) - - settings_files = [] - logger.debug("Looking for settings.yaml package config " - "using old style __file__") - project_path = os.path.dirname(__file__) - project_settings_file = os.path.join(project_path, 'settings.yaml') - settings_files.append(project_settings_file) - - settings_files.append('/etc/nailgun/settings.yaml') - settings_files.append('/etc/nailgun/version.yaml') - self.config = {} - - for sf in settings_files: - try: - logger.debug("Trying to read config file %s" % sf) - self.update_from_file(sf) - except Exception as e: - logger.debug("Error while reading config file %s: %s" % - (sf, str(e))) - - if int(self.config.get("DEVELOPMENT")): - logger.info("DEVELOPMENT MODE ON:") - here = os.path.abspath( - os.path.join(os.path.dirname(__file__), '..') - ) - self.config.update({ - 'STATIC_DIR': os.path.join(here, 'static'), - 'TEMPLATE_DIR': os.path.join(here, 'static') - }) - logger.info("Static dir is %s" % self.config.get("STATIC_DIR")) - logger.info("Template dir is %s" % self.config.get("TEMPLATE_DIR")) - - def update(self, dct): - self.config.update(dct) - - def update_from_file(self, path): - with open(path, "r") as custom_config: - self.config.update( - yaml.load(custom_config.read()) - ) - - def dump(self): - return yaml.dump(self.config) - - def __getattr__(self, name): - return self.config.get(name, None) - - def __repr__(self): - return "" - - -settings = NailgunSettings() diff --git a/nailgun/nailgun/settings.yaml b/nailgun/nailgun/settings.yaml deleted file mode 100644 index fdb63471b..000000000 --- a/nailgun/nailgun/settings.yaml +++ /dev/null @@ -1,327 +0,0 @@ -LISTEN_ADDRESS: "0.0.0.0" -LISTEN_PORT: "8000" -DEVELOPMENT: 1 - -COMMIT_SHA: "Unknown build" -FUEL_COMMIT_SHA: "Unknown build" -PRODUCT_VERSION: "3.0" -FUEL_KEY: "Unknown" - -FIXTURES_TO_UPLOAD: - - "openstack.json" - - "start_notification.json" - - "admin_network.json" - -DATABASE: - engine: "postgresql" - name: "nailgun" - host: "localhost" - port: "5432" - user: "nailgun" - passwd: "nailgun" - -# Check timeouts for offline-online nodes detection -KEEPALIVE: - interval: 30 # How often to check if node went offline. If node powered on, it is immediately switched to online state. - timeout: 180 # Node will be switched to offline if there are no updates from agent for this period of time - -STATIC_DIR: "/var/tmp/nailgun_static" -TEMPLATE_DIR: "/var/tmp/nailgun_static" -NETWORK_POOLS: - public: - - "172.16.0.0/12" - private10: - - "10.0.0.0/8" - private192: - - "192.168.0.0/16" - -NET_EXCLUDE: - - "10.20.0.0/24" - -ADMIN_NETWORK: - cidr: "10.20.0.0/24" - netmask: "255.255.255.0" - size: "256" - first: "10.20.0.129" - last: "10.20.0.254" - -VLANS_RANGE_START: "100" -VLANS_RANGE_END: "1000" - -RABBITMQ: - fake: "0" - hostname: "127.0.0.1" - -APP_LOG: &nailgun_log "/var/log/nailgun/app.log" -API_LOG: &api_log "/var/log/nailgun/api.log" -SYSLOG_DIR: &remote_syslog_dir "/var/log/remote/" - -PATH_TO_SSH_KEY: = "/root/.ssh/id_rsa" -PATH_TO_BOOTSTRAP_SSH_KEY: "/root/.ssh/bootstrap.rsa" - -MASTER_IP: "127.0.0.1" - -COBBLER_URL: "http://localhost/cobbler_api" -COBBLER_USER: "cobbler" -COBBLER_PASSWORD: "cobbler" - -NOVA_STATE_PATH: "/var/lib/nova" - -TRUNCATE_LOG_ENTRIES: 100 -UI_LOG_DATE_FORMAT: '%Y-%m-%d %H:%M:%S' -LOG_FORMATS: - - &remote_syslog_log_format - regexp: '^(?P\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})(?P\.\d{1,})?(?P(Z|[+-]\d{2}:\d{2}))?\s(?P[a-z]{3,7}):\s(?P.*)$' - date_format: '%Y-%m-%dT%H:%M:%S' - levels: - - DEBUG - - INFO - - NOTICE - - WARNING - - ERR - - CRIT - - ALERT - - EMERG - - &python_log_format - regexp: '^(?P\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})\s(?P[A-Z]+)\s(?P.*)$' - date_format: '%Y-%m-%d %H:%M:%S' - levels: - - DEBUG - - INFO - - WARNING - - ERROR - - CRITICAL - -LOG_TYPES: - - &local_log_type - remote: False - multiline: True - - &remote_log_type - remote: True - multiline: True - base: *remote_syslog_dir - -LOG_GROUPS: - - &main_install_log_group - group: ~ - - &install_log_group - group: 'Other install logs' - - &bootstrap_log_group - group: 'Bootstrap logs' - -LOGS: -# Master node logs. - - id: app - name: "Web backend" - <<: *local_log_type - <<: *python_log_format - path: *nailgun_log - - id: api - name: "REST API" - <<: *local_log_type - <<: *python_log_format - path: *api_log - - id: naily - name: "Orchestrator" - <<: *local_log_type - <<: *remote_syslog_log_format - path: '/var/log/naily/naily.log' - - id: puppet - name: "Releases" - <<: *local_log_type - <<: *remote_syslog_log_format - path: "/var/log/puppet/agent.log" -# Fake target logs. - - id: 'fake-target-mcollective' - name: "mcollective" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *main_install_log_group - fake: True - path: '/var/tmp/fake-target-mcollective.log' -# Target node installation logs. - - id: 'install/puppet' - name: "puppet" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *main_install_log_group - path: 'puppet-agent.log' - - id: 'install/anaconda' - name: "anaconda" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *main_install_log_group - path: 'install/anaconda.log' - - id: 'install/syslog' - name: "syslog" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *main_install_log_group - path: 'install/syslog.log' - - id: 'install/storage' - name: "storage" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *install_log_group - path: 'install/storage.log' - - id: 'install/ks-pre' - name: "kickstart-pre" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *install_log_group - path: 'install/ks-pre.log' - - id: 'install/ks-post' - name: "kickstart-post" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *install_log_group - path: 'install/ks-post.log' -# Bootstrap node logs. - - id: 'bootstrap/dmesg' - name: "dmesg" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *bootstrap_log_group - path: 'bootstrap/dmesg.log' - - id: 'bootstrap/secure' - name: "secure" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *bootstrap_log_group - path: 'bootstrap/secure.log' - - id: 'bootstrap/messages' - name: "messages" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *bootstrap_log_group - path: 'bootstrap/messages.log' - - id: 'bootstrap/mco' - name: "mcollective" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *bootstrap_log_group - path: 'bootstrap/mcollective.log' - - id: 'bootstrap/agent' - name: "agent" - <<: *remote_log_type - <<: *remote_syslog_log_format - <<: *bootstrap_log_group - path: 'bootstrap/agent.log' - -LOGS_TO_PACK_FOR_SUPPORT: - logs: '/var/log' - -MCO_PSKEY: "Gie6iega9ohngaenahthohngu8aebohxah9seidi" -MCO_VHOST: "mcollective" -MCO_HOST: "localhost" -MCO_USER: "guest" -MCO_PASSWORD: "guest" -MCO_CONNECTOR: "rabbitmq" - -PUPPET_MASTER_HOST: "localhost" -PUPPET_VERSION: "2.7.19" - -DNS_DOMAIN: "example.com" -DNS_SERVERS: "127.0.0.1" -DNS_SEARCH: "example.com" - -FAKE_TASKS_TICK_INTERVAL: "1" -FAKE_TASKS_TICK_COUNT: "30" - -RHEL_VALIDATION_TIMEOUT: 10 - -MAX_ITEMS_PER_PAGE: 500 - -DUMP: - target: "/var/www/nailgun/dump/dump" - lastdump: "/var/www/nailgun/dump/last" - timestamp: True - dump_roles: - master: - - localhost - slave: [] - dump_objects: - master: - - type: postgres - dbhost: localhost - dbname: nailgun - username: nailgun - password: nailgun - - type: dir - path: /etc/nailgun - - type: dir - path: /etc/naily - - type: dir - path: /var/log/nailgun - - type: dir - path: /var/log/naily - - type: dir - path: /var/log/cobbler - - type: dir - path: /var/log/puppet - - type: subs - path: /var/log/remote - subs: {} - - type: command - command: df -h - to_file: df.txt - - type: command - command: mount - to_file: mount.txt - - type: command - command: iptables -t nat -S - to_file: iptables_nat.txt - - type: command - command: iptables -t filter -S - to_file: iptables_filter.txt - - type: command - command: dmidecode - to_file: dmidecode.txt - - type: command - command: uptime - to_file: uptime.txt - - type: command - command: ps auxwwf - to_file: ps.txt - - type: command - command: pvdisplay - to_file: lvm_pvdisplay.txt - - type: command - command: vgdisplay - to_file: lvm_vgdisplay.txt - - type: command - command: lvdisplay - to_file: lvm_lvdisplay.txt - slave: - - type: file - path: /etc/naily.facts - - type: command - command: df -h - to_file: df.txt - - type: command - command: mount - to_file: mount.txt - - type: command - command: iptables -t nat -S - to_file: iptables_nat.txt - - type: command - command: iptables -t filter -S - to_file: iptables_filter.txt - - type: command - command: dmidecode - to_file: dmidecode.txt - - type: command - command: uptime - to_file: uptime.txt - - type: command - command: ps auxwwf - to_file: ps.txt - - type: command - command: pvdisplay - to_file: lvm_pvdisplay.txt - - type: command - command: vgdisplay - to_file: lvm_vgdisplay.txt - - type: command - command: lvdisplay - to_file: lvm_lvdisplay.txt diff --git a/nailgun/nailgun/task/__init__.py b/nailgun/nailgun/task/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/task/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/task/fake.py b/nailgun/nailgun/task/fake.py deleted file mode 100644 index 6ce3c0b2d..000000000 --- a/nailgun/nailgun/task/fake.py +++ /dev/null @@ -1,499 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from itertools import repeat -from random import randrange -from random import shuffle -import threading -import time - -from kombu import Connection -from kombu import Exchange -from kombu import Queue - -from nailgun.api.models import Node -from nailgun.api.models import NodeAttributes -from nailgun.db import db -from nailgun.network.manager import NetworkManager -from nailgun import notifier -from nailgun.rpc.receiver import NailgunReceiver -from nailgun.settings import settings - - -class FakeThread(threading.Thread): - def __init__(self, data=None, params=None, group=None, target=None, - name=None, verbose=None, join_to=None): - threading.Thread.__init__(self, group=group, target=target, name=name, - verbose=verbose) - - self.data = data - self.params = params - self.join_to = join_to - self.tick_count = int(settings.FAKE_TASKS_TICK_COUNT) or 20 - self.low_tick_count = self.tick_count - 10 - if self.low_tick_count < 0: - self.low_tick_count = 0 - self.tick_interval = int(settings.FAKE_TASKS_TICK_INTERVAL) or 3 - - self.task_uuid = data['args'].get( - 'task_uuid' - ) - self.respond_to = data['respond_to'] - self.stoprequest = threading.Event() - self.error = None - - def run(self): - if self.join_to: - self.join_to.join() - if self.join_to.error: - self.error = "Task aborted" - self.message_gen = self.error_message_gen - - def error_message_gen(self): - return [{ - 'task_uuid': self.task_uuid, - 'status': 'error', - 'progress': 100, - 'error': self.error - }] - - def rude_join(self, timeout=None): - self.stoprequest.set() - super(FakeThread, self).join(timeout) - - def sleep(self, timeout): - map( - lambda i: not self.stoprequest.isSet() and time.sleep(i), - repeat(1, timeout) - ) - - -class FakeAmpqThread(FakeThread): - - def run(self): - super(FakeAmpqThread, self).run() - if settings.FAKE_TASKS_AMQP: - nailgun_exchange = Exchange( - 'nailgun', - 'topic', - durable=True - ) - nailgun_queue = Queue( - 'nailgun', - exchange=nailgun_exchange, - routing_key='nailgun' - ) - with Connection('amqp://guest:guest@localhost//') as conn: - with conn.Producer(serializer='json') as producer: - for msg in self.message_gen(): - producer.publish( - { - "method": self.respond_to, - "args": msg - }, - exchange=nailgun_exchange, - routing_key='nailgun', - declare=[nailgun_queue] - ) - else: - receiver = NailgunReceiver - resp_method = getattr(receiver, self.respond_to) - for msg in self.message_gen(): - resp_method(**msg) - - -class FakeDeploymentThread(FakeAmpqThread): - def message_gen(self): - # TEST: we can fail at any stage: - # "provisioning" or "deployment" - error = self.params.get("error") - # TEST: error message from "orchestrator" - error_msg = self.params.get("error_msg", "") - # TEST: we can set task to ready no matter what - # True or False - task_ready = self.params.get("task_ready") - - kwargs = { - 'task_uuid': self.task_uuid, - 'nodes': self.data['args']['deployment_info'], - 'status': 'running' - } - - next_st = { - "discover": "provisioning", - "provisioning": "provisioned", - "provisioned": "deploying", - "deploying": "ready" - } - - ready = False - while not ready and not self.stoprequest.isSet(): - for n in kwargs['nodes']: - if n['status'] == 'error' or not n['online']: - n['progress'] = 100 - n['error_type'] = 'provision' - continue - elif n['status'] == 'discover': - n['status'] = next_st[n['status']] - n['progress'] = 0 - elif n['status'] == 'ready': - n['progress'] = 100 - elif n['status'] not in ('provisioned',): - n['progress'] += randrange( - self.low_tick_count, - self.tick_count - ) - if n['progress'] >= 100: - n['progress'] = 100 - n['status'] = next_st[n['status']] - if error == "provisioning": - self.error = error - shuffle(kwargs['nodes']) - kwargs['nodes'][0]['status'] = "error" - kwargs['nodes'][0]['error_type'] = "provision" - kwargs['error'] = error_msg - error = None - yield kwargs - if all(map( - lambda n: n['status'] in ( - 'provisioned', - 'error', - 'ready' - ) or not n['online'], - kwargs['nodes'] - )): - ready = True - else: - self.sleep(self.tick_interval) - - error_nodes = filter( - lambda n: n['status'] == 'error', - kwargs['nodes'] - ) - offline_nodes = filter( - lambda n: n['online'] is False, - kwargs['nodes'] - ) - if error_nodes or offline_nodes: - self.error = "offline nodes" - kwargs['status'] = 'error' - # TEST: set task to ready no matter what - if task_ready: - kwargs['status'] = 'ready' - kwargs['progress'] = 100 - yield kwargs - return - - ready = False - while not ready and not self.stoprequest.isSet(): - for n in kwargs['nodes']: - if n['status'] in 'ready': - continue - elif n['status'] == 'provisioned': - n['status'] = next_st[n['status']] - n['progress'] = 0 - else: - n['progress'] += randrange( - self.low_tick_count, - self.tick_count - ) - if n['progress'] >= 100: - n['progress'] = 100 - n['status'] = next_st[n['status']] - if error == "deployment": - self.error = "offline nodes" - shuffle(kwargs['nodes']) - kwargs['nodes'][0]['status'] = "error" - kwargs['nodes'][0]['error_type'] = "deploy" - kwargs['error'] = error_msg - error = None - if all(map( - lambda n: n['progress'] == 100 and n['status'] == 'ready', - kwargs['nodes'] - )): - kwargs['status'] = 'ready' - ready = True - if any(map( - lambda n: n['status'] == 'error', - kwargs['nodes'] - )): - kwargs['status'] = 'error' - ready = True - # TEST: set task to ready no matter what - if task_ready: - kwargs['status'] = 'ready' - yield kwargs - self.sleep(self.tick_interval) - - -class FakeProvisionThread(FakeThread): - def run(self): - super(FakeProvisionThread, self).run() - receiver = NailgunReceiver - - # Since we just add systems to cobbler and reboot nodes - # We think this task is always successful if it is launched. - kwargs = { - 'task_uuid': self.task_uuid, - 'status': 'ready', - 'progress': 100 - } - - resp_method = getattr(receiver, self.respond_to) - resp_method(**kwargs) - - -class FakeDeletionThread(FakeThread): - def run(self): - super(FakeDeletionThread, self).run() - receiver = NailgunReceiver - kwargs = { - 'task_uuid': self.task_uuid, - 'nodes': self.data['args']['nodes'], - 'status': 'ready' - } - nodes_to_restore = self.data['args'].get('nodes_to_restore', []) - resp_method = getattr(receiver, self.respond_to) - resp_method(**kwargs) - - for node_data in nodes_to_restore: - node = Node(**node_data) - - # Offline node just deleted from db - # and could not recreated with status - # discover - if not node.online: - continue - - node.status = 'discover' - db().add(node) - db().commit() - node.attributes = NodeAttributes(node_id=node.id) - node.attributes.volumes = node.volume_manager.gen_volumes_info() - network_manager = NetworkManager() - network_manager.update_interfaces_info(node.id) - db().commit() - - ram = round(node.meta.get('ram') or 0, 1) - cores = node.meta.get('cores') or 'unknown' - notifier.notify("discover", - "New node with %s CPU core(s) " - "and %s GB memory is discovered" % - (cores, ram), node_id=node.id) - - -class FakeVerificationThread(FakeThread): - def run(self): - super(FakeVerificationThread, self).run() - receiver = NailgunReceiver - kwargs = { - 'task_uuid': self.task_uuid, - 'progress': 0 - } - - tick_count = int(settings.FAKE_TASKS_TICK_COUNT) or 10 - tick_interval = int(settings.FAKE_TASKS_TICK_INTERVAL) or 3 - low_tick_count = tick_count - 20 - if low_tick_count < 0: - low_tick_count = 0 - - resp_method = getattr(receiver, self.respond_to) - kwargs['progress'] = 0 - timeout = 30 - timer = time.time() - ready = False - - # some kinda hack for debugging in fake tasks: - # verification will fail if you specified 404 as VLAN id in any net - for n in self.data['args']['nodes']: - for iface in n['networks']: - if 404 in iface['vlans']: - iface['vlans'] = list(set(iface['vlans']) ^ set([404])) - - while not ready and not self.stoprequest.isSet(): - kwargs['progress'] += randrange( - low_tick_count, - tick_count - ) - if kwargs['progress'] >= 100: - kwargs['progress'] = 100 - kwargs['nodes'] = self.data['args']['nodes'] - kwargs['status'] = 'ready' - ready = True - resp_method(**kwargs) - if time.time() - timer > timeout: - raise Exception("Timeout exceed") - self.sleep(tick_interval) - - -class FakeCheckingDhcpThread(FakeAmpqThread): - """Thread to be used with test_task_managers.py - """ - - NODES = [{'uid': '90', - 'status': 'ready', - 'data': [{'mac': 'ee:ae:c5:e0:f5:17', - 'server_id': '10.20.0.157', - 'yiaddr': '10.20.0.133', - 'iface': 'eth0'}]}, - {'uid': '91', - 'status': 'ready', - 'data': [{'mac': 'bc:ae:c5:e0:f5:85', - 'server_id': '10.20.0.20', - 'yiaddr': '10.20.0.131', - 'iface': 'eth0'}]}] - - @property - def _message(self): - """Example of message with discovered dhcp server - """ - return {'task_uuid': self.task_uuid, - 'error': '', - 'status': 'ready', - 'progress': 100, - 'nodes': self.NODES} - - def message_gen(self): - self.sleep(self.tick_interval) - if self.params.get("dhcp_error"): - return self.error_message_gen() - else: - return (self._message,) - - -class FakeRedHatCredentials(FakeAmpqThread): - def message_gen(self): - self.sleep(self.tick_interval) - - error = self.params.get("error") - - redhat_info = self.data['args']['release_info']['redhat'] - if redhat_info['username'] != 'rheltest': - self.error = "Invalid Red Hat credentials" - return [{ - 'task_uuid': self.task_uuid, - 'status': 'error', - 'progress': 100, - 'error': self.error - }] - - if error: - self.error = error - return [{ - 'task_uuid': self.task_uuid, - 'status': 'error', - 'progress': 100, - 'error': self.error - }] - else: - return [{ - 'task_uuid': self.task_uuid, - 'status': 'ready', - 'progress': 100 - }] - - -class FakeRedHatLicenses(FakeAmpqThread): - def message_gen(self): - self.sleep(self.tick_interval) - error = self.params.get("error") - - if error: - self.error = error - return [{ - 'task_uuid': self.task_uuid, - 'status': 'error', - 'progress': 100, - 'error': self.error - }] - else: - return [{ - 'task_uuid': self.task_uuid, - 'status': 'ready', - 'progress': 100, - # for case of user warning - #'msg': '' - }] - - -class FakeRedHatUpdateCobbler(FakeAmpqThread): - def message_gen(self): - self.sleep(self.tick_interval) - error = self.params.get("error") - - if error: - self.error = error - return [{ - 'task_uuid': self.task_uuid, - 'status': 'error', - 'progress': 100, - 'error': self.error - }] - else: - return [{ - 'task_uuid': self.task_uuid, - 'status': 'ready', - 'progress': 100 - }] - - -class DownloadReleaseThread(FakeAmpqThread): - def message_gen(self): - kwargs = { - 'task_uuid': self.task_uuid, - 'status': 'running', - 'progress': 0, - 'release_info': self.data['args']['release_info'] - } - - ready = False - while not ready and not self.stoprequest.isSet(): - kwargs['progress'] += randrange( - self.low_tick_count, - self.tick_count - ) - if kwargs['progress'] >= 100: - kwargs['progress'] = 100 - kwargs['status'] = 'ready' - ready = True - - yield kwargs - self.sleep(self.tick_interval) - - -class FakeDumpEnvironment(FakeAmpqThread): - def message_gen(self): - self.sleep(self.tick_interval) - return [{ - 'task_uuid': self.task_uuid, - 'status': 'ready', - 'progress': 100, - 'msg': '/tmp/fake_dump' - }] - - -FAKE_THREADS = { - 'provision': FakeProvisionThread, - 'deploy': FakeDeploymentThread, - 'remove_nodes': FakeDeletionThread, - 'verify_networks': FakeVerificationThread, - 'check_dhcp': FakeCheckingDhcpThread, - 'download_release': DownloadReleaseThread, - 'check_redhat_credentials': FakeRedHatCredentials, - 'check_redhat_licenses': FakeRedHatLicenses, - 'redhat_update_cobbler_profile': FakeRedHatUpdateCobbler, - 'dump_environment': FakeDumpEnvironment -} diff --git a/nailgun/nailgun/task/helpers.py b/nailgun/nailgun/task/helpers.py deleted file mode 100644 index 265317f66..000000000 --- a/nailgun/nailgun/task/helpers.py +++ /dev/null @@ -1,271 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import os -import shutil - -from nailgun.api.models import IPAddr -from nailgun.api.models import Task -from nailgun.db import db -from nailgun.logger import logger -from nailgun.network.manager import NetworkManager -from nailgun.settings import settings - - -class TaskHelper(object): - - @classmethod - def make_slave_name(cls, nid): - return u"node-%s" % str(nid) - - @classmethod - def make_slave_fqdn(cls, nid): - return u"%s.%s" % (cls.make_slave_name(nid), settings.DNS_DOMAIN) - - @classmethod - def update_slave_nodes_fqdn(cls, nodes): - for n in nodes: - fqdn = cls.make_slave_fqdn(n.id) - if n.fqdn != fqdn: - n.fqdn = fqdn - logger.debug("Updating node fqdn: %s %s", n.id, n.fqdn) - db().commit() - - @classmethod - def prepare_syslog_dir(cls, node, prefix=None): - logger.debug("Preparing syslog directories for node: %s", node.fqdn) - if not prefix: - prefix = settings.SYSLOG_DIR - logger.debug("prepare_syslog_dir prefix=%s", prefix) - - old = os.path.join(prefix, str(node.ip)) - bak = os.path.join(prefix, "%s.bak" % str(node.fqdn)) - new = os.path.join(prefix, str(node.fqdn)) - - netmanager = NetworkManager() - admin_net_id = netmanager.get_admin_network_id() - links = map( - lambda i: os.path.join(prefix, i.ip_addr), - db().query(IPAddr.ip_addr). - filter_by(node=node.id). - filter_by(network=admin_net_id).all() - ) - - logger.debug("prepare_syslog_dir old=%s", old) - logger.debug("prepare_syslog_dir new=%s", new) - logger.debug("prepare_syslog_dir bak=%s", bak) - logger.debug("prepare_syslog_dir links=%s", str(links)) - - # backup directory if it exists - if os.path.isdir(new): - logger.debug("New %s already exists. Trying to backup", new) - if os.path.islink(bak): - logger.debug("Bak %s already exists and it is link. " - "Trying to unlink", bak) - os.unlink(bak) - elif os.path.isdir(bak): - logger.debug("Bak %s already exists and it is directory. " - "Trying to remove", bak) - shutil.rmtree(bak) - os.rename(new, bak) - - # rename bootstrap directory into fqdn - if os.path.islink(old): - logger.debug("Old %s exists and it is link. " - "Trying to unlink", old) - os.unlink(old) - if os.path.isdir(old): - logger.debug("Old %s exists and it is directory. " - "Trying to rename into %s", old, new) - os.rename(old, new) - else: - logger.debug("Creating %s", new) - os.makedirs(new) - - # creating symlinks - for l in links: - if os.path.islink(l) or os.path.isfile(l): - logger.debug("%s already exists. " - "Trying to unlink", l) - os.unlink(l) - if os.path.isdir(l): - logger.debug("%s already exists and it directory. " - "Trying to remove", l) - shutil.rmtree(l) - logger.debug("Creating symlink %s -> %s", l, new) - os.symlink(str(node.fqdn), l) - - os.system("/usr/bin/pkill -HUP rsyslog") - - @classmethod - def update_task_status(cls, uuid, status, progress, msg="", result=None): - # verify_networks - task is expecting to receive result with - # some data if connectivity_verification fails - logger.debug("Updating task: %s", uuid) - task = db().query(Task).filter_by(uuid=uuid).first() - if not task: - logger.error("Can't set status='%s', message='%s':no task \ - with UUID %s found!", status, msg, uuid) - return - previous_status = task.status - data = {'status': status, 'progress': progress, - 'message': msg, 'result': result} - for key, value in data.iteritems(): - if value is not None: - setattr(task, key, value) - logger.info( - u"Task {0} ({1}) {2} is set to {3}".format( - task.uuid, - task.name, - key, - value - ) - ) - db().add(task) - db().commit() - - if previous_status != status and task.cluster_id: - logger.debug("Updating cluster status: " - "cluster_id: %s status: %s", - task.cluster_id, status) - cls.update_cluster_status(uuid) - if task.parent: - logger.debug("Updating parent task: %s.", task.parent.uuid) - cls.update_parent_task(task.parent.uuid) - - @classmethod - def update_parent_task(cls, uuid): - task = db().query(Task).filter_by(uuid=uuid).first() - subtasks = task.subtasks - if len(subtasks): - if all(map(lambda s: s.status == 'ready', subtasks)): - task.status = 'ready' - task.progress = 100 - task.message = '\n'.join(map( - lambda s: s.message, filter( - lambda s: s.message is not None, subtasks))) - db().add(task) - db().commit() - cls.update_cluster_status(uuid) - elif all(map(lambda s: s.status in ('ready', 'error'), subtasks)): - task.status = 'error' - task.progress = 100 - task.message = '\n'.join(list(set(map( - lambda s: (s.message or ""), filter( - lambda s: ( - s.status == 'error' and not - # TODO: make this check less ugly - s.message == 'Task aborted' - ), subtasks))))) - db().add(task) - db().commit() - cls.update_cluster_status(uuid) - else: - subtasks_with_progress = filter( - lambda s: s.progress is not None, - subtasks - ) - if subtasks_with_progress: - task.progress = int( - round( - sum( - [s.weight * s.progress for s - in subtasks_with_progress] - ) / - sum( - [s.weight for s - in subtasks_with_progress] - ), 0) - ) - else: - task.progress = 0 - db().add(task) - db().commit() - - @classmethod - def update_cluster_status(cls, uuid): - task = db().query(Task).filter_by(uuid=uuid).first() - # FIXME: should be moved to task/manager "finish" method after - # web.ctx.orm issue is addressed - cluster = task.cluster - if task.name == 'deploy': - if task.status == 'ready': - # FIXME: we should also calculate deployment "validity" - # (check if all of the required nodes of required roles are - # present). If cluster is not "valid", we should also set - # its status to "error" even if it is deployed successfully. - # This method is also would be affected by web.ctx.orm issue. - cls.__set_cluster_status(cluster, 'operational') - cluster.clear_pending_changes() - elif task.status == 'error': - cls.__set_cluster_status(cluster, 'error') - elif task.name == 'provision': - if task.status == 'error': - cls.__set_cluster_status(cluster, 'error') - db().commit() - - @classmethod - def __set_cluster_status(cls, cluster, new_state): - logger.debug( - "Updating cluster (%s) status: from %s to %s", - cluster.full_name, cluster.status, new_state) - cluster.status = new_state - - @classmethod - def nodes_to_delete(cls, cluster): - return filter( - lambda n: any([ - n.pending_deletion, - n.needs_redeletion - ]), - cluster.nodes - ) - - @classmethod - def nodes_to_deploy(cls, cluster): - return sorted(filter( - lambda n: any([ - n.pending_addition, - n.needs_reprovision, - n.needs_redeploy - ]), - cluster.nodes - ), key=lambda n: n.id) - - @classmethod - def nodes_to_provision(cls, cluster): - return sorted(filter( - lambda n: any([ - n.pending_addition, - n.needs_reprovision - ]), - cluster.nodes - ), key=lambda n: n.id) - - @classmethod - def nodes_in_provisioning(cls, cluster): - return sorted(filter( - lambda n: n.status == 'provisioning', - cluster.nodes - ), key=lambda n: n.id) - - @classmethod - def set_error(cls, task_uuid, message): - cls.update_task_status( - task_uuid, - status="error", - progress=100, - msg=str(message)) diff --git a/nailgun/nailgun/task/manager.py b/nailgun/nailgun/task/manager.py deleted file mode 100644 index 360efb2be..000000000 --- a/nailgun/nailgun/task/manager.py +++ /dev/null @@ -1,541 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import traceback - -from nailgun.api.models import Cluster -from nailgun.api.models import RedHatAccount -from nailgun.api.models import Task -from nailgun.api.serializers.network_configuration \ - import NetworkConfigurationSerializer -from nailgun.db import db -from nailgun.errors import errors -from nailgun.logger import logger -import nailgun.rpc as rpc -from nailgun.task import task as tasks -from nailgun.task.task import TaskHelper - - -class TaskManager(object): - - def __init__(self, cluster_id=None): - if cluster_id: - self.cluster = db().query(Cluster).get(cluster_id) - - def _call_silently(self, task, instance, *args, **kwargs): - method = getattr(instance, kwargs.pop('method_name', 'execute')) - if task.status == 'error': - return - try: - return method(task, *args, **kwargs) - except Exception as exc: - err = str(exc) - if any([ - not hasattr(exc, "log_traceback"), - hasattr(exc, "log_traceback") and exc.log_traceback - ]): - logger.error(traceback.format_exc()) - TaskHelper.update_task_status( - task.uuid, - status="error", - progress=100, - msg=err - ) - - -class DeploymentTaskManager(TaskManager): - - def _redhat_messages(self, supertask, nodes_info): - account = db().query(RedHatAccount).first() - if not account: - TaskHelper.update_task_status( - supertask.uuid, - status="error", - progress=100, - msg="RHEL account is not found" - ) - return supertask - - rhel_data = { - 'release_id': supertask.cluster.release.id, - 'release_name': supertask.cluster.release.name, - 'redhat': { - 'license_type': account.license_type, - 'username': account.username, - 'password': account.password, - 'satellite': account.satellite, - 'activation_key': account.activation_key - } - } - - subtasks = [ - supertask.create_subtask('redhat_check_credentials'), - supertask.create_subtask('redhat_check_licenses') - ] - - map( - lambda t: setattr(t, "weight", 0.01), - subtasks - ) - db().commit() - - subtask_messages = [ - self._call_silently( - subtasks[0], - tasks.RedHatCheckCredentialsTask, - rhel_data, - method_name='message' - ), - self._call_silently( - subtasks[1], - tasks.RedHatCheckLicensesTask, - rhel_data, - nodes_info, - method_name='message' - ) - ] - - for task, message in zip(subtasks, subtask_messages): - task.cache = message - db().commit() - - map(db().refresh, subtasks) - - for task in subtasks: - if task.status == 'error': - raise errors.RedHatSetupError( - task.message - ) - - return subtask_messages - - def execute(self): - logger.info( - u"Trying to start deployment at cluster '{0}'".format( - self.cluster.name or self.cluster.id, - ) - ) - - current_tasks = db().query(Task).filter_by( - cluster_id=self.cluster.id, - name="deploy" - ) - for task in current_tasks: - if task.status == "running": - raise errors.DeploymentAlreadyStarted() - elif task.status in ("ready", "error"): - for subtask in task.subtasks: - db().delete(subtask) - db().delete(task) - db().commit() - - task_messages = [] - - nodes_to_delete = TaskHelper.nodes_to_delete(self.cluster) - nodes_to_deploy = TaskHelper.nodes_to_deploy(self.cluster) - nodes_to_provision = TaskHelper.nodes_to_provision(self.cluster) - - if not any([nodes_to_provision, nodes_to_deploy, nodes_to_delete]): - raise errors.WrongNodeStatus("No changes to deploy") - - self.cluster.status = 'deployment' - db().add(self.cluster) - db().commit() - - supertask = Task( - name="deploy", - cluster=self.cluster - ) - db().add(supertask) - db().commit() - if not self.cluster.replaced_provisioning_info \ - and not self.cluster.replaced_deployment_info: - try: - self.check_before_deployment(supertask) - except errors.CheckBeforeDeploymentError: - return supertask - # in case of Red Hat - if self.cluster.release.operating_system == "RHEL": - try: - redhat_messages = self._redhat_messages( - supertask, - # provision only? - [ - {"uid": n.id, "platform_name": n.platform_name} - for n in nodes_to_provision - ] - ) - except Exception as exc: - TaskHelper.update_task_status( - supertask.uuid, - status='error', - progress=100, - msg=str(exc) - ) - return supertask - task_messages.extend(redhat_messages) - # /in case of Red Hat - - task_deletion, task_provision, task_deployment = None, None, None - - if nodes_to_delete: - task_deletion = supertask.create_subtask("node_deletion") - logger.debug("Launching deletion task: %s", task_deletion.uuid) - self._call_silently( - task_deletion, - tasks.DeletionTask - ) - - if nodes_to_provision: - TaskHelper.update_slave_nodes_fqdn(nodes_to_provision) - logger.debug("There are nodes to provision: %s", - " ".join([n.fqdn for n in nodes_to_provision])) - task_provision = supertask.create_subtask("provision") - # we assume here that task_provision just adds system to - # cobbler and reboots it, so it has extremely small weight - task_provision.weight = 0.05 - provision_message = self._call_silently( - task_provision, - tasks.ProvisionTask, - method_name='message' - ) - db().refresh(task_provision) - - # if failed to generate task message for orchestrator - # then task is already set to error - if task_provision.status == 'error': - return supertask - - task_provision.cache = provision_message - db().add(task_provision) - db().commit() - task_messages.append(provision_message) - - if nodes_to_deploy: - TaskHelper.update_slave_nodes_fqdn(nodes_to_deploy) - logger.debug("There are nodes to deploy: %s", - " ".join([n.fqdn for n in nodes_to_deploy])) - task_deployment = supertask.create_subtask("deployment") - deployment_message = self._call_silently( - task_deployment, - tasks.DeploymentTask, - method_name='message' - ) - - # if failed to generate task message for orchestrator - # then task is already set to error - if task_deployment.status == 'error': - return supertask - - task_deployment.cache = deployment_message - db().add(task_deployment) - db().commit() - task_messages.append(deployment_message) - - if task_messages: - rpc.cast('naily', task_messages) - - logger.debug( - u"Deployment: task to deploy cluster '{0}' is {1}".format( - self.cluster.name or self.cluster.id, - supertask.uuid - ) - ) - return supertask - - def check_before_deployment(self, supertask): - # checking admin intersection with untagged - network_info = NetworkConfigurationSerializer\ - .serialize_for_cluster( - self.cluster - ) - check_networks = supertask.create_subtask('check_networks') - self._call_silently( - check_networks, - tasks.CheckNetworksTask, - data=network_info, - check_admin_untagged=True - ) - db().refresh(check_networks) - if check_networks.status == 'error': - logger.warning( - "Checking networks failed: %s", check_networks.message - ) - raise errors.CheckBeforeDeploymentError(check_networks.message) - db().delete(check_networks) - db().commit() - - # checking prerequisites - check_before = supertask.create_subtask('check_before_deployment') - logger.debug("Checking prerequisites task: %s", check_before.uuid) - self._call_silently( - check_before, - tasks.CheckBeforeDeploymentTask - ) - db().refresh(check_before) - # if failed to check prerequisites - # then task is already set to error - if check_before.status == 'error': - logger.warning( - "Checking prerequisites failed: %s", check_before.message - ) - raise errors.CheckBeforeDeploymentError(check_before.message) - logger.debug( - "Checking prerequisites is successful, starting deployment..." - ) - db().delete(check_before) - db().commit() - - -class CheckNetworksTaskManager(TaskManager): - - def execute(self, data, check_admin_untagged=False): - task = Task( - name="check_networks", - cluster=self.cluster - ) - db().add(task) - db().commit() - self._call_silently( - task, - tasks.CheckNetworksTask, - data, - check_admin_untagged - ) - db().refresh(task) - if task.status == 'running': - TaskHelper.update_task_status( - task.uuid, - status="ready", - progress=100 - ) - return task - - -class VerifyNetworksTaskManager(TaskManager): - - def execute(self, nets, vlan_ids): - task = Task( - name="check_networks", - cluster=self.cluster - ) - if not task.cluster.nodes: - task.status = 'error' - task.message = ('There should be atleast 1 node for dhcp check.' - 'And 2 nodes for connectivity check') - - db().add(task) - db().commit() - - self._call_silently( - task, - tasks.CheckNetworksTask, - nets - ) - db().refresh(task) - if task.status != 'error': - # this one is connected with UI issues - we need to - # separate if error happened inside nailgun or somewhere - # in the orchestrator, and UI does it by task name. - - dhcp_subtask = Task( - name='check_dhcp', - cluster=self.cluster, - parent_id=task.id) - db().add(dhcp_subtask) - db().commit() - db().refresh(task) - - task.name = 'verify_networks' - - self._call_silently( - task, - tasks.VerifyNetworksTask, - vlan_ids - ) - - return task - - -class ClusterDeletionManager(TaskManager): - - def execute(self): - current_cluster_tasks = db().query(Task).filter_by( - cluster=self.cluster, - name='cluster_deletion' - ).all() - deploy_running = db().query(Task).filter_by( - cluster=self.cluster, - name='deploy', - status='running' - ).first() - if deploy_running: - logger.error( - u"Deleting cluster '{0}' " - "while deployment is still running".format( - self.cluster.name - ) - ) - - logger.debug("Removing cluster tasks") - for task in current_cluster_tasks: - if task.status == "running": - raise errors.DeletionAlreadyStarted() - elif task.status in ("ready", "error"): - for subtask in task.subtasks: - db().delete(subtask) - db().delete(task) - db().commit() - - logger.debug("Labeling cluster nodes to delete") - for node in self.cluster.nodes: - node.pending_deletion = True - db().add(node) - db().commit() - - self.cluster.status = 'remove' - db().add(self.cluster) - db().commit() - - logger.debug("Creating cluster deletion task") - task = Task(name="cluster_deletion", cluster=self.cluster) - db().add(task) - db().commit() - self._call_silently( - task, - tasks.ClusterDeletionTask - ) - return task - - -class DownloadReleaseTaskManager(TaskManager): - - def __init__(self, release_data): - self.release_data = release_data - - def execute(self): - logger.debug("Creating release dowload task") - task = Task(name="download_release") - db().add(task) - db().commit() - self._call_silently( - task, - tasks.DownloadReleaseTask, - self.release_data - ) - return task - - -class RedHatSetupTaskManager(TaskManager): - def __init__(self, data): - self.data = data - - def execute(self): - logger.debug("Creating redhat_setup task") - - current_tasks = db().query(Task).filter_by( - name="redhat_setup" - ) - for task in current_tasks: - for subtask in task.subtasks: - db().delete(subtask) - db().delete(task) - db().commit() - - supertask = Task(name="redhat_setup") - supertask.result = { - "release_info": { - "release_id": self.data["release_id"] - } - } - db().add(supertask) - db().commit() - - subtasks_to_create = [ - ( - 'redhat_check_credentials', - tasks.RedHatCheckCredentialsTask, - 0.01 - ), - ( - 'redhat_check_licenses', - tasks.RedHatCheckLicensesTask, - 0.01 - ), - ( - 'redhat_download_release', - tasks.RedHatDownloadReleaseTask, - 1 - ) - ] - - messages = [] - for task_name, task_class, weight in subtasks_to_create: - task = supertask.create_subtask(task_name) - task.weight = weight - db().add(task) - db().commit() - msg = self._call_silently( - task, - task_class, - self.data, - method_name='message' - ) - db().refresh(task) - if task.status == 'error': - TaskHelper.update_task_status( - supertask.uuid, - status="error", - progress=100, - msg=task.message - ) - return supertask - task.cache = msg - db().add(task) - db().commit() - messages.append(msg) - - db().refresh(supertask) - - if supertask.status == 'error': - return supertask - - rpc.cast('naily', messages) - - return supertask - - -class DumpTaskManager(TaskManager): - def execute(self): - logger.info("Trying to start dump_environment task") - current_tasks = db().query(Task).filter_by( - name="dump" - ) - for task in current_tasks: - if task.status == "running": - raise errors.DumpRunning() - elif task.status in ("ready", "error"): - db().delete(task) - db().commit() - - task = Task(name="dump") - db().add(task) - db().commit() - self._call_silently( - task, - tasks.DumpTask, - ) - return task diff --git a/nailgun/nailgun/task/task.py b/nailgun/nailgun/task/task.py deleted file mode 100644 index 1b92a90e2..000000000 --- a/nailgun/nailgun/task/task.py +++ /dev/null @@ -1,713 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import shlex -import subprocess - -import netaddr -from sqlalchemy.orm import ColumnProperty -from sqlalchemy.orm import object_mapper - -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.api.models import NodeNICInterface -from nailgun.api.models import RedHatAccount -from nailgun.api.models import Release -from nailgun.db import db -from nailgun.errors import errors -from nailgun.logger import logger -from nailgun.network.manager import NetworkManager -from nailgun.orchestrator import deployment_serializers -from nailgun.orchestrator import provisioning_serializers -import nailgun.rpc as rpc -from nailgun.settings import settings -from nailgun.task.fake import FAKE_THREADS -from nailgun.task.helpers import TaskHelper - - -def fake_cast(queue, messages, **kwargs): - def make_thread(message, join_to=None): - thread = FAKE_THREADS[message['method']]( - data=message, - params=kwargs, - join_to=join_to - ) - logger.debug("Fake thread called: data: %s, params: %s", - message, kwargs) - thread.start() - thread.name = message['method'].upper() - return thread - - if isinstance(messages, (list,)): - thread = None - for m in messages: - thread = make_thread(m, join_to=thread) - else: - make_thread(messages) - - -if settings.FAKE_TASKS or settings.FAKE_TASKS_AMQP: - rpc.cast = fake_cast - - -class DeploymentTask(object): -# LOGIC -# Use cases: -# 1. Cluster exists, node(s) added -# If we add one node to existing OpenStack cluster, other nodes may require -# updates (redeployment), but they don't require full system reinstallation. -# How to: run deployment for all nodes which system type is target. -# Run provisioning first and then deployment for nodes which are in -# discover system type. -# Q: Should we care about node status (provisioning, error, deploying)? -# A: offline - when node doesn't respond (agent doesn't run, not -# implemented); let's say user should remove this node from -# cluster before deployment. -# ready - target OS is loaded and node is Ok, we redeploy -# ready nodes only if cluster has pending changes i.e. -# network or cluster attrs were changed -# discover - in discovery mode, provisioning is required -# provisioning - at the time of task execution there should not be such -# case. If there is - previous provisioning has failed. -# Possible solution would be to try again to provision -# deploying - the same as provisioning, but stucked in previous deploy, -# solution - try to deploy. May loose some data if reprovis. -# error - recognized error in deployment or provisioning... We have to -# know where the error was. If in deployment - reprovisioning may -# not be a solution (can loose data). If in provisioning - can do -# provisioning & deployment again -# 2. New cluster, just added nodes -# Provision first, and run deploy as second -# 3. Remove some and add some another node -# Deletion task will run first and will actually remove nodes, include -# removal from DB.. however removal from DB happens when remove_nodes_resp -# is ran. It means we have to filter nodes and not to run deployment on -# those which are prepared for removal. - - @classmethod - def message(cls, task): - logger.debug("DeploymentTask.message(task=%s)" % task.uuid) - - task.cluster.prepare_for_deployment() - nodes = TaskHelper.nodes_to_deploy(task.cluster) - nodes_ids = [n.id for n in nodes] - for n in db().query(Node).filter_by( - cluster=task.cluster).order_by(Node.id): - # However, we must not pass nodes which are set to be deleted. - if n.pending_deletion: - continue - - if n.id in nodes_ids: # It's node which we need to redeploy - n.pending_addition = False - if n.pending_roles: - n.roles += n.pending_roles - n.pending_roles = [] - if n.status in ('deploying'): - n.status = 'provisioned' - n.progress = 0 - db().add(n) - db().commit() - - # here we replace provisioning data if user redefined them - serialized_cluster = task.cluster.replaced_deployment_info or \ - deployment_serializers.serialize(task.cluster) - - return { - 'method': 'deploy', - 'respond_to': 'deploy_resp', - 'args': { - 'task_uuid': task.uuid, - 'deployment_info': serialized_cluster}} - - @classmethod - def execute(cls, task): - logger.debug("DeploymentTask.execute(task=%s)" % task.uuid) - message = cls.message(task) - task.cache = message - db().add(task) - db().commit() - rpc.cast('naily', message) - - -class ProvisionTask(object): - - @classmethod - def message(cls, task): - logger.debug("ProvisionTask.message(task=%s)" % task.uuid) - nodes = TaskHelper.nodes_to_provision(task.cluster) - USE_FAKE = settings.FAKE_TASKS or settings.FAKE_TASKS_AMQP - - # We need to assign admin ips - # and only after that prepare syslog - # directories - task.cluster.prepare_for_provisioning() - - for node in nodes: - if USE_FAKE: - continue - - if node.offline: - raise errors.NodeOffline( - u'Node "%s" is offline.' - ' Remove it from environment and try again.' % - node.full_name) - - TaskHelper.prepare_syslog_dir(node) - - node.status = 'provisioning' - db().commit() - - serialized_cluster = task.cluster.replaced_provisioning_info or \ - provisioning_serializers.serialize(task.cluster) - - message = { - 'method': 'provision', - 'respond_to': 'provision_resp', - 'args': { - 'task_uuid': task.uuid, - 'provisioning_info': serialized_cluster}} - - return message - - @classmethod - def execute(cls, task): - logger.debug("ProvisionTask.execute(task=%s)" % task.uuid) - message = cls.message(task) - task.cache = message - db().add(task) - db().commit() - rpc.cast('naily', message) - - -class DeletionTask(object): - - @classmethod - def execute(self, task, respond_to='remove_nodes_resp'): - logger.debug("DeletionTask.execute(task=%s)" % task.uuid) - task_uuid = task.uuid - logger.debug("Nodes deletion task is running") - nodes_to_delete = [] - nodes_to_delete_constant = [] - nodes_to_restore = [] - - USE_FAKE = settings.FAKE_TASKS or settings.FAKE_TASKS_AMQP - - # no need to call naily if there are no nodes in cluster - if respond_to == 'remove_cluster_resp' and \ - not list(task.cluster.nodes): - rcvr = rpc.receiver.NailgunReceiver() - rcvr.remove_cluster_resp( - task_uuid=task_uuid, - status='ready', - progress=100 - ) - return - - for node in task.cluster.nodes: - if node.pending_deletion: - nodes_to_delete.append({ - 'id': node.id, - 'uid': node.id, - 'roles': node.roles - }) - - if USE_FAKE: - # only fake tasks - new_node = {} - keep_attrs = ( - 'id', - 'cluster_id', - 'roles', - 'pending_deletion', - 'pending_addition' - ) - for prop in object_mapper(node).iterate_properties: - if isinstance( - prop, ColumnProperty - ) and prop.key not in keep_attrs: - new_node[prop.key] = getattr(node, prop.key) - nodes_to_restore.append(new_node) - # /only fake tasks - - # this variable is used to iterate over it - # and be able to delete node from nodes_to_delete safely - nodes_to_delete_constant = list(nodes_to_delete) - - for node in nodes_to_delete_constant: - node_db = db().query(Node).get(node['id']) - - slave_name = TaskHelper.make_slave_name(node['id']) - logger.debug("Removing node from database and pending it " - "to clean its MBR: %s", slave_name) - if not node_db.online: - logger.info( - "Node is offline, can't MBR clean: %s", slave_name) - db().delete(node_db) - db().commit() - - nodes_to_delete.remove(node) - - # only real tasks - engine_nodes = [] - if not USE_FAKE: - for node in nodes_to_delete_constant: - slave_name = TaskHelper.make_slave_name(node['id']) - logger.debug("Pending node to be removed from cobbler %s", - slave_name) - engine_nodes.append(slave_name) - try: - node_db = db().query(Node).get(node['id']) - if node_db and node_db.fqdn: - node_hostname = node_db.fqdn - else: - node_hostname = TaskHelper.make_slave_fqdn(node['id']) - logger.info("Removing node cert from puppet: %s", - node_hostname) - cmd = "puppet cert clean {0}".format(node_hostname) - proc = subprocess.Popen( - shlex.split(cmd), - shell=False, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE - ) - p_stdout, p_stderr = proc.communicate() - logger.info( - "'{0}' executed, STDOUT: '{1}'," - " STDERR: '{2}'".format( - cmd, - p_stdout, - p_stderr - ) - ) - except OSError: - logger.warning( - "'{0}' returned non-zero exit code".format( - cmd - ) - ) - except Exception as e: - logger.warning("Exception occurred while trying to \ - remove the system from Cobbler: '{0}'".format( - e.message)) - - msg_delete = { - 'method': 'remove_nodes', - 'respond_to': respond_to, - 'args': { - 'task_uuid': task.uuid, - 'nodes': nodes_to_delete, - 'engine': { - 'url': settings.COBBLER_URL, - 'username': settings.COBBLER_USER, - 'password': settings.COBBLER_PASSWORD, - }, - 'engine_nodes': engine_nodes - } - } - # only fake tasks - if USE_FAKE and nodes_to_restore: - msg_delete['args']['nodes_to_restore'] = nodes_to_restore - # /only fake tasks - logger.debug("Calling rpc remove_nodes method") - rpc.cast('naily', msg_delete) - - -class ClusterDeletionTask(object): - - @classmethod - def execute(cls, task): - logger.debug("Cluster deletion task is running") - DeletionTask.execute(task, 'remove_cluster_resp') - - -class VerifyNetworksTask(object): - - @classmethod - def _subtask_message(cls, task): - for subtask in task.subtasks: - yield subtask.name, {'respond_to': '{0}_resp'.format(subtask.name), - 'task_uuid': subtask.uuid} - - @classmethod - def _message(cls, task, data): - nodes = [] - for n in task.cluster.nodes: - node_json = {'uid': n.id, 'networks': []} - for nic in n.interfaces: - vlans = [] - for ng in nic.assigned_networks: - # Handle FuelWeb admin network first. - if not ng.cluster_id: - vlans.append(0) - continue - data_ng = filter( - lambda i: i['name'] == ng.name, - data - )[0] - vlans.extend(data_ng['vlans']) - if not vlans: - continue - node_json['networks'].append( - {'iface': nic.name, 'vlans': vlans} - ) - nodes.append(node_json) - return { - 'method': task.name, - 'respond_to': '{0}_resp'.format(task.name), - 'args': {'task_uuid': task.uuid, - 'nodes': nodes}, - 'subtasks': dict(cls._subtask_message(task))} - - @classmethod - def execute(cls, task, data): - message = cls._message(task, data) - logger.debug("%s method is called with: %s", - task.name, message) - - task.cache = message - db().add(task) - db().commit() - rpc.cast('naily', message) - - -class CheckNetworksTask(object): - - @classmethod - def execute(self, task, data, check_admin_untagged=False): - # If not set in data then fetch from db - if 'net_manager' in data: - netmanager = data['net_manager'] - else: - netmanager = task.cluster.net_manager - - if 'networks' in data: - networks = data['networks'] - else: - networks = map(lambda x: x.__dict__, task.cluster.network_groups) - - result = [] - err_msgs = [] - - if check_admin_untagged: - # checking if there are untagged networks on the same interface - # (main) as admin network - untagged_nets = set( - n["id"] for n in filter( - lambda n: (n["vlan_start"] is None), - networks - ) - ) - if untagged_nets: - logger.info( - "Untagged networks found, " - "checking admin network intersection..." - ) - main_ifaces = ( - db().query(NodeNICInterface).get( - NetworkManager().get_main_nic(n.id) - ) - for n in task.cluster.nodes - ) - - found_intersection = [] - - for iface in main_ifaces: - nets = dict( - (n.id, n.name) - for n in iface.assigned_networks - ) - err_nets = set(nets.keys()) & untagged_nets - if err_nets: - err_net_names = [ - '"{0}"'.format(nets[i]) for i in err_nets - ] - found_intersection.append( - [iface.node.name, err_net_names] - ) - - if found_intersection: - nodes_with_errors = [ - u'Node "{0}": {1}'.format( - name, - ", ".join(_networks) - ) for name, _networks in found_intersection - ] - err_msg = u"Some untagged networks are " \ - "assigned to the same physical interface as " \ - "admin (PXE) network. You can whether turn " \ - "on tagging for these OpenStack " \ - "networks or move them to another physical " \ - "interface:\n{0}".format("\n".join( - nodes_with_errors - )) - raise errors.NetworkCheckError(err_msg, add_client=False) - - admin_range = netaddr.IPNetwork(settings.ADMIN_NETWORK['cidr']) - for ng in networks: - net_errors = [] - sub_ranges = [] - ng_db = db().query(NetworkGroup).get(ng['id']) - if not ng_db: - net_errors.append("id") - err_msgs.append("Invalid network ID: {0}".format(ng['id'])) - else: - if 'cidr' in ng: - fnet = netaddr.IPNetwork(ng['cidr']) - if NetworkManager().is_range_in_cidr(fnet, admin_range): - net_errors.append("cidr") - err_msgs.append( - "Intersection with admin " - "network(s) '{0}' found".format( - settings.ADMIN_NETWORK['cidr'] - ) - ) - if fnet.size < ng['network_size'] * ng['amount']: - net_errors.append("cidr") - err_msgs.append( - "CIDR size for network '{0}' " - "is less than required".format( - ng.get('name') or ng_db.name or ng_db.id - ) - ) - # Check for intersection with Admin network - if 'ip_ranges' in ng: - for k, v in enumerate(ng['ip_ranges']): - ip_range = netaddr.IPRange(v[0], v[1]) - if NetworkManager().is_range_in_cidr(admin_range, - ip_range): - net_errors.append("cidr") - err_msgs.append( - "IP range {0} - {1} in {2} network intersects " - "with admin range of {3}".format( - v[0], v[1], - ng.get('name') or ng_db.name or ng_db.id, - settings.ADMIN_NETWORK['cidr'] - ) - ) - sub_ranges.append(k) - - if ng.get('amount') > 1 and netmanager == 'FlatDHCPManager': - net_errors.append("amount") - err_msgs.append( - "Network amount for '{0}' is more than 1 " - "while using FlatDHCP manager.".format( - ng.get('name') or ng_db.name or ng_db.id - ) - ) - if net_errors: - result.append({ - "id": int(ng["id"]), - "range_errors": sub_ranges, - "errors": net_errors - }) - if err_msgs: - task.result = result - db().add(task) - db().commit() - full_err_msg = "\n".join(err_msgs) - raise errors.NetworkCheckError(full_err_msg) - - -class CheckBeforeDeploymentTask(object): - @classmethod - def execute(cls, task): - cls.__check_controllers_count(task) - cls.__check_disks(task) - cls.__check_network(task) - - @classmethod - def __check_controllers_count(cls, task): - controllers_count = len(filter( - lambda node: 'controller' in (node.roles + node.pending_roles), - task.cluster.nodes) - ) - cluster_mode = task.cluster.mode - - if cluster_mode == 'multinode' and controllers_count < 1: - raise errors.NotEnoughControllers( - "Not enough controllers, %s mode requires at least 1 " - "controller" % (cluster_mode)) - elif cluster_mode == 'ha_compact' and controllers_count < 3: - raise errors.NotEnoughControllers( - "Not enough controllers, %s mode requires at least 3 " - "controllers" % (cluster_mode)) - - @classmethod - def __check_disks(cls, task): - try: - for node in task.cluster.nodes: - node.volume_manager.check_disk_space_for_deployment() - except errors.NotEnoughFreeSpace: - raise errors.NotEnoughFreeSpace( - u"Node '%s' has insufficient disk space" % - node.human_readable_name) - - @classmethod - def __check_network(cls, task): - nodes_count = len(task.cluster.nodes) - - public_network = filter( - lambda ng: ng.name == 'public', - task.cluster.network_groups)[0] - public_network_size = cls.__network_size(public_network) - - if public_network_size < nodes_count: - error_message = cls.__format_network_error(nodes_count) - raise errors.NetworkCheckError(error_message) - - @classmethod - def __network_size(cls, network): - size = 0 - for ip_range in network.ip_ranges: - size += len(netaddr.IPRange(ip_range.first, ip_range.last)) - return size - - @classmethod - def __format_network_error(cls, nodes_count): - return 'Not enough IP addresses. Public network must have at least '\ - '{nodes_count} IP addresses '.format(nodes_count=nodes_count) + \ - 'for the current environment.' - - -# Red Hat related tasks - -class RedHatTask(object): - - @classmethod - def message(cls, task, data): - raise NotImplementedError() - - @classmethod - def execute(cls, task, data): - logger.debug( - "%s(uuid=%s) is running" % - (cls.__name__, task.uuid) - ) - message = cls.message(task, data) - task.cache = message - task.result = {'release_info': data} - db().add(task) - db().commit() - rpc.cast('naily', message) - - -class RedHatDownloadReleaseTask(RedHatTask): - - @classmethod - def message(cls, task, data): - # TODO(NAME): fix this ugly code - cls.__update_release_state( - data["release_id"] - ) - return { - 'method': 'download_release', - 'respond_to': 'download_release_resp', - 'args': { - 'task_uuid': task.uuid, - 'release_info': data - } - } - - @classmethod - def __update_release_state(cls, release_id): - release = db().query(Release).get(release_id) - release.state = 'downloading' - db().commit() - - -class RedHatCheckCredentialsTask(RedHatTask): - - @classmethod - def message(cls, task, data): - return { - "method": "check_redhat_credentials", - "respond_to": "check_redhat_credentials_resp", - "args": { - "task_uuid": task.uuid, - "release_info": data - } - } - - -class RedHatCheckLicensesTask(RedHatTask): - - @classmethod - def message(cls, task, data, nodes=None): - msg = { - 'method': 'check_redhat_licenses', - 'respond_to': 'redhat_check_licenses_resp', - 'args': { - 'task_uuid': task.uuid, - 'release_info': data - } - } - if nodes: - msg['args']['nodes'] = nodes - return msg - - -class DumpTask(object): - @classmethod - def conf(cls): - logger.debug("Preparing config for snapshot") - nodes = db().query(Node).filter( - Node.status.in_(['ready', 'provisioned', 'deploying', 'error']) - ).all() - - dump_conf = settings.DUMP - dump_conf['dump_roles']['slave'] = [n.fqdn for n in nodes] - logger.debug("Dump slave nodes: %s", - ", ".join(dump_conf['dump_roles']['slave'])) - - """ - here we try to filter out sensitive data from logs - """ - rh_accounts = db().query(RedHatAccount).all() - for num, obj in enumerate(dump_conf['dump_objects']['master']): - if obj['type'] == 'subs' and obj['path'] == '/var/log/remote': - for fieldname in ("username", "password"): - for fieldvalue in [getattr(acc, fieldname) - for acc in rh_accounts]: - obj['subs'][fieldvalue] = ('substituted_{0}' - ''.format(fieldname)) - logger.debug("Dump conf: %s", str(dump_conf)) - return dump_conf - - @classmethod - def execute(cls, task): - logger.debug("DumpTask: task=%s" % task.uuid) - message = { - 'method': 'dump_environment', - 'respond_to': 'dump_environment_resp', - 'args': { - 'task_uuid': task.uuid, - 'lastdump': settings.DUMP["lastdump"] - } - } - task.cache = message - db().add(task) - db().commit() - rpc.cast('naily', message) - - -def dump(): - """Entry point dump script.""" - from shotgun.config import Config as ShotgunConfig - from shotgun.manager import Manager as ShotgunManager - logger.debug("Starting snapshot procedure") - conf = ShotgunConfig(DumpTask.conf()) - manager = ShotgunManager(conf) - print(manager.snapshot()) diff --git a/nailgun/nailgun/test/__init__.py b/nailgun/nailgun/test/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/test/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/test/base.py b/nailgun/nailgun/test/base.py deleted file mode 100644 index 5a0aaf1e8..000000000 --- a/nailgun/nailgun/test/base.py +++ /dev/null @@ -1,770 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -try: - from unittest.case import TestCase -except ImportError: - # Runing unit-tests in production environment - from unittest2.case import TestCase - -from datetime import datetime -from functools import partial -from itertools import izip -import json -import logging -import mock -import os -from random import randint -import re -import time - -from paste.fixture import TestApp - -import nailgun -from nailgun.api.models import Cluster -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.api.models import NodeAttributes -from nailgun.api.models import NodeNICInterface -from nailgun.api.models import Notification -from nailgun.api.models import RedHatAccount -from nailgun.api.models import Release -from nailgun.api.models import Task -from nailgun.api.urls import urls -from nailgun.db import db -from nailgun.db import flush -from nailgun.db import syncdb -from nailgun.fixtures.fixman import upload_fixture -from nailgun.network.manager import NetworkManager -from nailgun.wsgi import build_app - - -class TimeoutError(Exception): - pass - - -class Environment(object): - - def __init__(self, app): - self.db = db() - self.app = app - self.tester = TestCase - self.tester.runTest = lambda a: None - self.tester = self.tester() - self.here = os.path.abspath(os.path.dirname(__file__)) - self.fixture_dir = os.path.join(self.here, "..", "fixtures") - self.default_headers = { - "Content-Type": "application/json" - } - self.releases = [] - self.clusters = [] - self.nodes = [] - self.network_manager = NetworkManager() - - def create(self, **kwargs): - cluster = self.create_cluster( - **kwargs.pop('cluster_kwargs', {}) - ) - for node_kwargs in kwargs.pop('nodes_kwargs', []): - if "cluster_id" not in node_kwargs: - if isinstance(cluster, dict): - node_kwargs["cluster_id"] = cluster["id"] - else: - node_kwargs["cluster_id"] = cluster.id - node_kwargs.setdefault("api", False) - self.create_node( - **node_kwargs - ) - return cluster - - def create_release(self, api=False, **kwargs): - version = str(randint(0, 100000000)) - release_data = { - 'name': u"release_name_" + version, - 'version': version, - 'description': u"release_desc" + version, - 'operating_system': 'CensOS', - 'roles': self.get_default_roles(), - 'networks_metadata': self.get_default_networks_metadata(), - 'attributes_metadata': self.get_default_attributes_metadata(), - 'volumes_metadata': self.get_default_volumes_metadata() - } - if kwargs: - release_data.update(kwargs) - if api: - resp = self.app.post( - reverse('ReleaseCollectionHandler'), - params=json.dumps(release_data), - headers=self.default_headers - ) - self.tester.assertEquals(resp.status, 201) - release = json.loads(resp.body) - self.releases.append( - self.db.query(Release).get(release['id']) - ) - else: - release = Release() - for field, value in release_data.iteritems(): - setattr(release, field, value) - self.db.add(release) - self.db.commit() - self.releases.append(release) - return release - - def download_release(self, release_id): - release_data = { - 'license_type': 'rhsm', - 'username': 'rheltest', - 'password': 'password', - 'release_id': release_id - } - - resp = self.app.post( - reverse('RedHatAccountHandler'), - params=json.dumps(release_data), - headers=self.default_headers - ) - self.tester.assertEquals(resp.status, 200) - download_task = json.loads(resp.body) - return self.db.query(Task).get(download_task['id']) - - def create_cluster(self, api=True, exclude=None, **kwargs): - cluster_data = { - 'name': 'cluster-api-' + str(randint(0, 1000000)) - } - if kwargs: - cluster_data.update(kwargs) - if api: - cluster_data['release'] = self.create_release(api=False).id - else: - cluster_data['release'] = self.create_release(api=False) - if exclude and isinstance(exclude, list): - for ex in exclude: - try: - del cluster_data[ex] - except KeyError as err: - logging.warning(err) - if api: - resp = self.app.post( - reverse('ClusterCollectionHandler'), - json.dumps(cluster_data), - headers=self.default_headers - ) - self.tester.assertEquals(resp.status, 201) - cluster = json.loads(resp.body) - self.clusters.append( - self.db.query(Cluster).get(cluster['id']) - ) - else: - cluster = Cluster() - for field, value in cluster_data.iteritems(): - setattr(cluster, field, value) - self.db.add(cluster) - self.db.commit() - self.clusters.append(cluster) - return cluster - - def create_node( - self, api=False, - exclude=None, expect_http=201, - expect_message=None, - **kwargs): - metadata = kwargs.get('meta') - default_metadata = self.default_metadata() - if metadata: - default_metadata.update(metadata) - - mac = self._generate_random_mac() - if default_metadata['interfaces']: - default_metadata['interfaces'][0]['mac'] = kwargs.get('mac', mac) - - node_data = { - 'mac': mac, - 'roles': ['controller'], - 'status': 'discover', - 'meta': default_metadata - } - if kwargs: - meta = kwargs.pop('meta', None) - node_data.update(kwargs) - if meta: - kwargs['meta'] = meta - - if exclude and isinstance(exclude, list): - for ex in exclude: - try: - del node_data[ex] - except KeyError as err: - logging.warning(err) - if api: - resp = self.app.post( - reverse('NodeCollectionHandler'), - json.dumps(node_data), - headers=self.default_headers, - expect_errors=True - ) - self.tester.assertEquals(resp.status, expect_http) - if expect_message: - self.tester.assertEquals(resp.body, expect_message) - if str(expect_http)[0] != "2": - return None - self.tester.assertEquals(resp.status, expect_http) - node = json.loads(resp.body) - node_db = self.db.query(Node).get(node['id']) - self._set_interfaces_if_not_set_in_meta( - node_db.id, - kwargs.get('meta', None)) - self.nodes.append(node_db) - else: - node = Node() - node.timestamp = datetime.now() - if 'cluster_id' in node_data: - cluster_id = node_data.pop('cluster_id') - for cluster in self.clusters: - if cluster.id == cluster_id: - node.cluster = cluster - break - else: - node.cluster_id = cluster_id - for key, value in node_data.iteritems(): - setattr(node, key, value) - node.attributes = self.create_attributes() - node.attributes.volumes = node.volume_manager.gen_volumes_info() - self.db.add(node) - self.db.commit() - self._set_interfaces_if_not_set_in_meta( - node.id, - kwargs.get('meta', None)) - - self.nodes.append(node) - - return node - - def create_rh_account(self, **kwargs): - username = kwargs.pop("username", "rh_username") - password = kwargs.pop("password", "rh_password") - license_type = kwargs.pop("license_type", "rhsm") - rh_account = RedHatAccount( - username=username, - password=password, - license_type=license_type, - **kwargs - ) - self.db.add(rh_account) - self.db.commit() - return rh_account - - def create_task(self, **kwargs): - task = Task(**kwargs) - self.db.add(task) - self.db.commit() - return task - - def create_attributes(self): - return NodeAttributes() - - def create_notification(self, **kwargs): - notif_data = { - "topic": "discover", - "message": "Test message", - "status": "unread", - "datetime": datetime.now() - } - if kwargs: - notif_data.update(kwargs) - notification = Notification() - notification.cluster_id = notif_data.get("cluster_id") - for f, v in notif_data.iteritems(): - setattr(notification, f, v) - self.db.add(notification) - self.db.commit() - return notification - - def default_metadata(self): - item = self.find_item_by_pk_model( - self.read_fixtures(("sample_environment",)), - 1, 'nailgun.node') - return item.get('fields').get('meta') - - def _generate_random_mac(self): - mac = [randint(0x00, 0x7f) for _ in xrange(6)] - return ':'.join(map(lambda x: "%02x" % x, mac)).upper() - - def generate_interfaces_in_meta(self, amount): - nics = [] - for i in xrange(amount): - nics.append( - { - 'name': 'eth{0}'.format(i), - 'mac': self._generate_random_mac(), - 'current_speed': 100, - 'max_speed': 1000 - } - ) - return {'interfaces': nics} - - def _set_interfaces_if_not_set_in_meta(self, node_id, meta): - if not meta or not 'interfaces' in meta: - self._add_interfaces_to_node(node_id) - - def _add_interfaces_to_node(self, node_id, count=1): - interfaces = [] - allowed_networks = list(self.db.query(NetworkGroup).filter( - NetworkGroup.id.in_( - self.network_manager.get_all_cluster_networkgroups(node_id) - ) - )) - - for i in xrange(count): - nic_dict = { - 'node_id': node_id, - 'name': 'eth{0}'.format(i), - 'mac': self._generate_random_mac(), - 'current_speed': 100, - 'max_speed': 1000, - 'allowed_networks': allowed_networks, - 'assigned_networks': allowed_networks - } - - interface = NodeNICInterface() - for k, v in nic_dict.iteritems(): - setattr(interface, k, v) - - self.db.add(interface) - self.db.commit() - - interfaces.append(interface) - - return interfaces - - def generate_ui_networks(self, cluster_id): - start_id = self.db.query(NetworkGroup.id).order_by( - NetworkGroup.id - ).first() - start_id = 0 if not start_id else start_id[-1] + 1 - net_names = ( - "floating", - "public", - "management", - "storage", - "fixed" - ) - net_cidrs = ( - "172.16.0.0/24", - "172.16.1.0/24", - "192.168.0.0/24", - "192.168.0.0/24", - "10.0.0.0/24" - ) - nets = {'networks': [{ - "network_size": 256, - "name": nd[0], - "amount": 1, - "cluster_id": cluster_id, - "vlan_start": 100 + i, - "cidr": nd[1], - "id": start_id + i - } for i, nd in enumerate(zip(net_names, net_cidrs))]} - - public = filter( - lambda net: net['name'] == 'public', - nets['networks'])[0] - public['netmask'] = '255.255.255.0' - - return nets - - def get_default_roles(self): - return ['controller', 'compute', 'cinder', 'ceph-osd'] - - def get_default_volumes_metadata(self): - return self.read_fixtures( - ('openstack',))[0]['fields']['volumes_metadata'] - - def get_default_networks_metadata(self): - return [ - {"name": "floating", "access": "public"}, - {"name": "public", "access": "public"}, - {"name": "management", "access": "private192"}, - {"name": "storage", "access": "private192"}, - {"name": "fixed", "access": "private10"} - ] - - def get_default_attributes_metadata(self): - return self.read_fixtures( - ['openstack'])[0]['fields']['attributes_metadata'] - - def upload_fixtures(self, fxtr_names): - for fxtr_path in self.fxtr_paths_by_names(fxtr_names): - with open(fxtr_path, "r") as fxtr_file: - upload_fixture(fxtr_file) - - def read_fixtures(self, fxtr_names): - data = [] - for fxtr_path in self.fxtr_paths_by_names(fxtr_names): - with open(fxtr_path, "r") as fxtr_file: - try: - data.extend(json.load(fxtr_file)) - except Exception as exc: - logging.error( - 'Error "%s" occurred while loading ' - 'fixture %s' % (exc, fxtr_path) - ) - return data - - def fxtr_paths_by_names(self, fxtr_names): - for fxtr in fxtr_names: - fxtr_path = os.path.join( - self.fixture_dir, - "%s.json" % fxtr - ) - - if not os.path.exists(fxtr_path): - logging.warning( - "Fixture file was not found: %s", - fxtr_path - ) - break - else: - logging.debug( - "Fixture file is found, yielding path: %s", - fxtr_path - ) - yield fxtr_path - - def find_item_by_pk_model(self, data, pk, model): - for item in data: - if item.get('pk') == pk and item.get('model') == model: - return item - - def launch_deployment(self): - if self.clusters: - resp = self.app.put( - reverse( - 'ClusterChangesHandler', - kwargs={'cluster_id': self.clusters[0].id}), - headers=self.default_headers) - self.tester.assertEquals(200, resp.status) - response = json.loads(resp.body) - return self.db.query(Task).filter_by( - uuid=response['uuid'] - ).first() - else: - raise NotImplementedError( - "Nothing to deploy - try creating cluster" - ) - - def launch_verify_networks(self, data=None): - if self.clusters: - if data: - nets = json.dumps(data) - else: - resp = self.app.get( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': self.clusters[0].id} - ), - headers=self.default_headers - ) - self.tester.assertEquals(200, resp.status) - nets = resp.body - - resp = self.app.put( - reverse( - 'NetworkConfigurationVerifyHandler', - kwargs={'cluster_id': self.clusters[0].id}), - nets, - headers=self.default_headers - ) - self.tester.assertEquals(200, resp.status) - response = json.loads(resp.body) - task_uuid = response['uuid'] - return self.db.query(Task).filter_by(uuid=task_uuid).first() - else: - raise NotImplementedError( - "Nothing to verify - try creating cluster" - ) - - def refresh_nodes(self): - for n in self.nodes[:]: - try: - self.db.add(n) - self.db.refresh(n) - except Exception: - self.nodes.remove(n) - - def refresh_clusters(self): - for n in self.clusters[:]: - try: - self.db.refresh(n) - except Exception: - self.nodes.remove(n) - - def _wait_task(self, task, timeout, message): - timer = time.time() - while task.status == 'running': - self.db.refresh(task) - if time.time() - timer > timeout: - raise Exception( - "Task '{0}' seems to be hanged".format( - task.name - ) - ) - time.sleep(1) - self.tester.assertEquals(task.progress, 100) - if isinstance(message, type(re.compile("regexp"))): - self.tester.assertIsNotNone(re.match(message, task.message)) - elif isinstance(message, str): - self.tester.assertEquals(task.message, message) - - def wait_ready(self, task, timeout=60, message=None): - self._wait_task(task, timeout, message) - self.tester.assertEquals(task.status, 'ready') - - def wait_error(self, task, timeout=60, message=None): - self._wait_task(task, timeout, message) - self.tester.assertEquals(task.status, 'error') - - def wait_for_nodes_status(self, nodes, status): - def check_statuses(): - self.refresh_nodes() - - nodes_with_status = filter( - lambda x: x.status in status, - nodes) - - return len(nodes) == len(nodes_with_status) - - self.wait_for_true( - check_statuses, - error_message='Something wrong with the statuses') - - def wait_for_true(self, check, args=[], kwargs={}, - timeout=60, error_message='Timeout error'): - - start_time = time.time() - - while True: - result = check(*args, **kwargs) - if result: - return result - if time.time() - start_time > timeout: - raise TimeoutError(error_message) - time.sleep(0.1) - - -class BaseTestCase(TestCase): - fixtures = ['admin_network'] - - def __init__(self, *args, **kwargs): - super(BaseTestCase, self).__init__(*args, **kwargs) - self.default_headers = { - "Content-Type": "application/json" - } - - @classmethod - def setUpClass(cls): - cls.db = db() - cls.app = TestApp(build_app().wsgifunc()) - syncdb() - - @classmethod - def tearDownClass(cls): - cls.db.commit() - - def setUp(self): - flush() - self.env = Environment(app=self.app) - self.env.upload_fixtures(self.fixtures) - - def tearDown(self): - self.db.expunge_all() - - def assertNotRaises(self, exception, method, *args, **kwargs): - try: - method(*args, **kwargs) - except exception: - self.fail('Exception "{0}" raised.'.format(exception)) - - def datadiff(self, node1, node2, path=None): - if path is None: - path = [] - - print("Path: {0}".format("->".join(path))) - - if not isinstance(node1, dict) or not isinstance(node2, dict): - if isinstance(node1, list): - newpath = path[:] - for i, keys in enumerate(izip(node1, node2)): - newpath.append(str(i)) - self.datadiff(keys[0], keys[1], newpath) - newpath.pop() - elif node1 != node2: - err = "Values differ: {0} != {1}".format( - str(node1), - str(node2) - ) - raise Exception(err) - else: - newpath = path[:] - for key1, key2 in zip( - sorted(node1.keys()), - sorted(node2.keys()) - ): - if key1 != key2: - err = "Keys differ: {0} != {1}".format( - str(key1), - str(key2) - ) - raise Exception(err) - newpath.append(key1) - self.datadiff(node1[key1], node2[key2], newpath) - newpath.pop() - - -class BaseIntegrationTest(BaseTestCase): - @classmethod - def setUpClass(cls): - super(BaseIntegrationTest, cls).setUpClass() - nailgun.task.task.DeploymentTask._prepare_syslog_dir = mock.Mock() - - def _wait_for_threads(self): - # wait for fake task thread termination - import threading - for thread in threading.enumerate(): - if thread is not threading.currentThread(): - if hasattr(thread, "rude_join"): - timer = time.time() - timeout = 25 - thread.rude_join(timeout) - if time.time() - timer > timeout: - raise Exception( - '{0} seconds is not enough' - ' - possible hanging'.format( - timeout - ) - ) - - -def fake_tasks(fake_rpc=True, - mock_rpc=True, - **kwargs): - def wrapper(func): - func = mock.patch( - 'nailgun.task.task.settings.FAKE_TASKS', - True - )(func) - func = mock.patch( - 'nailgun.task.fake.settings.FAKE_TASKS_TICK_COUNT', - 99 - )(func) - func = mock.patch( - 'nailgun.task.fake.settings.FAKE_TASKS_TICK_INTERVAL', - 1 - )(func) - if fake_rpc and not kwargs: - func = mock.patch( - 'nailgun.task.task.rpc.cast', - nailgun.task.task.fake_cast - )(func) - elif fake_rpc and kwargs: - func = mock.patch( - 'nailgun.task.task.rpc.cast', - partial( - nailgun.task.task.fake_cast, - **kwargs - ) - )(func) - elif mock_rpc: - func = mock.patch( - 'nailgun.task.task.rpc.cast' - )(func) - return func - return wrapper - - -def reverse(name, kwargs=None): - urldict = dict(zip(urls[1::2], urls[::2])) - url = urldict[name] - urlregex = re.compile(url) - for kwarg in urlregex.groupindex: - if kwarg not in kwargs: - raise KeyError("Invalid argument specified") - url = re.sub( - r"\(\?P<{0}>[^)]+\)".format(kwarg), - str(kwargs[kwarg]), - url, - 1 - ) - url = re.sub(r"\??\$", "", url) - return "/api" + url - - -# this method is for development and troubleshooting purposes -def datadiff(data1, data2, branch, p=True): - def iterator(data1, data2): - if isinstance(data1, (list,)) and isinstance(data2, (list,)): - return xrange(max(len(data1), len(data2))) - elif isinstance(data1, (dict,)) and isinstance(data2, (dict,)): - return (set(data1.keys()) | set(data2.keys())) - else: - raise TypeError - - diff = [] - if data1 != data2: - try: - it = iterator(data1, data2) - except Exception: - return [(branch, data1, data2)] - - for k in it: - newbranch = branch[:] - newbranch.append(k) - - if p: - print("Comparing branch: %s" % newbranch) - try: - try: - v1 = data1[k] - except (KeyError, IndexError): - if p: - print("data1 seems does not have key = %s" % k) - diff.append((newbranch, None, data2[k])) - continue - try: - v2 = data2[k] - except (KeyError, IndexError): - if p: - print("data2 seems does not have key = %s" % k) - diff.append((newbranch, data1[k], None)) - continue - - except Exception: - if p: - print("data1 and data2 cannot be compared on " - "branch: %s" % newbranch) - return diff.append((newbranch, data1, data2)) - - else: - if v1 != v2: - if p: - print("data1 and data2 do not match " - "each other on branch: %s" % newbranch) - # print("data1 = %s" % data1) - print("v1 = %s" % v1) - # print("data2 = %s" % data2) - print("v2 = %s" % v2) - diff.extend(datadiff(v1, v2, newbranch)) - return diff diff --git a/nailgun/nailgun/test/integration/__init__.py b/nailgun/nailgun/test/integration/__init__.py deleted file mode 100644 index 1c7b9b881..000000000 --- a/nailgun/nailgun/test/integration/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/test/integration/test_attributes.py b/nailgun/nailgun/test/integration/test_attributes.py deleted file mode 100644 index 27c893668..000000000 --- a/nailgun/nailgun/test/integration/test_attributes.py +++ /dev/null @@ -1,199 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Attributes -from nailgun.api.models import Cluster -from nailgun.api.models import Release -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestAttributes(BaseIntegrationTest): - - def test_attributes_creation(self): - cluster = self.env.create_cluster(api=True) - resp = self.app.get( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster['id']}), - headers=self.default_headers - ) - release = self.db.query(Release).get( - cluster['release']['id'] - ) - self.assertEquals(200, resp.status) - self.assertEquals( - json.loads(resp.body)['editable'], - release.attributes_metadata['editable'] - ) - attrs = self.db.query(Attributes).filter( - Attributes.cluster_id == cluster['id'] - ).first() - self._compare( - release.attributes_metadata['generated'], - attrs.generated - ) - - def test_500_if_no_attributes(self): - cluster = self.env.create_cluster(api=False) - resp = self.app.put( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster.id}), - params=json.dumps({ - 'editable': { - "foo": "bar" - }, - }), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(500, resp.status) - - def test_attributes_update(self): - cluster_id = self.env.create_cluster(api=True)['id'] - resp = self.app.get( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster_id}), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - resp = self.app.put( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster_id}), - params=json.dumps({ - 'editable': { - "foo": "bar" - }, - }), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - attrs = self.db.query(Attributes).filter( - Attributes.cluster_id == cluster_id - ).first() - self.assertEquals("bar", attrs.editable["foo"]) - # 400 on generated update - resp = self.app.put( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster_id}), - params=json.dumps({ - 'generated': { - "foo": "bar" - }, - }), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(400, resp.status) - # 400 if editable is not dict - resp = self.app.put( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster_id}), - params=json.dumps({ - 'editable': ["foo", "bar"], - }), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(400, resp.status) - - def test_get_default_attributes(self): - cluster = self.env.create_cluster(api=True) - release = self.db.query(Release).get( - cluster['release']['id'] - ) - resp = self.app.put( - reverse( - 'ClusterAttributesDefaultsHandler', - kwargs={'cluster_id': cluster['id']}), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - self.assertEquals( - json.loads(resp.body)['editable'], - release.attributes_metadata['editable'] - ) - - def test_attributes_set_defaults(self): - cluster = self.env.create_cluster(api=True) - # Change editable attributes. - resp = self.app.put( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster['id']}), - params=json.dumps({ - 'editable': { - "foo": "bar" - }, - }), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(200, resp.status) - attrs = self.db.query(Attributes).filter( - Attributes.cluster_id == cluster['id'] - ).first() - self.assertEquals("bar", attrs.editable["foo"]) - # Set attributes to defaults. - resp = self.app.put( - reverse( - 'ClusterAttributesDefaultsHandler', - kwargs={'cluster_id': cluster['id']}), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - release = self.db.query(Release).get( - cluster['release']['id'] - ) - self.assertEquals( - json.loads(resp.body)['editable'], - release.attributes_metadata['editable'] - ) - - def test_attributes_merged_values(self): - cluster = self.env.create_cluster(api=True) - cluster_db = self.db.query(Cluster).get(cluster['id']) - orig_attrs = cluster_db.attributes.merged_attrs() - attrs = cluster_db.attributes.merged_attrs_values() - for group, group_attrs in orig_attrs.iteritems(): - for attr, orig_value in group_attrs.iteritems(): - if group == 'common': - value = attrs[attr] - else: - value = attrs[group][attr] - if isinstance(orig_value, dict) and 'value' in orig_value: - self.assertEquals(orig_value['value'], value) - else: - self.assertEquals(orig_value, value) - - def _compare(self, d1, d2): - if isinstance(d1, dict) and isinstance(d2, dict): - for s_field, s_value in d1.iteritems(): - if s_field not in d2: - raise KeyError() - self._compare(s_value, d2[s_field]) - elif isinstance(d1, str) or isinstance(d1, unicode): - if d1 in [u"", ""]: - self.assertEqual(len(d2), 8) - else: - self.assertEqual(d1, d2) diff --git a/nailgun/nailgun/test/integration/test_changes_model.py b/nailgun/nailgun/test/integration/test_changes_model.py deleted file mode 100644 index 07fd86470..000000000 --- a/nailgun/nailgun/test/integration/test_changes_model.py +++ /dev/null @@ -1,192 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Cluster -from nailgun.api.models import ClusterChanges -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestClusterChanges(BaseIntegrationTest): - - def tearDown(self): - self._wait_for_threads() - super(TestClusterChanges, self).tearDown() - - def test_cluster_creation_adds_pending_changes(self): - self.env.create_cluster(api=True) - attributes_changes = self.db.query(ClusterChanges).filter_by( - name="attributes" - ).all() - self.assertEquals(len(attributes_changes), 1) - networks_changes = self.db.query(ClusterChanges).filter_by( - name="networks" - ).all() - self.assertEquals(len(networks_changes), 1) - all_changes = self.db.query(ClusterChanges).all() - self.assertEquals(len(all_changes), 2) - - def test_node_volumes_modification_adds_pending_changes(self): - cluster = self.env.create_cluster(api=True) - self.env.create_node( - api=True, - cluster_id=cluster["id"] - ) - node_db = self.env.nodes[0] - node_disks_changes = self.db.query(ClusterChanges).filter_by( - name="disks", - node_id=node_db.id - ).all() - self.assertEquals(len(node_disks_changes), 1) - resp = self.app.get( - reverse( - 'ClusterHandler', - kwargs={'cluster_id': cluster['id']}), - headers=self.default_headers - ) - response = json.loads(resp.body) - self.assertIn( - ["disks", node_db.id], - response["changes"] - ) - - def test_node_volumes_clears_after_deletion_from_cluster(self): - cluster = self.env.create_cluster(api=True) - self.env.create_node( - api=True, - cluster_id=cluster["id"] - ) - node_db = self.env.nodes[0] - node_disks_changes = self.db.query(ClusterChanges).filter_by( - name="disks", - node_id=node_db.id - ).all() - self.assertEquals(len(node_disks_changes), 1) - self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{"id": node_db.id, "cluster_id": None}]), - headers=self.default_headers - ) - self.env.refresh_clusters() - node_disks_changes = self.db.query(ClusterChanges).filter_by( - name="disks", - node_id=node_db.id - ).all() - self.assertEquals(len(node_disks_changes), 0) - - def test_attributes_changing_adds_pending_changes(self): - cluster = self.env.create_cluster(api=True) - cluster_db = self.env.clusters[0] - cluster_db.clear_pending_changes() - all_changes = self.db.query(ClusterChanges).all() - self.assertEquals(len(all_changes), 0) - self.app.put( - reverse( - 'ClusterAttributesHandler', - kwargs={'cluster_id': cluster['id']}), - json.dumps({ - 'editable': { - "foo": "bar" - } - }), - headers=self.default_headers - ) - pending_changes = self.db.query(ClusterChanges).filter_by( - name="attributes" - ).all() - self.assertEquals(len(pending_changes), 1) - - def test_default_attributes_adds_pending_changes(self): - cluster = self.env.create_cluster(api=True) - cluster_db = self.env.clusters[0] - cluster_db.clear_pending_changes() - all_changes = self.db.query(ClusterChanges).all() - self.assertEquals(len(all_changes), 0) - self.app.put( - reverse( - 'ClusterAttributesDefaultsHandler', - kwargs={'cluster_id': cluster['id']}), - headers=self.default_headers - ) - pending_changes = self.db.query(ClusterChanges).filter_by( - name="attributes" - ).all() - self.assertEquals(len(pending_changes), 1) - - def test_network_changing_adds_pending_changes(self): - cluster = self.env.create_cluster(api=True) - cluster_db = self.env.clusters[0] - cluster_db.clear_pending_changes() - all_changes = self.db.query(ClusterChanges).all() - self.assertEquals(len(all_changes), 0) - resp = self.app.get( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': cluster['id']}), - headers=self.default_headers - ) - net_id = json.loads(resp.body)['networks'][0]["id"] - resp = self.app.put( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': cluster['id']}), - json.dumps({'networks': [{ - "id": net_id, "access": "restricted"} - ]}), - headers=self.default_headers - ) - pending_changes = self.db.query(ClusterChanges).filter_by( - name="networks" - ).all() - self.assertEquals(len(pending_changes), 1) - - @fake_tasks() - def test_successful_deployment_drops_all_changes(self): - self.env.create( - nodes_kwargs=[ - {"api": True, "pending_addition": True} - ] - ) - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, 60) - cluster_db = self.db.query(Cluster).get( - self.env.clusters[0].id - ) - self.assertEquals(list(cluster_db.changes), []) - - @fake_tasks() - def test_failed_deployment_does_nothing_with_changes(self): - cluster = self.env.create_cluster(api=True) - self.env.create_node( - cluster_id=cluster["id"], - status="error", - error_type="provision" - ) - supertask = self.env.launch_deployment() - self.env.wait_error(supertask, 60) - attributes_changes = self.db.query(ClusterChanges).filter_by( - name="attributes" - ).all() - self.assertEquals(len(attributes_changes), 1) - networks_changes = self.db.query(ClusterChanges).filter_by( - name="networks" - ).all() - self.assertEquals(len(networks_changes), 1) - all_changes = self.db.query(ClusterChanges).all() - self.assertEquals(len(all_changes), 2) diff --git a/nailgun/nailgun/test/integration/test_charset_issues.py b/nailgun/nailgun/test/integration/test_charset_issues.py deleted file mode 100644 index c7742cf67..000000000 --- a/nailgun/nailgun/test/integration/test_charset_issues.py +++ /dev/null @@ -1,92 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import time - -from nailgun.api.models import Cluster -from nailgun.api.models import Task -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestCharsetIssues(BaseIntegrationTest): - - def tearDown(self): - self._wait_for_threads() - super(TestCharsetIssues, self).tearDown() - - @fake_tasks() - def test_deployment_cyrillic_names(self): - self.env.create( - cluster_kwargs={"name": u"Тестовый кластер"}, - nodes_kwargs=[ - {"name": u"Контроллер", "pending_addition": True}, - {"name": u"Компьют", "pending_addition": True}, - {"pending_deletion": True}, - ] - ) - supertask = self.env.launch_deployment() - self.assertEquals(supertask.name, 'deploy') - self.assertIn(supertask.status, ('running', 'ready')) - # we have three subtasks here - # deletion - # provision - # deployment - self.assertEquals(len(supertask.subtasks), 3) - - self.env.wait_for_nodes_status(self.env.nodes, 'provisioning') - self.env.wait_ready(supertask, 60) - - @fake_tasks() - def test_deletion_during_deployment(self): - self.env.create( - cluster_kwargs={ - "name": u"Вася" - }, - nodes_kwargs=[ - {"status": "ready", "pending_addition": True}, - ] - ) - cluster_id = self.env.clusters[0].id - self.app.put( - reverse( - 'ClusterChangesHandler', - kwargs={'cluster_id': cluster_id}), - headers=self.default_headers - ) - self.app.delete( - reverse( - 'ClusterHandler', - kwargs={'cluster_id': cluster_id}), - headers=self.default_headers - ) - timeout = 10 - timer = time.time() - while True: - task_delete = self.db.query(Task).filter_by( - cluster_id=cluster_id, - name="cluster_deletion" - ).first() - if not task_delete: - break - self.db.expire(task_delete) - if (time.time() - timer) > timeout: - raise Exception("Cluster deletion timeout") - time.sleep(0.24) - - cluster_db = self.db.query(Cluster).get(cluster_id) - self.assertIsNone(cluster_db) diff --git a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py b/nailgun/nailgun/test/integration/test_cluster_changes_handler.py deleted file mode 100644 index 38524eee4..000000000 --- a/nailgun/nailgun/test/integration/test_cluster_changes_handler.py +++ /dev/null @@ -1,558 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from copy import deepcopy -from itertools import izip -import json -from mock import patch - - -import nailgun -from nailgun.api.models import IPAddr -from nailgun.api.models import NetworkGroup -from nailgun.api.models import NodeNICInterface -from nailgun.network.manager import NetworkManager -from nailgun.settings import settings -from nailgun.task.helpers import TaskHelper -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_deploy_cast_with_right_args(self, mocked_rpc): - self.env.create( - cluster_kwargs={ - 'mode': 'ha_compact' - }, - nodes_kwargs=[ - {'roles': ['controller'], 'pending_addition': True}, - {'roles': ['controller'], 'pending_addition': True}, - {'roles': ['controller', 'cinder'], 'pending_addition': True}, - {'roles': ['compute', 'cinder'], 'pending_addition': True}, - {'roles': ['compute'], 'pending_addition': True}, - {'roles': ['cinder'], 'pending_addition': True}]) - - cluster_db = self.env.clusters[0] - - common_attrs = { - 'deployment_mode': 'ha_compact', - 'mountpoints': '1 1\\n2 2\\n', - - 'management_vip': '192.168.0.2', - 'public_vip': '172.16.1.2', - - 'fixed_network_range': '10.0.0.0/24', - 'management_network_range': '192.168.0.0/24', - 'floating_network_range': ['172.16.0.2-172.16.0.254'], - 'storage_network_range': '192.168.1.0/24', - - 'mp': [{'weight': '1', 'point': '1'}, - {'weight': '2', 'point': '2'}], - 'novanetwork_parameters': { - 'network_manager': 'FlatDHCPManager', - 'network_size': 256 - }, - - 'management_interface': 'eth0.101', - 'fixed_interface': 'eth0.103', - 'admin_interface': 'eth0', - 'storage_interface': 'eth0.102', - 'public_interface': 'eth0.100', - 'floating_interface': 'eth0.100', - - 'master_ip': '127.0.0.1', - 'use_cinder': True, - 'deployment_id': cluster_db.id - } - - cluster_attrs = cluster_db.attributes.merged_attrs_values() - common_attrs.update(cluster_attrs) - - # Common attrs calculation - nodes_list = [] - nodes_db = sorted(cluster_db.nodes, key=lambda n: n.id) - assigned_ips = {} - i = 0 - for node in nodes_db: - node_id = node.id - for role in sorted(node.roles + node.pending_roles): - assigned_ips[node_id] = {} - assigned_ips[node_id]['internal'] = '192.168.0.%d' % (i + 3) - assigned_ips[node_id]['public'] = '172.16.1.%d' % (i + 3) - assigned_ips[node_id]['storage'] = '192.168.1.%d' % (i + 2) - - nodes_list.append({ - 'role': role, - - 'internal_address': assigned_ips[node_id]['internal'], - 'public_address': assigned_ips[node_id]['public'], - 'storage_address': assigned_ips[node_id]['storage'], - - 'internal_netmask': '255.255.255.0', - 'public_netmask': '255.255.255.0', - 'storage_netmask': '255.255.255.0', - - 'uid': str(node_id), - 'swift_zone': str(node_id), - - 'name': 'node-%d' % node_id, - 'fqdn': 'node-%d.%s' % (node_id, settings.DNS_DOMAIN)}) - i += 1 - - common_attrs['controller_nodes'] = filter( - lambda node: node['role'] == 'controller', - deepcopy(nodes_list)) - - common_attrs['nodes'] = nodes_list - common_attrs['nodes'][0]['role'] = 'primary-controller' - - common_attrs['last_controller'] = common_attrs[ - 'controller_nodes'][-1]['name'] - - # Individual attrs calculation and - # merging with common attrs - priority_mapping = { - 'controller': [600, 500, 400], - 'cinder': 700, - 'compute': 700 - } - - deployment_info = [] - for node in nodes_db: - ips = assigned_ips[node.id] - for role in sorted(node.roles): - priority = priority_mapping[role] - if isinstance(priority, list): - priority = priority.pop() - - individual_atts = { - 'uid': str(node.id), - 'status': node.status, - 'role': role, - 'online': node.online, - 'fqdn': 'node-%d.%s' % (node.id, settings.DNS_DOMAIN), - 'priority': priority, - - 'network_data': { - 'eth0.100': { - 'interface': 'eth0.100', - 'ipaddr': ['%s/24' % ips['public']], - 'gateway': '172.16.1.1', - '_name': 'public'}, - 'eth0.101': { - 'interface': 'eth0.101', - 'ipaddr': ['%s/24' % ips['internal']], - '_name': 'management'}, - 'eth0.102': { - 'interface': 'eth0.102', - 'ipaddr': ['%s/24' % ips['storage']], - '_name': 'storage'}, - 'eth0.103': { - 'interface': 'eth0.103', - 'ipaddr': 'none', - '_name': 'fixed'}, - 'lo': { - 'interface': 'lo', - 'ipaddr': ['127.0.0.1/8']}, - 'eth1': { - 'interface': 'eth1', - 'ipaddr': 'none'}, - 'eth0': { - 'interface': 'eth0', - 'ipaddr': 'dhcp', - '_name': 'admin'}}} - - individual_atts.update(common_attrs) - deployment_info.append(individual_atts) - - supertask = self.env.launch_deployment() - deploy_task_uuid = [x.uuid for x in supertask.subtasks - if x.name == 'deployment'][0] - - deployment_msg = {'method': 'deploy', - 'respond_to': 'deploy_resp', - 'args': {}} - - deployment_msg['args']['task_uuid'] = deploy_task_uuid - deployment_msg['args']['deployment_info'] = deployment_info - - provision_nodes = [] - admin_net_id = self.env.network_manager.get_admin_network_id() - - for n in sorted(self.env.nodes, key=lambda n: n.id): - pnd = { - 'profile': cluster_attrs['cobbler']['profile'], - 'power_type': 'ssh', - 'power_user': 'root', - 'power_address': n.ip, - 'power_pass': settings.PATH_TO_BOOTSTRAP_SSH_KEY, - 'name': TaskHelper.make_slave_name(n.id), - 'hostname': n.fqdn, - 'name_servers': '\"%s\"' % settings.DNS_SERVERS, - 'name_servers_search': '\"%s\"' % settings.DNS_SEARCH, - 'netboot_enabled': '1', - 'ks_meta': { - 'puppet_auto_setup': 1, - 'puppet_master': settings.PUPPET_MASTER_HOST, - 'puppet_version': settings.PUPPET_VERSION, - 'puppet_enable': 0, - 'mco_auto_setup': 1, - 'install_log_2_syslog': 1, - 'mco_pskey': settings.MCO_PSKEY, - 'mco_vhost': settings.MCO_VHOST, - 'mco_host': settings.MCO_HOST, - 'mco_user': settings.MCO_USER, - 'mco_password': settings.MCO_PASSWORD, - 'mco_connector': settings.MCO_CONNECTOR, - 'mco_enable': 1, - 'ks_spaces': "\"%s\"" % json.dumps( - n.attributes.volumes).replace("\"", "\\\""), - 'auth_key': "\"%s\"" % cluster_attrs.get('auth_key', ''), - } - } - - netmanager = NetworkManager() - netmanager.assign_admin_ips( - n.id, - len(n.meta.get('interfaces', [])) - ) - - admin_ips = set([i.ip_addr for i in self.db.query(IPAddr). - filter_by(node=n.id). - filter_by(network=admin_net_id)]) - - for i in n.meta.get('interfaces', []): - if 'interfaces' not in pnd: - pnd['interfaces'] = {} - pnd['interfaces'][i['name']] = { - 'mac_address': i['mac'], - 'static': '0', - 'netmask': settings.ADMIN_NETWORK['netmask'], - 'ip_address': admin_ips.pop(), - } - if 'interfaces_extra' not in pnd: - pnd['interfaces_extra'] = {} - pnd['interfaces_extra'][i['name']] = { - 'peerdns': 'no', - 'onboot': 'no' - } - - if i['mac'] == n.mac: - pnd['interfaces'][i['name']]['dns_name'] = n.fqdn - pnd['interfaces_extra'][i['name']]['onboot'] = 'yes' - - provision_nodes.append(pnd) - - provision_task_uuid = filter( - lambda t: t.name == 'provision', - supertask.subtasks)[0].uuid - - provision_msg = { - 'method': 'provision', - 'respond_to': 'provision_resp', - 'args': { - 'task_uuid': provision_task_uuid, - 'provisioning_info': { - 'engine': { - 'url': settings.COBBLER_URL, - 'username': settings.COBBLER_USER, - 'password': settings.COBBLER_PASSWORD}, - 'nodes': provision_nodes}}} - - args, kwargs = nailgun.task.manager.rpc.cast.call_args - self.assertEquals(len(args), 2) - self.assertEquals(len(args[1]), 2) - self.datadiff(args[1][0], provision_msg) - self.datadiff(args[1][1], deployment_msg) - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_deploy_and_remove_correct_nodes_and_statuses(self, mocked_rpc): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - { - "pending_addition": True, - }, - { - "status": "error", - "pending_deletion": True - } - ] - ) - self.env.launch_deployment() - - # launch_deployment kicks ClusterChangesHandler - # which in turns launches DeploymentTaskManager - # which runs DeletionTask, ProvisionTask and DeploymentTask. - # DeletionTask is sent to one orchestrator worker and - # ProvisionTask and DeploymentTask messages are sent to - # another orchestrator worker. - # That is why we expect here list of two sets of - # arguments in mocked nailgun.rpc.cast - # The first set of args is for deletion task and - # the second one is for provisioning and deployment. - - # remove_nodes method call [0][0][1] - n_rpc_remove = nailgun.task.task.rpc.cast. \ - call_args_list[0][0][1]['args']['nodes'] - self.assertEquals(len(n_rpc_remove), 1) - self.assertEquals(n_rpc_remove[0]['uid'], self.env.nodes[1].id) - - # provision method call [1][0][1][0] - n_rpc_provision = nailgun.task.manager.rpc.cast. \ - call_args_list[1][0][1][0]['args']['provisioning_info']['nodes'] - # Nodes will be appended in provision list if - # they 'pending_deletion' = False and - # 'status' in ('discover', 'provisioning') or - # 'status' = 'error' and 'error_type' = 'provision' - # So, only one node from our list will be appended to - # provision list. - self.assertEquals(len(n_rpc_provision), 1) - self.assertEquals( - n_rpc_provision[0]['name'], - TaskHelper.make_slave_name(self.env.nodes[0].id) - ) - - # deploy method call [1][0][1][1] - n_rpc_deploy = nailgun.task.manager.rpc.cast.call_args_list[ - 1][0][1][1]['args']['deployment_info'] - self.assertEquals(len(n_rpc_deploy), 1) - self.assertEquals(n_rpc_deploy[0]['uid'], str(self.env.nodes[0].id)) - - def test_occurs_error_not_enough_ip_addresses(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {'pending_addition': True}, - {'pending_addition': True}, - {'pending_addition': True}]) - - cluster = self.env.clusters[0] - - public_network = self.db.query( - NetworkGroup).filter_by(name='public').first() - - net_data = { - "networks": [{ - 'id': public_network.id, - 'ip_ranges': [[ - '240.0.1.2', - '240.0.1.3']]}]} - - self.app.put( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': cluster.id}), - json.dumps(net_data), - headers=self.default_headers, - expect_errors=True) - - task = self.env.launch_deployment() - - self.assertEquals(task.status, 'error') - self.assertEquals( - task.message, - 'Not enough IP addresses. Public network must have at least ' - '3 IP addresses for the current environment.') - - def test_occurs_error_not_enough_free_space(self): - meta = self.env.default_metadata() - meta['disks'] = [{ - "model": "TOSHIBA MK1002TS", - "name": "sda", - "disk": "sda", - # 8GB - "size": 8000000}] - - self.env.create( - nodes_kwargs=[ - {"meta": meta, "pending_addition": True} - ] - ) - node_db = self.env.nodes[0] - - task = self.env.launch_deployment() - - self.assertEquals(task.status, 'error') - self.assertEquals( - task.message, - "Node '%s' has insufficient disk space" % - node_db.human_readable_name) - - def test_occurs_error_not_enough_controllers_for_multinode(self): - self.env.create( - cluster_kwargs={ - 'mode': 'multinode'}, - nodes_kwargs=[ - {'roles': ['compute'], 'pending_addition': True}]) - - task = self.env.launch_deployment() - - self.assertEquals(task.status, 'error') - self.assertEquals( - task.message, - "Not enough controllers, multinode mode requires at least 1 " - "controller") - - def test_occurs_error_not_enough_controllers_for_ha(self): - self.env.create( - cluster_kwargs={ - 'mode': 'ha_compact'}, - nodes_kwargs=[ - {'roles': ['compute'], 'pending_addition': True}]) - - task = self.env.launch_deployment() - - self.assertEquals(task.status, 'error') - self.assertEquals( - task.message, - 'Not enough controllers, ha_compact ' - 'mode requires at least 3 controllers') - - @fake_tasks() - def test_admin_untagged_intersection(self): - meta = self.env.default_metadata() - meta["interfaces"] = [{ - "mac": "00:00:00:00:00:66", - "max_speed": 1000, - "name": "eth0", - "current_speed": 1000 - }, { - "mac": "00:00:00:00:00:77", - "max_speed": 1000, - "name": "eth1", - "current_speed": None - }] - - self.env.create( - nodes_kwargs=[ - { - 'api': True, - 'roles': ['controller'], - 'pending_addition': True, - 'meta': meta, - 'mac': "00:00:00:00:00:66" - } - ] - ) - - cluster_id = self.env.clusters[0].id - node_db = self.env.nodes[0] - - nets = self.env.generate_ui_networks(cluster_id) - for net in nets["networks"]: - if net["name"] in ["public", "floating"]: - net["vlan_start"] = None - - resp = self.app.put( - reverse('NetworkConfigurationHandler', kwargs={ - 'cluster_id': cluster_id - }), - json.dumps(nets), - headers=self.default_headers - ) - - main_iface_id = self.env.network_manager.get_main_nic( - node_db.id - ) - main_iface_db = self.db.query(NodeNICInterface).get( - main_iface_id - ) - - assigned_net_names = [ - n.name - for n in main_iface_db.assigned_networks - ] - self.assertIn("public", assigned_net_names) - self.assertIn("floating", assigned_net_names) - - supertask = self.env.launch_deployment() - self.env.wait_error(supertask) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={ - 'node_id': node_db.id - }), - headers=self.default_headers - ) - - ifaces = json.loads(resp.body) - - wrong_nets = filter( - lambda nic: (nic["name"] in ["public", "floating"]), - ifaces[0]["assigned_networks"] - ) - - map( - ifaces[0]["assigned_networks"].remove, - wrong_nets - ) - - map( - ifaces[1]["assigned_networks"].append, - wrong_nets - ) - - resp = self.app.put( - reverse('NodeCollectionNICsHandler', kwargs={ - 'node_id': node_db.id - }), - json.dumps([{"interfaces": ifaces, "id": node_db.id}]), - headers=self.default_headers - ) - - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask) - - def datadiff(self, node1, node2, path=None): - if path is None: - path = [] - - print("Path: {0}".format("->".join(path))) - - if not isinstance(node1, dict) or not isinstance(node2, dict): - if isinstance(node1, list): - newpath = path[:] - for i, keys in enumerate(izip(node1, node2)): - newpath.append(str(i)) - self.datadiff(keys[0], keys[1], newpath) - newpath.pop() - elif node1 != node2: - err = "Values differ: {0} != {1}".format( - str(node1), - str(node2) - ) - raise Exception(err) - else: - newpath = path[:] - for key1, key2 in zip( - sorted(node1.keys()), - sorted(node2.keys()) - ): - if key1 != key2: - err = "Keys differ: {0} != {1}".format( - str(key1), - str(key2) - ) - raise Exception(err) - newpath.append(key1) - self.datadiff(node1[key1], node2[key2], newpath) - newpath.pop() diff --git a/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py b/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py deleted file mode 100644 index 3a0667435..000000000 --- a/nailgun/nailgun/test/integration/test_cluster_collection_handlers.py +++ /dev/null @@ -1,237 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from mock import patch -from sqlalchemy.sql import not_ - -from nailgun.api.models import Cluster -from nailgun.api.models import Network -from nailgun.api.models import NetworkConfiguration -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Release -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def _get_cluster_networks(self, cluster_id): - nets = json.loads(self.app.get( - reverse('NetworkConfigurationHandler', - {"cluster_id": cluster_id}), - headers=self.default_headers, - ).body)["networks"] - return sorted(nets, key=lambda n: n['vlan_start']) - - def test_cluster_list_empty(self): - resp = self.app.get( - reverse('ClusterCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals([], response) - - def test_cluster_create(self): - release_id = self.env.create_release(api=False).id - resp = self.app.post( - reverse('ClusterCollectionHandler'), - json.dumps({ - 'name': 'cluster-name', - 'release': release_id, - }), - headers=self.default_headers - ) - self.assertEquals(201, resp.status) - - def test_cluster_create_no_ip_addresses(self): - """In this test we check that no error is occured - if two clusters will have same networks updated to use - full CIDR - """ - cluster = self.env.create_cluster(api=True) - cluster_db = self.db.query(Cluster).get(cluster["id"]) - cluster2 = self.env.create_cluster(api=True, - release=cluster_db.release.id) - cluster2_db = self.db.query(Cluster).get(cluster2["id"]) - - for clstr in (cluster_db, cluster2_db): - management_net = self.db.query(NetworkGroup).filter_by( - name="management", - cluster_id=clstr.id - ).first() - NetworkConfiguration.update( - clstr, - { - "networks": [ - { - "network_size": 65536, - "name": "management", - "ip_ranges": [ - ["192.168.0.2", "192.168.255.254"] - ], - "amount": 1, - "id": management_net.id, - "netmask": "255.255.255.0", - "cluster_id": clstr.id, - "vlan_start": 101, - "cidr": "192.168.0.0/16", - "gateway": "192.168.0.1" - } - ] - } - ) - - cluster1_nets = self._get_cluster_networks(cluster["id"]) - cluster2_nets = self._get_cluster_networks(cluster2["id"]) - - for net1, net2 in zip(cluster1_nets, cluster2_nets): - for f in ('cluster_id', 'id'): - del net1[f] - del net2[f] - - self.assertEquals(cluster1_nets, cluster2_nets) - - def test_cluster_creation_same_networks(self): - cluster1_id = self.env.create_cluster(api=True)["id"] - cluster2_id = self.env.create_cluster(api=True)["id"] - cluster1_nets = self._get_cluster_networks(cluster1_id) - cluster2_nets = self._get_cluster_networks(cluster2_id) - - for net1, net2 in zip(cluster1_nets, cluster2_nets): - for f in ('cluster_id', 'id'): - del net1[f] - del net2[f] - - cluster1_nets = sorted(cluster1_nets, key=lambda n: n['vlan_start']) - cluster2_nets = sorted(cluster2_nets, key=lambda n: n['vlan_start']) - - self.assertEquals(cluster1_nets, cluster2_nets) - - def test_if_cluster_creates_correct_networks(self): - release = Release() - release.version = "1.1.1" - release.name = u"release_name_" + str(release.version) - release.description = u"release_desc" + str(release.version) - release.operating_system = "CentOS" - release.networks_metadata = [ - {"name": "floating", "access": "public"}, - {"name": "management", "access": "private192"}, - {"name": "storage", "access": "private192"}, - {"name": "fixed", "access": "private10"} - ] - release.attributes_metadata = { - "editable": { - "keystone": { - "admin_tenant": "admin" - } - }, - "generated": { - "mysql": { - "root_password": "" - } - } - } - self.db.add(release) - self.db.commit() - resp = self.app.post( - reverse('ClusterCollectionHandler'), - json.dumps({ - 'name': 'cluster-name', - 'release': release.id, - }), - headers=self.default_headers - ) - self.assertEquals(201, resp.status) - nets = self.db.query(Network).filter( - not_(Network.name == "fuelweb_admin") - ).all() - obtained = [] - for net in nets: - obtained.append({ - 'release': net.release, - 'name': net.name, - 'access': net.access, - 'vlan_id': net.vlan_id, - 'cidr': net.cidr, - 'gateway': net.gateway - }) - expected = [ - { - 'release': release.id, - 'name': u'floating', - 'access': 'public', - 'vlan_id': 100, - 'cidr': '172.16.0.0/24', - 'gateway': '172.16.0.1' - }, - { - 'release': release.id, - 'name': u'fixed', - 'access': 'private10', - 'vlan_id': 103, - 'cidr': '10.0.0.0/24', - 'gateway': '10.0.0.1' - }, - { - 'release': release.id, - 'name': u'storage', - 'access': 'private192', - 'vlan_id': 102, - 'cidr': '192.168.1.0/24', - 'gateway': '192.168.1.1' - }, - { - 'release': release.id, - 'name': u'management', - 'access': 'private192', - 'vlan_id': 101, - 'cidr': '192.168.0.0/24', - 'gateway': '192.168.0.1' - }, - ] - self.assertItemsEqual(expected, obtained) - - def test_network_validation_on_cluster_creation(self): - cluster = self.env.create_cluster(api=True) - nets = self.env.generate_ui_networks(cluster["id"]) - nets['networks'][-1]["network_size"] = 16 - nets['networks'][-1]["amount"] = 3 - resp = self.app.put( - reverse('NetworkConfigurationHandler', - kwargs={'cluster_id': cluster['id']}), - json.dumps(nets), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(202, resp.status) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'error') - - @patch('nailgun.rpc.cast') - def test_verify_networks(self, mocked_rpc): - cluster = self.env.create_cluster(api=True) - resp = self.app.put( - reverse('NetworkConfigurationHandler', - kwargs={'cluster_id': cluster['id']}), - json.dumps(self.env.generate_ui_networks(cluster["id"])), - headers=self.default_headers - ) - self.assertEquals(202, resp.status) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'ready') diff --git a/nailgun/nailgun/test/integration/test_cluster_handler.py b/nailgun/nailgun/test/integration/test_cluster_handler.py deleted file mode 100644 index 34f196ad4..000000000 --- a/nailgun/nailgun/test/integration/test_cluster_handler.py +++ /dev/null @@ -1,229 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -from mock import patch - -import nailgun -from nailgun.api.models import Cluster -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def delete(self, cluster_id): - return self.app.delete( - reverse('ClusterHandler', kwargs={'cluster_id': cluster_id}), - '', - headers=self.default_headers - ) - - def test_cluster_get(self): - cluster = self.env.create_cluster(api=False) - resp = self.app.get( - reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(cluster.id, response['id']) - self.assertEquals(cluster.name, response['name']) - self.assertEquals(cluster.release.id, response['release']['id']) - - def test_cluster_creation(self): - release = self.env.create_release(api=False) - yet_another_cluster_name = 'Yet another cluster' - resp = self.app.post( - reverse('ClusterCollectionHandler'), - params=json.dumps({ - 'name': yet_another_cluster_name, - 'release': release.id - }), - headers=self.default_headers - ) - self.assertEquals(201, resp.status) - response = json.loads(resp.body) - self.assertEquals(yet_another_cluster_name, response['name']) - self.assertEquals(release.id, response['release']['id']) - - def test_cluster_update(self): - updated_name = u'Updated cluster' - cluster = self.env.create_cluster(api=False) - - clusters_before = len(self.db.query(Cluster).all()) - - resp = self.app.put( - reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), - json.dumps({'name': updated_name}), - headers=self.default_headers - ) - self.db.refresh(cluster) - self.assertEquals(resp.status, 200) - clusters = self.db.query(Cluster).filter( - Cluster.name == updated_name - ).all() - self.assertEquals(len(clusters), 1) - self.assertEquals(clusters[0].name, updated_name) - - clusters_after = len(self.db.query(Cluster).all()) - self.assertEquals(clusters_before, clusters_after) - - def test_cluster_updates_network_manager(self): - cluster = self.env.create_cluster(api=False) - self.assertEquals(cluster.net_manager, "FlatDHCPManager") - resp = self.app.put( - reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), - json.dumps({'net_manager': 'VlanManager'}), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - self.db.refresh(cluster) - self.assertEquals(cluster.net_manager, "VlanManager") - - def test_cluster_node_list_update(self): - node1 = self.env.create_node(api=False) - node2 = self.env.create_node(api=False) - cluster = self.env.create_cluster(api=False) - resp = self.app.put( - reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), - json.dumps({'nodes': [node1.id]}), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - - nodes = self.db.query(Node).filter(Node.cluster == cluster).all() - self.assertEquals(1, len(nodes)) - self.assertEquals(nodes[0].id, node1.id) - - resp = self.app.put( - reverse('ClusterHandler', kwargs={'cluster_id': cluster.id}), - json.dumps({'nodes': [node2.id]}), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - - nodes = self.db.query(Node).filter(Node.cluster == cluster) - self.assertEquals(1, nodes.count()) - - def test_empty_cluster_deletion(self): - cluster = self.env.create_cluster(api=True) - resp = self.delete(cluster['id']) - - self.assertEquals(resp.status, 202) - self.assertEquals(self.db.query(Node).count(), 0) - self.assertEquals(self.db.query(Cluster).count(), 0) - - @fake_tasks() - def test_cluster_deletion(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - {"status": "ready"}]) - - resp = self.delete(self.env.clusters[0].id) - self.assertEquals(resp.status, 202) - - def cluster_is_empty(): - return self.db.query(Cluster).count() == 0 - - self.env.wait_for_true(cluster_is_empty, timeout=5) - self._wait_for_threads() - - # Nodes should be in discover status - self.assertEquals(self.db.query(Node).count(), 2) - for node in self.db.query(Node): - self.assertEquals(node.status, 'discover') - self.assertEquals(node.cluster_id, None) - - @fake_tasks() - def test_cluster_deleteion_with_offline_nodes(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {'pending_addition': True}, - {'online': False, 'status': 'ready'}]) - - resp = self.delete(self.env.clusters[0].id) - self.assertEquals(resp.status, 202) - - def cluster_is_empty_and_in_db_one_node(): - return self.db.query(Cluster).count() == 0 and \ - self.db.query(Node).count() == 1 - - self.env.wait_for_true(cluster_is_empty_and_in_db_one_node, timeout=5) - self._wait_for_threads() - - node = self.db.query(Node).first() - self.assertEquals(node.status, 'discover') - self.assertEquals(node.cluster_id, None) - - def test_cluster_deletion_delete_networks(self): - cluster = self.env.create_cluster(api=True) - cluster_db = self.db.query(Cluster).get(cluster['id']) - ngroups = [n.id for n in cluster_db.network_groups] - self.db.delete(cluster_db) - self.db.commit() - ngs = self.db.query(NetworkGroup).filter( - NetworkGroup.id.in_(ngroups) - ).all() - self.assertEqual(ngs, []) - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_replaced_orchestrator_info_should_passed(self, mocked_rpc): - # creating cluster with nodes - self.env.create( - cluster_kwargs={ - 'mode': 'multinode'}, - nodes_kwargs=[ - {'roles': ['controller'], 'pending_addition': True}, - {'roles': ['compute'], 'pending_addition': True}]) - cluster = self.env.clusters[0] - new_deployment_info = {"field": "deployment_info"} - new_provisioning_info = {"field": "provisioning_info"} - - # assigning facts to cluster - cluster.replaced_deployment_info = new_deployment_info - cluster.replaced_provisioning_info = new_provisioning_info - self.db.commit() - self.env.launch_deployment() - - # intercepting arguments with which rpc.cast was called - args, kwargs = nailgun.task.manager.rpc.cast.call_args - self.datadiff( - new_provisioning_info, args[1][0]['args']['provisioning_info']) - self.datadiff( - new_deployment_info, args[1][1]['args']['deployment_info']) - - def test_cluster_generated_data_handler(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {'pending_addition': True}, - {'online': False, 'status': 'ready'}]) - cluster = self.env.clusters[0] - get_resp = self.app.get( - reverse('ClusterGeneratedData', - kwargs={'cluster_id': cluster.id}), - headers=self.default_headers - ) - self.assertEquals(get_resp.status, 200) - self.datadiff(json.loads(get_resp.body), cluster.attributes.generated) diff --git a/nailgun/nailgun/test/integration/test_db_refresh.py b/nailgun/nailgun/test/integration/test_db_refresh.py deleted file mode 100644 index db4297a0a..000000000 --- a/nailgun/nailgun/test/integration/test_db_refresh.py +++ /dev/null @@ -1,61 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from datetime import datetime -from unittest import TestCase - -from paste.fixture import TestApp -from sqlalchemy.orm.events import orm - -from nailgun.api.models import Node -from nailgun.db import engine -from nailgun.db import flush -from nailgun.db import NoCacheQuery -from nailgun.wsgi import build_app - - -class TestDBRefresh(TestCase): - - def setUp(self): - self.app = TestApp(build_app().wsgifunc()) - self.db = orm.scoped_session( - orm.sessionmaker(bind=engine, query_cls=NoCacheQuery) - )() - self.db2 = orm.scoped_session( - orm.sessionmaker(bind=engine, query_cls=NoCacheQuery) - )() - self.default_headers = { - "Content-Type": "application/json" - } - flush() - - def test_session_update(self): - node = Node() - node.mac = u"ASDFGHJKLMNOPR" - node.timestamp = datetime.now() - self.db.add(node) - self.db.commit() - - node2 = self.db2.query(Node).filter( - Node.id == node.id - ).first() - node2.mac = u"12345678" - self.db2.add(node2) - self.db2.commit() - self.db.query(Node).filter( - Node.id == node.id - ).first() - self.assertEquals(node.mac, u"12345678") diff --git a/nailgun/nailgun/test/integration/test_deployment_error_handling.py b/nailgun/nailgun/test/integration/test_deployment_error_handling.py deleted file mode 100644 index 4b329151d..000000000 --- a/nailgun/nailgun/test/integration/test_deployment_error_handling.py +++ /dev/null @@ -1,139 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import re - -from nailgun.api.models import Notification -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks - - -class TestErrors(BaseIntegrationTest): - - def tearDown(self): - self._wait_for_threads() - super(TestErrors, self).tearDown() - - @fake_tasks(error="provisioning") - def test_deployment_error_during_provisioning(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"name": "First", - "pending_addition": True}, - {"name": "Second", - "roles": ["compute"], - "pending_addition": True} - ] - ) - supertask = self.env.launch_deployment() - self.env.wait_error(supertask, 60, re.compile( - "Deployment has failed\. Check these nodes:\n'(First|Second)'" - )) - self.env.refresh_nodes() - self.env.refresh_clusters() - n_error = lambda n: (n.status, n.error_type) == ('error', 'provision') - # Why sum is equal 1? It is NOT OBVIOUS that error occures only on one - # of nodes and the choice is random. It is coded inside - # nailgun.task.fake.FakeDeploymentThread. As this method is - # decorated with fake_tasks(error="provisioning") - # FakeDeploymentThread shuffles nodes and sets provisioning - # error on one of those nodes - self.assertEqual( - sum(map(n_error, self.env.nodes)), - 1 - ) - self.assertEquals(supertask.cluster.status, 'error') - - @fake_tasks(error="provisioning", error_msg="Terrible error") - def test_deployment_error_from_orchestrator(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"name": "First", - "pending_addition": True}, - {"name": "Second", - "roles": ["compute"], - "pending_addition": True}, - {"name": "Third", - "roles": ["compute"], - "status": "error", - "error_type": "provision", - "error_msg": "I forgot about teapot!"} - ] - ) - supertask = self.env.launch_deployment() - err_msg = "Deployment has failed. Terrible error" - self.env.wait_error(supertask, 60, err_msg) - self.assertIsNotNone( - self.db.query(Notification).filter_by(message=err_msg).first() - ) - self.assertEqual( - self.db.query(Notification).filter_by( - node_id=self.env.nodes[2].id - ).first().message, - "Failed to deploy node 'Third': I forgot about teapot!" - ) - self.env.refresh_nodes() - self.env.refresh_clusters() - n_error = lambda n: (n.status, n.error_type) == ('error', 'provision') - self.assertIn( - sum(map(n_error, self.env.nodes)), - [1, 2] - ) - self.assertEquals(supertask.cluster.status, 'error') - - @fake_tasks(error="deployment") - def test_deployment_error_during_deployment(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"name": "First", - "pending_addition": True}, - {"name": "Second", - "roles": ["compute"], - "pending_addition": True} - ] - ) - supertask = self.env.launch_deployment() - self.env.wait_error(supertask, 60, re.compile( - "Deployment has failed\. Check these nodes:\n'(First|Second)'" - )) - self.env.refresh_nodes() - self.env.refresh_clusters() - n_error = lambda n: (n.status, n.error_type) == ('error', 'deploy') - self.assertEqual( - sum(map(n_error, self.env.nodes)), - 1 - ) - self.assertEquals(supertask.cluster.status, 'error') - - @fake_tasks(error="deployment", task_ready=True) - def test_task_ready_node_error(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"name": "First", - "pending_addition": True}, - {"name": "Second", - "roles": ["compute"], - "pending_addition": True} - ] - ) - supertask = self.env.launch_deployment() - self.env.wait_error(supertask, 60, re.compile( - "Deployment has failed\. Check these nodes:\n'(First|Second)'" - )) diff --git a/nailgun/nailgun/test/integration/test_fixture_uploading.py b/nailgun/nailgun/test/integration/test_fixture_uploading.py deleted file mode 100644 index b05b65450..000000000 --- a/nailgun/nailgun/test/integration/test_fixture_uploading.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import cStringIO - -from nailgun.api.models import Node -from nailgun.api.models import Release -from nailgun.fixtures.fixman import upload_fixture -from nailgun.test.base import BaseIntegrationTest - - -class TestFixture(BaseIntegrationTest): - - fixtures = ['sample_environment'] - - def test_upload_working(self): - check = self.db.query(Node).all() - self.assertEqual(len(list(check)), 8) - - def test_custom_fixture(self): - data = '''[{ - "pk": 2, - "model": "nailgun.release", - "fields": { - "name": "CustomFixtureRelease", - "version": "0.0.1", - "description": "Sample release for testing", - "operating_system": "CentOS", - "networks_metadata": [ - {"name": "floating", "access": "public"}, - {"name": "management", "access": "private192"}, - {"name": "storage", "access": "private192"}, - {"name": "fixed", "access": "private10"} - ] - } - }]''' - - upload_fixture(cStringIO.StringIO(data)) - check = self.db.query(Release).filter( - Release.name == u"CustomFixtureRelease" - ) - self.assertEqual(len(list(check)), 1) diff --git a/nailgun/nailgun/test/integration/test_horizon_url.py b/nailgun/nailgun/test/integration/test_horizon_url.py deleted file mode 100644 index bc8787de7..000000000 --- a/nailgun/nailgun/test/integration/test_horizon_url.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -from nailgun.api.models import IPAddr -from nailgun.api.models import Network -from nailgun.api.models import NetworkGroup -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks - - -class TestHorizonURL(BaseIntegrationTest): - - def tearDown(self): - self._wait_for_threads() - super(TestHorizonURL, self).tearDown() - - @fake_tasks() - def test_horizon_url_ha_mode(self): - self.env.create( - cluster_kwargs={"mode": "ha_compact"}, - nodes_kwargs=[ - {"pending_addition": True}, - {"pending_addition": True}, - {"pending_addition": True}, - ] - ) - - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, 60) - - network = self.db.query(Network).join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == self.env.clusters[0].id).\ - filter_by(name="public").first() - lost_ips = self.db.query(IPAddr).filter_by( - network=network.id, - node=None - ).all() - self.assertEquals(len(lost_ips), 1) - - self.assertEquals(supertask.message, ( - u"Deployment of environment '{0}' is done. " - "Access the OpenStack dashboard (Horizon) at http://{1}/" - ).format( - self.env.clusters[0].name, - lost_ips[0].ip_addr - )) diff --git a/nailgun/nailgun/test/integration/test_keepalive.py b/nailgun/nailgun/test/integration/test_keepalive.py deleted file mode 100644 index ac146f6e0..000000000 --- a/nailgun/nailgun/test/integration/test_keepalive.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import time - -from nailgun.keepalive.watcher import KeepAliveThread -from nailgun.test.base import BaseIntegrationTest - - -class TestKeepalive(BaseIntegrationTest): - - def setUp(self): - super(TestKeepalive, self).setUp() - self.watcher = KeepAliveThread( - interval=2, - timeout=1 - ) - self.watcher.start() - self.timeout = self.watcher.interval + 10 - - def tearDown(self): - self.watcher.join() - super(TestKeepalive, self).tearDown() - - def check_online(self, node, online): - self.env.refresh_nodes() - return node.online == online - - def test_node_becomes_offline(self): - node = self.env.create_node(status="discover", - roles=["controller"], - name="Dead or alive") - - self.assertEquals(node.online, True) - self.env.wait_for_true( - self.check_online, - args=[node, False], - timeout=self.timeout) - - def test_provisioning_node_not_becomes_offline(self): - node = self.env.create_node(status="provisioning", - roles=["controller"], - name="Dead or alive") - - time.sleep(self.watcher.interval + 2) - self.env.refresh_nodes() - self.assertEqual(node.online, True) diff --git a/nailgun/nailgun/test/integration/test_network_configuration.py b/nailgun/nailgun/test/integration/test_network_configuration.py deleted file mode 100644 index 2dbe6427e..000000000 --- a/nailgun/nailgun/test/integration/test_network_configuration.py +++ /dev/null @@ -1,166 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from sqlalchemy.sql import not_ - -from nailgun.api.models import Cluster -from nailgun.api.models import NetworkGroup -from nailgun.network.manager import NetworkManager -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestNetworkConfigurationHandlerMultinodeMode(BaseIntegrationTest): - def setUp(self): - super(TestNetworkConfigurationHandlerMultinodeMode, self).setUp() - cluster = self.env.create_cluster(api=True) - self.cluster = self.db.query(Cluster).get(cluster['id']) - - def put(self, cluster_id, data, expect_errors=False): - url = reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': cluster_id}) - return self.app.put( - url, json.dumps(data), - headers=self.default_headers, - expect_errors=expect_errors) - - def get(self, cluster_id, expect_errors=False): - url = reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': cluster_id}) - return self.app.get( - url, - headers=self.default_headers, - expect_errors=expect_errors) - - def test_get_request_should_return_net_manager_and_networks(self): - response = self.get(self.cluster.id) - data = json.loads(response.body) - cluster = self.db.query(Cluster).get(self.cluster.id) - - self.assertEquals(data['net_manager'], self.cluster.net_manager) - for network_group in cluster.network_groups: - network = [i for i in data['networks'] - if i['id'] == network_group.id][0] - - keys = [ - 'network_size', - 'name', - 'amount', - 'cluster_id', - 'vlan_start', - 'cidr', - 'id'] - - for key in keys: - self.assertEquals(network[key], getattr(network_group, key)) - - def test_not_found_cluster(self): - resp = self.get(self.cluster.id + 999, expect_errors=True) - self.assertEquals(404, resp.status) - - def test_change_net_manager(self): - new_net_manager = {'net_manager': 'VlanManager'} - self.put(self.cluster.id, new_net_manager) - - self.db.refresh(self.cluster) - self.assertEquals( - self.cluster.net_manager, - new_net_manager['net_manager']) - - def test_do_not_update_net_manager_if_validation_is_failed(self): - self.db.query(NetworkGroup).filter( - not_(NetworkGroup.name == "fuelweb_admin") - ).first() - new_net_manager = {'net_manager': 'VlanManager', - 'networks': [{'id': 500, 'vlan_start': 500}]} - self.put(self.cluster.id, new_net_manager, expect_errors=True) - - self.db.refresh(self.cluster) - self.assertNotEquals( - self.cluster.net_manager, - new_net_manager['net_manager']) - - def test_network_group_update_changes_network(self): - network = self.db.query(NetworkGroup).filter( - not_(NetworkGroup.name == "fuelweb_admin") - ).first() - self.assertIsNotNone(network) - new_vlan_id = 500 # non-used vlan id - new_nets = {'networks': [{ - 'id': network.id, - 'vlan_start': new_vlan_id}]} - - resp = self.put(self.cluster.id, new_nets) - self.assertEquals(resp.status, 202) - self.db.refresh(network) - self.assertEquals(len(network.networks), 1) - self.assertEquals(network.networks[0].vlan_id, 500) - - def test_update_networks_and_net_manager(self): - network = self.db.query(NetworkGroup).filter( - not_(NetworkGroup.name == "fuelweb_admin") - ).first() - new_vlan_id = 500 # non-used vlan id - new_net = {'net_manager': 'VlanManager', - 'networks': [{'id': network.id, 'vlan_start': new_vlan_id}]} - self.put(self.cluster.id, new_net) - - self.db.refresh(self.cluster) - self.db.refresh(network) - self.assertEquals( - self.cluster.net_manager, - new_net['net_manager']) - self.assertEquals(network.networks[0].vlan_id, new_vlan_id) - - def test_networks_update_fails_with_wrong_net_id(self): - new_nets = {'networks': [{ - 'id': 500, - 'vlan_start': 500}]} - - resp = self.put(self.cluster.id, new_nets, expect_errors=True) - self.assertEquals(202, resp.status) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'error') - self.assertEquals( - task['message'], - 'Invalid network ID: 500' - ) - - -class TestNetworkConfigurationHandlerHAMode(BaseIntegrationTest): - def setUp(self): - super(TestNetworkConfigurationHandlerHAMode, self).setUp() - cluster = self.env.create_cluster(api=True, mode='ha_compact') - self.cluster = self.db.query(Cluster).get(cluster['id']) - self.net_manager = NetworkManager() - - def test_returns_management_vip_and_public_vip(self): - url = reverse('NetworkConfigurationHandler', - kwargs={'cluster_id': self.cluster.id}) - - resp = json.loads(self.app.get(url, headers=self.default_headers).body) - - self.assertEquals( - resp['management_vip'], - self.net_manager.assign_vip(self.cluster.id, 'management')) - - self.assertEquals( - resp['public_vip'], - self.net_manager.assign_vip(self.cluster.id, 'public')) diff --git a/nailgun/nailgun/test/integration/test_network_manager.py b/nailgun/nailgun/test/integration/test_network_manager.py deleted file mode 100644 index 771b1897e..000000000 --- a/nailgun/nailgun/test/integration/test_network_manager.py +++ /dev/null @@ -1,391 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import itertools -import json - -from mock import Mock -from mock import patch -from netaddr import IPAddress -from netaddr import IPNetwork -from netaddr import IPRange -from sqlalchemy import not_ - -import nailgun -from nailgun.api.models import IPAddr -from nailgun.api.models import IPAddrRange -from nailgun.api.models import Network -from nailgun.api.models import NetworkGroup -from nailgun.api.models import NodeNICInterface -from nailgun.api.models import Vlan -from nailgun.settings import settings -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestNetworkManager(BaseIntegrationTest): - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_assign_ips(self, mocked_rpc): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True, "api": True}, - {"pending_addition": True, "api": True} - ] - ) - - nailgun.task.task.Cobbler = Mock() - - self.env.network_manager.assign_ips( - [n.id for n in self.env.nodes], - "management" - ) - - management_net = self.db.query(Network).join(NetworkGroup).\ - filter( - NetworkGroup.cluster_id == self.env.clusters[0].id - ).filter_by( - name='management' - ).first() - - assigned_ips = [] - for node in self.env.nodes: - ips = self.db.query(IPAddr).\ - filter_by(node=node.id).\ - filter_by(network=management_net.id).all() - - self.assertEquals(1, len(ips)) - self.assertEquals( - True, - self.env.network_manager.check_ip_belongs_to_net( - ips[0].ip_addr, - management_net - ) - ) - assigned_ips.append(ips[0].ip_addr) - - # check for uniqueness of IPs: - self.assertEquals(len(assigned_ips), len(list(set(assigned_ips)))) - - # check it doesn't contain broadcast and other special IPs - net_ip = IPNetwork(management_net.cidr)[0] - gateway = management_net.gateway - broadcast = IPNetwork(management_net.cidr)[-1] - self.assertEquals(False, net_ip in assigned_ips) - self.assertEquals(False, gateway in assigned_ips) - self.assertEquals(False, broadcast in assigned_ips) - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_assign_ips_idempotent(self, mocked_rpc): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - { - "pending_addition": True, - "api": True, - "status": "discover" - } - ] - ) - - node_db = self.env.nodes[0] - - self.env.network_manager.assign_ips( - [node_db.id], - "management" - ) - self.env.network_manager.assign_ips( - [node_db.id], - "management" - ) - - self.db.refresh(node_db) - - self.assertEquals( - len( - filter( - lambda n: n['name'] == 'management', - self.env.network_manager.get_node_networks( - node_db.id - ) - ) - ), - 1 - ) - - def test_get_default_nic_networkgroups(self): - cluster = self.env.create_cluster(api=True) - node = self.env.create_node(api=True) - node_db = self.env.nodes[0] - - main_nic_id = self.env.network_manager.get_main_nic(node_db.id) - other_iface = self.db.query(NodeNICInterface).filter_by( - node_id=node['id'] - ).filter( - not_(NodeNICInterface.mac == node_db.mac) - ).first() - - self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{ - 'mac': other_iface.mac, - 'meta': node_db.meta, - 'is_agent': True, - 'cluster_id': cluster["id"] - }]), - headers=self.default_headers, - expect_errors=True - ) - - new_main_nic_id = self.env.network_manager.get_main_nic(node_db.id) - self.assertEquals(new_main_nic_id, other_iface.id) - self.assertEquals( - [n.id for n in other_iface.assigned_networks], - self.env.network_manager.get_default_nic_networkgroups( - node_db.id, - other_iface.id - ) - ) - self.assertEquals( - self.db.query(NodeNICInterface).get(main_nic_id).assigned_networks, - [] - ) - - def test_assign_vip_is_idempotent(self): - cluster = self.env.create_cluster(api=True) - vip = self.env.network_manager.assign_vip( - cluster['id'], - "management" - ) - vip2 = self.env.network_manager.assign_vip( - cluster['id'], - "management" - ) - self.assertEquals(vip, vip2) - - def test_get_node_networks_for_vlan_manager(self): - self.env.create( - cluster_kwargs={'net_manager': 'VlanManager'}, - nodes_kwargs=[ - {"pending_addition": True}, - ] - ) - - network_data = self.env.network_manager.get_node_networks( - self.env.nodes[0].id - ) - - self.assertEquals(len(network_data), 5) - fixed_nets = filter(lambda net: net['name'] == 'fixed', network_data) - self.assertEquals(fixed_nets, []) - - def test_nets_empty_list_if_node_does_not_belong_to_cluster(self): - node = self.env.create_node(api=False) - network_data = self.env.network_manager.get_node_networks(node.id) - self.assertEquals(network_data, []) - - def test_assign_admin_ips(self): - node = self.env.create_node() - self.env.network_manager.assign_admin_ips(node.id, 2) - admin_net_id = self.env.network_manager.get_admin_network_id() - - admin_ips = self.db.query(IPAddr).\ - filter_by(node=node.id).\ - filter_by(network=admin_net_id).all() - self.assertEquals(len(admin_ips), 2) - map( - lambda x: self.assertIn( - IPAddress(x.ip_addr), - IPRange( - settings.ADMIN_NETWORK['first'], - settings.ADMIN_NETWORK['last'] - ) - ), - admin_ips - ) - - def test_assign_admin_ips_large_range(self): - map(self.db.delete, self.db.query(IPAddrRange).all()) - admin_net_id = self.env.network_manager.get_admin_network_id() - admin_ng = self.db.query(Network).get(admin_net_id).network_group - mock_range = IPAddrRange( - first='10.0.0.1', - last='10.255.255.254', - network_group_id=admin_ng.id - ) - self.db.add(mock_range) - self.db.commit() - # Creating two nodes - n1 = self.env.create_node() - n2 = self.env.create_node() - nc = zip([n1.id, n2.id], [2048, 2]) - - # Assinging admin IPs on created nodes - map(lambda (n, c): self.env.network_manager.assign_admin_ips(n, c), nc) - - # Asserting count of admin node IPs - def asserter(x): - n, c = x - l = len(self.db.query(IPAddr).filter_by(network=admin_net_id). - filter_by(node=n).all()) - self.assertEquals(l, c) - map(asserter, nc) - - def test_assign_admin_ips_idempotent(self): - node = self.env.create_node() - self.env.network_manager.assign_admin_ips(node.id, 2) - admin_net_id = self.env.network_manager.get_admin_network_id() - admin_ips = set([i.ip_addr for i in self.db.query(IPAddr). - filter_by(node=node.id). - filter_by(network=admin_net_id).all()]) - self.env.network_manager.assign_admin_ips(node.id, 2) - admin_ips2 = set([i.ip_addr for i in self.db.query(IPAddr). - filter_by(node=node.id). - filter_by(network=admin_net_id).all()]) - self.assertEquals(admin_ips, admin_ips2) - - def test_assign_admin_ips_only_one(self): - map(self.db.delete, self.db.query(IPAddrRange).all()) - admin_net_id = self.env.network_manager.get_admin_network_id() - admin_ng = self.db.query(Network).get(admin_net_id).network_group - mock_range = IPAddrRange( - first='10.0.0.1', - last='10.0.0.1', - network_group_id=admin_ng.id - ) - self.db.add(mock_range) - self.db.commit() - - node = self.env.create_node() - self.env.network_manager.assign_admin_ips(node.id, 1) - - admin_net_id = self.env.network_manager.get_admin_network_id() - - admin_ips = self.db.query(IPAddr).\ - filter_by(node=node.id).\ - filter_by(network=admin_net_id).all() - self.assertEquals(len(admin_ips), 1) - self.assertEquals(admin_ips[0].ip_addr, '10.0.0.1') - - def test_vlan_set_null(self): - self.env.create_cluster(api=True) - cluster_db = self.env.clusters[0] - same_vlan = 100 - resp = self.app.get( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': cluster_db.id}), - headers=self.default_headers - ) - networks_data = json.loads(resp.body) - same_vlan_nets = filter( - lambda n: n['vlan_start'] == same_vlan, networks_data['networks']) - different_vlan_nets = filter( - lambda n: n['vlan_start'] != same_vlan, networks_data['networks']) - different_vlan_nets[0]['vlan_start'] = same_vlan - same_vlan_nets_count_expect = len(same_vlan_nets) + 1 - resp = self.app.put( - reverse( - 'NetworkConfigurationHandler', - kwargs={"cluster_id": cluster_db.id} - ), - json.dumps(networks_data), - headers=self.default_headers - ) - resp = self.app.get( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': cluster_db.id}), - headers=self.default_headers - ) - networks_data = json.loads(resp.body)['networks'] - same_vlan_nets = [ - net for net in networks_data if net["vlan_start"] == same_vlan - ] - self.assertEquals(len(same_vlan_nets), same_vlan_nets_count_expect) - - vlan_db = self.db.query(Vlan).get(same_vlan) - self.assertEquals(len(vlan_db.network), same_vlan_nets_count_expect) - - for net in vlan_db.network: - self.db.delete(net) - self.db.commit() - self.db.refresh(vlan_db) - self.assertEquals(vlan_db.network, []) - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_admin_ip_cobbler(self, mocked_rpc): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - { - "api": True, - "pending_addition": True, - "mac": "00:00:00:00:00:00", - "meta": { - "interfaces": [ - { - "name": "eth0", - "mac": "00:00:00:00:00:00", - }, - { - "name": "eth1", - "mac": "00:00:00:00:00:01", - } - ] - } - }, - { - "api": True, - "pending_addition": True, - "mac": "00:00:00:00:00:02", - "meta": { - "interfaces": [ - { - "name": "eth0", - "mac": "00:00:00:00:00:02", - }, - { - "name": "eth1", - "mac": "00:00:00:00:00:03", - } - ] - } - } - ] - ) - - self.env.launch_deployment() - rpc_nodes_provision = nailgun.task.manager.rpc.cast. \ - call_args_list[0][0][1][0]['args']['provisioning_info']['nodes'] - - map( - lambda (x, y): self.assertIn( - IPAddress( - rpc_nodes_provision[x]['interfaces'][y]['ip_address'] - ), - IPRange( - settings.ADMIN_NETWORK['first'], - settings.ADMIN_NETWORK['last'] - ) - ), - itertools.product((0, 1), ('eth0', 'eth1')) - ) diff --git a/nailgun/nailgun/test/integration/test_network_models.py b/nailgun/nailgun/test/integration/test_network_models.py deleted file mode 100644 index ce5870533..000000000 --- a/nailgun/nailgun/test/integration/test_network_models.py +++ /dev/null @@ -1,197 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from sqlalchemy.sql import not_ - -from nailgun.api.models import Network -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Vlan -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestNetworkModels(BaseIntegrationTest): - - def tearDown(self): - self._wait_for_threads() - super(TestNetworkModels, self).tearDown() - - def test_network_group_size_of_1_creates_1_network(self): - cluster = self.env.create_cluster(api=False) - kw = {'release': cluster.release_id, - 'cidr': '10.0.0.0/24', - 'netmask': '255.255.255.0', - 'network_size': 256, - 'name': 'fixed', - 'access': 'private', - 'vlan_start': 200, - 'cluster_id': cluster.id} - ng = NetworkGroup(**kw) - self.db.add(ng) - self.db.commit() - self.env.network_manager.create_networks(ng) - nets_db = self.db.query(Network).filter( - not_(Network.name == "fuelweb_admin") - ).all() - self.assertEquals(len(nets_db), 1) - self.assertEquals(nets_db[0].vlan_id, kw['vlan_start']) - self.assertEquals(nets_db[0].name, kw['name']) - self.assertEquals(nets_db[0].access, kw['access']) - self.assertEquals(nets_db[0].cidr, kw['cidr']) - - @fake_tasks() - def test_network_recreating_on_env(self): - self.env.create( - cluster_kwargs={ - "mode": "ha_compact" - }, - nodes_kwargs=[ - {"pending_addition": True}, - {"pending_addition": True}, - {"pending_deletion": True}, - ] - ) - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, 60) - - test_nets = self.env.generate_ui_networks( - self.env.clusters[0].id - ) - - for n in test_nets['networks'][:2]: - n["cidr"] = "172.16.0.0/24" - - resp = self.app.put( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': self.env.clusters[0].id}), - json.dumps(test_nets), - headers=self.default_headers - ) - self.assertEquals(resp.status, 202) - - def test_network_group_creates_several_networks(self): - cluster = self.env.create_cluster(api=False) - kw = {'release': cluster.release_id, - 'cidr': '10.0.0.0/8', - 'netmask': '255.0.0.0', - 'network_size': 256, - 'name': 'fixed', - 'access': 'private', - 'vlan_start': 200, - 'amount': 25, - 'cluster_id': cluster.id} - ng = NetworkGroup(**kw) - self.db.add(ng) - self.db.commit() - self.env.network_manager.create_networks(ng) - nets_db = self.db.query(Network).filter( - not_(Network.name == "fuelweb_admin") - ).all() - self.assertEquals(len(nets_db), kw['amount']) - self.assertEquals(nets_db[0].vlan_id, kw['vlan_start']) - self.assertEquals(nets_db[kw['amount'] - 1].vlan_id, - kw['vlan_start'] + kw['amount'] - 1) - self.assertEquals(all(x.name == kw['name'] for x in nets_db), True) - self.assertEquals(all(x.access == kw['access'] for x in nets_db), True) - vlans_db = self.db.query(Vlan).all() - self.assertEquals(len(vlans_db), kw['amount'] + 1) # + 1 for admin net - - def test_network_group_slices_cidr_for_networks(self): - cluster = self.env.create_cluster(api=False) - kw = {'release': cluster.release_id, - 'cidr': '10.0.0.0/8', - 'netmask': '255.0.0.0', - 'network_size': 128, - 'name': 'fixed', - 'access': 'private', - 'vlan_start': 200, - 'amount': 2, - 'cluster_id': cluster.id} - ng = NetworkGroup(**kw) - self.db.add(ng) - self.db.commit() - self.env.network_manager.create_networks(ng) - nets_db = self.db.query(Network).filter( - not_(Network.name == "fuelweb_admin") - ).all() - self.assertEquals(len(nets_db), kw['amount']) - self.assertEquals(nets_db[0].cidr, '10.0.0.0/25') - self.assertEquals(nets_db[1].cidr, '10.0.0.128/25') - self.db.refresh(ng) - self.assertEquals(ng.cidr, '10.0.0.0/8') - - def test_network_group_does_not_squeezes_base_cidr(self): - cluster = self.env.create_cluster(api=False) - kw = {'release': cluster.release_id, - 'cidr': '172.0.0.0/24', - 'netmask': '255.255.255.0', - 'network_size': 64, - 'name': 'fixed', - 'access': 'private', - 'vlan_start': 200, - 'amount': 3, - 'cluster_id': cluster.id} - ng = NetworkGroup(**kw) - self.db.add(ng) - self.db.commit() - self.env.network_manager.create_networks(ng) - self.db.refresh(ng) - self.assertEquals(ng.cidr, "172.0.0.0/24") - - def test_network_group_does_not_squeezes_base_cidr_if_amount_1(self): - cluster = self.env.create_cluster(api=False) - kw = {'release': cluster.release_id, - 'cidr': '172.0.0.0/8', - 'netmask': '255.0.0.0', - 'network_size': 256, - 'name': 'public', - 'access': 'public', - 'vlan_start': 200, - 'amount': 1, - 'cluster_id': cluster.id} - ng = NetworkGroup(**kw) - self.db.add(ng) - self.db.commit() - self.env.network_manager.create_networks(ng) - self.db.refresh(ng) - self.assertEquals(ng.cidr, "172.0.0.0/8") - - def test_network_group_sets_correct_gateway_for_few_nets(self): - cluster = self.env.create_cluster(api=False) - kw = {'release': cluster.release_id, - 'cidr': '10.0.0.0/8', - 'netmask': '255.0.0.0', - 'network_size': 128, - 'name': 'fixed', - 'access': 'private', - 'vlan_start': 200, - 'amount': 2, - 'gateway': "10.0.0.5", - 'cluster_id': cluster.id} - ng = NetworkGroup(**kw) - self.db.add(ng) - self.db.commit() - self.env.network_manager.create_networks(ng) - nets_db = self.db.query(Network).filter( - not_(Network.name == "fuelweb_admin") - ).all() - self.assertEquals(len(nets_db), kw['amount']) - self.assertEquals(nets_db[0].gateway, "10.0.0.5") - self.assertEquals(nets_db[1].gateway, "10.0.0.5") diff --git a/nailgun/nailgun/test/integration/test_network_validation.py b/nailgun/nailgun/test/integration/test_network_validation.py deleted file mode 100644 index d7d6ba4f4..000000000 --- a/nailgun/nailgun/test/integration/test_network_validation.py +++ /dev/null @@ -1,166 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -from netaddr import IPNetwork - -from nailgun.api.models import NetworkGroup -from nailgun.settings import settings -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def update_networks(self, cluster_id, networks, expect_errors=False): - return self.app.put( - reverse('NetworkConfigurationHandler', - kwargs={'cluster_id': cluster_id}), - json.dumps(networks), - headers=self.default_headers, - expect_errors=expect_errors) - - def test_network_checking(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - ] - ) - cluster = self.env.clusters[0] - - nets = self.env.generate_ui_networks( - cluster.id - ) - resp = self.update_networks(cluster.id, nets) - self.assertEquals(resp.status, 202) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'ready') - self.assertEquals(task['progress'], 100) - self.assertEquals(task['name'], 'check_networks') - ngs_created = self.db.query(NetworkGroup).filter( - NetworkGroup.name.in_([n['name'] for n in nets['networks']]) - ).all() - self.assertEquals(len(ngs_created), len(nets['networks'])) - - def test_network_checking_fails_if_admin_intersection(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - ] - ) - cluster = self.env.clusters[0] - nets = self.env.generate_ui_networks(cluster.id) - nets['networks'][-1]["cidr"] = settings.ADMIN_NETWORK['cidr'] - resp = self.update_networks(cluster.id, nets, expect_errors=True) - self.assertEquals(resp.status, 202) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'error') - self.assertEquals(task['progress'], 100) - self.assertEquals(task['name'], 'check_networks') - self.assertEquals( - task['message'], - "Intersection with admin " - "network(s) '{0}' found".format( - settings.ADMIN_NETWORK['cidr'] - ) - ) - - def test_network_checking_fails_if_admin_intersection_ip_range(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - ] - ) - cluster = self.env.clusters[0] - nets = self.env.generate_ui_networks(cluster.id) - base = IPNetwork(settings.ADMIN_NETWORK['cidr']) - base.prefixlen += 1 - start_range = str(base[0]) - end_range = str(base[-1]) - nets['networks'][1]['ip_ranges'] = [ - [start_range, end_range] - ] - resp = self.update_networks(cluster.id, nets, expect_errors=True) - self.assertEquals(resp.status, 202) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'error') - self.assertEquals(task['progress'], 100) - self.assertEquals(task['name'], 'check_networks') - self.assertEquals( - task['message'], - "IP range {0} - {1} in {2} network intersects with admin " - "range of {3}".format( - start_range, end_range, - nets['networks'][1]['name'], - settings.ADMIN_NETWORK['cidr'] - ) - ) - - def test_network_checking_fails_if_amount_flatdhcp(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - ] - ) - cluster = self.env.clusters[0] - - nets = self.env.generate_ui_networks( - cluster.id - ) - nets['networks'][-1]["amount"] = 2 - nets['networks'][-1]["cidr"] = "10.0.0.0/23" - resp = self.update_networks(cluster.id, nets, expect_errors=True) - self.assertEquals(resp.status, 202) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'error') - self.assertEquals(task['progress'], 100) - self.assertEquals(task['name'], 'check_networks') - self.assertEquals( - task['message'], - "Network amount for '{0}' is more than 1 " - "while using FlatDHCP manager.".format( - nets['networks'][-1]["name"])) - - def test_fails_if_netmask_for_public_network_not_set_or_not_valid(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}]) - cluster = self.env.clusters[0] - - net_without_netmask = self.env.generate_ui_networks( - cluster.id) - - net_with_invalid_netmask = self.env.generate_ui_networks( - cluster.id) - - del net_without_netmask['networks'][1]['netmask'] - net_with_invalid_netmask['networks'][1]['netmask'] = '255.255.255.2' - - for nets in [net_without_netmask, net_with_invalid_netmask]: - resp = self.update_networks(cluster.id, nets, expect_errors=True) - - self.assertEquals(resp.status, 202) - task = json.loads(resp.body) - self.assertEquals(task['status'], 'error') - self.assertEquals(task['progress'], 100) - self.assertEquals(task['name'], 'check_networks') - self.assertEquals( - task['message'], 'Invalid netmask for public network') diff --git a/nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py b/nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py deleted file mode 100644 index 1b925e508..000000000 --- a/nailgun/nailgun/test/integration/test_node_allocation_stats_handler.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - def _get_allocation_stats(self): - resp = self.app.get( - reverse('NodesAllocationStatsHandler')) - return json.loads(resp.body) - - def test_allocation_stats_unallocated(self): - self.env.create_node(api=False) - stats = self._get_allocation_stats() - self.assertEquals(stats['total'], 1) - self.assertEquals(stats['unallocated'], 1) - - def test_allocation_stats_total(self): - self.env.create_node(api=False) - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - { - "pending_addition": True, - } - ] - ) - - stats = self._get_allocation_stats() - self.assertEquals(stats['total'], 2) - self.assertEquals(stats['unallocated'], 1) diff --git a/nailgun/nailgun/test/integration/test_node_collection_handlers.py b/nailgun/nailgun/test/integration/test_node_collection_handlers.py deleted file mode 100644 index 7b6cb365d..000000000 --- a/nailgun/nailgun/test/integration/test_node_collection_handlers.py +++ /dev/null @@ -1,279 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Node -from nailgun.api.models import Notification -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - def test_node_list_empty(self): - resp = self.app.get( - reverse('NodeCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals([], response) - - def test_notification_node_id(self): - node = self.env.create_node( - api=True, - meta=self.env.default_metadata() - ) - notif = self.db.query(Notification).first() - self.assertEqual(node['id'], notif.node_id) - resp = self.app.get( - reverse('NotificationCollectionHandler'), - headers=self.default_headers - ) - notif_api = json.loads(resp.body)[0] - self.assertEqual(node['id'], notif_api['node_id']) - - def test_node_get_with_cluster(self): - self.env.create( - cluster_kwargs={"api": False}, - nodes_kwargs=[ - {"cluster_id": None}, - {}, - ] - ) - cluster = self.env.clusters[0] - - resp = self.app.get( - reverse('NodeCollectionHandler'), - params={'cluster_id': cluster.id}, - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(1, len(response)) - self.assertEquals( - self.env.nodes[1].id, - response[0]['id'] - ) - - def test_node_get_with_cluster_None(self): - self.env.create( - cluster_kwargs={"api": False}, - nodes_kwargs=[ - {"cluster_id": None}, - {}, - ] - ) - - resp = self.app.get( - reverse('NodeCollectionHandler'), - params={'cluster_id': ''}, - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(1, len(response)) - self.assertEquals(self.env.nodes[0].id, response[0]['id']) - - def test_node_get_without_cluster_specification(self): - self.env.create( - cluster_kwargs={"api": False}, - nodes_kwargs=[ - {"cluster_id": None}, - {}, - ] - ) - - resp = self.app.get( - reverse('NodeCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(2, len(response)) - - def test_node_creation(self): - resp = self.app.post( - reverse('NodeCollectionHandler'), - json.dumps({'mac': 'ASDFAAASDFAA', - 'meta': self.env.default_metadata(), - 'status': 'discover'}), - headers=self.default_headers) - self.assertEquals(resp.status, 201) - response = json.loads(resp.body) - self.assertEquals('discover', response['status']) - - def test_node_update(self): - node = self.env.create_node(api=False) - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{'mac': node.mac, 'manufacturer': 'new'}]), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - resp = self.app.get( - reverse('NodeCollectionHandler'), - headers=self.default_headers - ) - node = self.db.query(Node).get(node.id) - self.assertEquals('new', node.manufacturer) - - def test_node_update_agent_discover(self): - self.env.create_node( - api=False, - status='provisioning', - meta=self.env.default_metadata() - ) - node_db = self.env.nodes[0] - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([ - {'mac': node_db.mac, 'is_agent': True, - 'status': 'discover', 'manufacturer': 'new'} - ]), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - resp = self.app.get( - reverse('NodeCollectionHandler'), - headers=self.default_headers - ) - node_db = self.db.query(Node).get(node_db.id) - self.assertEquals('new', node_db.manufacturer) - self.assertEquals('provisioning', node_db.status) - - def test_node_timestamp_updated_only_by_agent(self): - node = self.env.create_node(api=False) - timestamp = node.timestamp - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([ - {'mac': node.mac, 'status': 'discover', - 'manufacturer': 'old'} - ]), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - node = self.db.query(Node).get(node.id) - self.assertEquals(node.timestamp, timestamp) - - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([ - {'mac': node.mac, 'status': 'discover', - 'manufacturer': 'new', 'is_agent': True} - ]), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - node = self.db.query(Node).get(node.id) - self.assertNotEquals(node.timestamp, timestamp) - self.assertEquals('new', node.manufacturer) - - def test_node_create_ext_mac(self): - node1 = self.env.create_node( - api=False - ) - node2_json = { - "mac": self.env._generate_random_mac(), - "meta": self.env.default_metadata() - } - node2_json["meta"]["interfaces"][0]["mac"] = node1.mac - resp = self.app.post( - reverse('NodeCollectionHandler'), - json.dumps(node2_json), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 409) - - def test_node_create_without_mac(self): - node = self.env.create_node( - api=True, - exclude=["mac"], - expect_http=400, - expect_message="No mac address specified" - ) - self.assertEquals(node, None) - - def test_node_update_ext_mac(self): - meta = self.env.default_metadata() - node1 = self.env.create_node( - api=False, - mac=meta["interfaces"][0]["mac"], - meta={} - ) - node1_json = { - "mac": self.env._generate_random_mac(), - "meta": meta - } - # We want to be sure that new mac is not equal to old one - self.assertNotEqual(node1.mac, node1_json["mac"]) - - # Here we are trying to update node - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([node1_json]), - headers=self.default_headers, - expect_errors=True - ) - self.assertEqual(resp.status, 200) - response = json.loads(resp.body) - # Here we are checking if node mac is successfully updated - self.assertEqual(node1_json["mac"], response[0]["mac"]) - self.assertEqual(meta, response[0]["meta"]) - - def test_duplicated_node_create_fails(self): - node = self.env.create_node(api=False) - resp = self.app.post( - reverse('NodeCollectionHandler'), - json.dumps({'mac': node.mac}), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(409, resp.status) - - def test_node_creation_fail(self): - resp = self.app.post( - reverse('NodeCollectionHandler'), - json.dumps({'mac': 'ASDFAAASDF22', - 'meta': self.env.default_metadata(), - 'status': 'error'}), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 403) - - def test_node_can_be_created_with_any_role(self): - node = self.env.create_node(api=True) - cluster = self.env.create_cluster(api=True) - - new_pending_roles = ['new_pending_role1', 'new_pending_role2'] - new_roles = ['new_role1', 'new_role2'] - - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([ - {'mac': node['mac'], - 'cluster_id': cluster['id'], - 'pending_roles': new_pending_roles, - 'roles': new_roles}]), - headers=self.default_headers) - - self.assertEqual(resp.status, 200) - node_resp = json.loads(resp.body)[0] - - self.assertEqual(node_resp['pending_roles'], new_pending_roles) - self.assertEqual(node_resp['roles'], new_roles) - - node_db = self.db.query(Node).get(node['id']) - - self.assertEqual(node_db.pending_roles, new_pending_roles) - self.assertEqual(node_db.roles, new_roles) diff --git a/nailgun/nailgun/test/integration/test_node_handler.py b/nailgun/nailgun/test/integration/test_node_handler.py deleted file mode 100644 index e33da6102..000000000 --- a/nailgun/nailgun/test/integration/test_node_handler.py +++ /dev/null @@ -1,131 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Node -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def test_node_get(self): - node = self.env.create_node(api=False) - resp = self.app.get( - reverse('NodeHandler', kwargs={'node_id': node.id}), - headers=self.default_headers) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(node.id, response['id']) -# todo: decide None output format -# self.assertEquals(node.name, response['name']) - self.assertEquals(node.mac, response['mac']) - self.assertEquals( - node.pending_addition, response['pending_addition']) - self.assertEquals( - node.pending_deletion, response['pending_deletion']) - self.assertEquals(node.status, response['status']) - self.assertEquals( - node.meta['cpu']['total'], - response['meta']['cpu']['total'] - ) - self.assertEquals(node.meta['disks'], response['meta']['disks']) - self.assertEquals(node.meta['memory'], response['meta']['memory']) - - def test_node_creation_with_id(self): - node_id = '080000000003' - resp = self.app.post( - reverse('NodeCollectionHandler'), - json.dumps({'id': node_id, - 'mac': 'ASDFAAASDFAA', - 'status': 'discover'}), - headers=self.default_headers, - expect_errors=True) - # we now just ignore 'id' if present - self.assertEquals(201, resp.status) - - def test_node_deletion(self): - node = self.env.create_node(api=False) - resp = self.app.delete( - reverse('NodeHandler', kwargs={'node_id': node.id}), - "", - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(resp.status, 204) - - def test_node_valid_metadata_gets_updated(self): - new_metadata = self.env.default_metadata() - node = self.env.create_node(api=False) - resp = self.app.put( - reverse('NodeHandler', kwargs={'node_id': node.id}), - json.dumps({'meta': new_metadata}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - self.db.refresh(node) - - nodes = self.db.query(Node).filter( - Node.id == node.id - ).all() - self.assertEquals(len(nodes), 1) - self.assertEquals(nodes[0].meta, new_metadata) - - def test_node_valid_status_gets_updated(self): - node = self.env.create_node(api=False) - params = {'status': 'error'} - resp = self.app.put( - reverse('NodeHandler', kwargs={'node_id': node.id}), - json.dumps(params), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - - def test_node_action_flags_are_set(self): - flags = ['pending_addition', 'pending_deletion'] - node = self.env.create_node(api=False) - for flag in flags: - resp = self.app.put( - reverse('NodeHandler', kwargs={'node_id': node.id}), - json.dumps({flag: True}), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - self.db.refresh(node) - - node_from_db = self.db.query(Node).filter( - Node.id == node.id - ).first() - for flag in flags: - self.assertEquals(getattr(node_from_db, flag), True) - - def test_put_returns_400_if_no_body(self): - node = self.env.create_node(api=False) - resp = self.app.put( - reverse('NodeHandler', kwargs={'node_id': node.id}), - "", - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 400) - - def test_put_returns_400_if_wrong_status(self): - node = self.env.create_node(api=False) - params = {'status': 'invalid_status'} - resp = self.app.put( - reverse('NodeHandler', kwargs={'node_id': node.id}), - json.dumps(params), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 400) diff --git a/nailgun/nailgun/test/integration/test_node_nic_assignment.py b/nailgun/nailgun/test/integration/test_node_nic_assignment.py deleted file mode 100644 index 346e02067..000000000 --- a/nailgun/nailgun/test/integration/test_node_nic_assignment.py +++ /dev/null @@ -1,191 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import AllowedNetworks -from nailgun.api.models import Cluster -from nailgun.api.models import NetworkAssignment -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestClusterHandlers(BaseIntegrationTest): - - def test_assigned_networks_when_node_added(self): - mac = '123' - meta = self.env.default_metadata() - meta['interfaces'] = [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': '654'}] - - node = self.env.create_node(api=True, meta=meta, mac=mac) - self.env.create_cluster(api=True, nodes=[node['id']]) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - - self.assertEquals(resp.status, 200) - - response = json.loads(resp.body) - - for resp_nic in response: - if resp_nic['mac'] == mac: - self.assertGreater(len(resp_nic['assigned_networks']), 0) - else: - self.assertEquals(resp_nic['assigned_networks'], []) - - def test_allowed_networks_when_node_added(self): - mac = '123' - meta = self.env.default_metadata() - meta['interfaces'] = [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': 'abc'}, - ] - node = self.env.create_node(api=True, meta=meta, mac=mac) - self.env.create_cluster(api=True, nodes=[node['id']]) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - - for resp_nic in response: - self.assertGreater(len(resp_nic['allowed_networks']), 0) - - def test_assignment_is_removed_when_delete_node_from_cluster(self): - mac = '123' - meta = self.env.default_metadata() - meta['interfaces'] = [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': 'abc'}, - ] - node = self.env.create_node(api=True, meta=meta, mac=mac) - cluster = self.env.create_cluster(api=True, nodes=[node['id']]) - resp = self.app.put( - reverse('ClusterHandler', kwargs={'cluster_id': cluster['id']}), - json.dumps({'nodes': []}), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - for resp_nic in response: - self.assertEquals(resp_nic['assigned_networks'], []) - self.assertEquals(resp_nic['allowed_networks'], []) - - def test_assignment_is_removed_when_delete_cluster(self): - mac = '12364759' - meta = self.env.default_metadata() - meta['interfaces'] = [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': 'abc'}, - ] - node = self.env.create_node(api=True, meta=meta, mac=mac) - cluster = self.env.create_cluster(api=True, nodes=[node['id']]) - cluster_db = self.db.query(Cluster).get(cluster['id']) - self.db.delete(cluster_db) - self.db.commit() - - net_assignment = self.db.query(NetworkAssignment).all() - self.assertEquals(len(net_assignment), 0) - allowed_nets = self.db.query(AllowedNetworks).all() - self.assertEquals(len(allowed_nets), 0) - - -class TestNodeHandlers(BaseIntegrationTest): - - def test_network_assignment_when_node_created_and_added(self): - cluster = self.env.create_cluster(api=True) - mac = '123' - meta = self.env.default_metadata() - meta['interfaces'] = [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': '654'}, - ] - node = self.env.create_node(api=True, meta=meta, mac=mac, - cluster_id=cluster['id']) - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - for resp_nic in response: - if resp_nic['mac'] == mac: - self.assertGreater(len(resp_nic['assigned_networks']), 0) - else: - self.assertEquals(resp_nic['assigned_networks'], []) - self.assertGreater(len(resp_nic['allowed_networks']), 0) - - def test_network_assignment_when_node_added(self): - cluster = self.env.create_cluster(api=True) - mac = '123' - meta = self.env.default_metadata() - meta['interfaces'] = [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': 'abc'}, - ] - node = self.env.create_node(api=True, meta=meta, mac=mac) - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{'id': node['id'], 'cluster_id': cluster['id']}]), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - for resp_nic in response: - if resp_nic['mac'] == mac: - self.assertGreater(len(resp_nic['assigned_networks']), 0) - else: - self.assertEquals(resp_nic['assigned_networks'], []) - self.assertGreater(len(resp_nic['allowed_networks']), 0) - - def test_assignment_is_removed_when_delete_node_from_cluster(self): - cluster = self.env.create_cluster(api=True) - mac = '123' - meta = self.env.default_metadata() - meta['interfaces'] = [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': 'abc'}, - ] - node = self.env.create_node(api=True, meta=meta, mac=mac, - cluster_id=cluster['id']) - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{'id': node['id'], 'cluster_id': None}]), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - for resp_nic in response: - self.assertEquals(resp_nic['assigned_networks'], []) - self.assertEquals(resp_nic['allowed_networks'], []) diff --git a/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py b/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py deleted file mode 100644 index f646733ca..000000000 --- a/nailgun/nailgun/test/integration/test_node_nic_collection_handler.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def test_put_handler_with_one_node(self): - cluster = self.env.create_cluster(api=True) - mac = '123' - meta = {'interfaces': [ - {'name': 'eth0', 'mac': mac}, - {'name': 'eth1', 'mac': '654'}, - ]} - node = self.env.create_node(api=True, meta=meta, mac=mac, - cluster_id=cluster['id']) - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - a_nets = filter(lambda nic: nic['mac'] == mac, - response)[0]['assigned_networks'] - for resp_nic in response: - if resp_nic['mac'] == mac: - resp_nic['assigned_networks'] = [] - else: - resp_nic['assigned_networks'] = a_nets - node_json = {'id': node['id'], 'interfaces': response} - resp = self.app.put( - reverse('NodeCollectionNICsHandler'), - json.dumps([node_json]), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - new_response = json.loads(resp.body) - self.assertEquals(new_response, [node_json]) diff --git a/nailgun/nailgun/test/integration/test_notification.py b/nailgun/nailgun/test/integration/test_notification.py deleted file mode 100644 index d85dba725..000000000 --- a/nailgun/nailgun/test/integration/test_notification.py +++ /dev/null @@ -1,165 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -import uuid - -from nailgun.api.models import Notification -from nailgun.api.models import Task -from nailgun.errors import errors -from nailgun import notifier -from nailgun.rpc import receiver as rcvr -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestNotification(BaseIntegrationTest): - - def test_notification_deploy_done(self): - cluster = self.env.create_cluster(api=False) - receiver = rcvr.NailgunReceiver() - - task = Task( - uuid=str(uuid.uuid4()), - name="super", - cluster_id=cluster.id - ) - self.db.add(task) - self.db.commit() - - kwargs = { - 'task_uuid': task.uuid, - 'status': 'ready', - } - - receiver.deploy_resp(**kwargs) - - notifications = self.db.query(Notification).filter_by( - cluster_id=cluster.id - ).all() - self.assertEqual(len(notifications), 1) - self.assertEqual(notifications[0].status, "unread") - self.assertEqual(notifications[0].topic, "done") - - def test_notification_discover_no_node_fails(self): - self.assertRaises( - errors.CannotFindNodeIDForDiscovering, - notifier.notify, - "discover", - "discover message") - - def test_notification_deploy_error(self): - cluster = self.env.create_cluster(api=False) - receiver = rcvr.NailgunReceiver() - - task = Task( - uuid=str(uuid.uuid4()), - name="super", - cluster_id=cluster.id - ) - self.db.add(task) - self.db.commit() - - kwargs = { - 'task_uuid': task.uuid, - 'status': 'error', - } - - receiver.deploy_resp(**kwargs) - - notifications = self.db.query(Notification).filter_by( - cluster_id=cluster.id - ).all() - self.assertEqual(len(notifications), 1) - self.assertEqual(notifications[0].status, "unread") - self.assertEqual(notifications[0].topic, "error") - - def test_notification_node_discover(self): - - resp = self.app.post( - reverse('NodeCollectionHandler'), - json.dumps({'mac': 'AADFAAAADFAA', - 'meta': self.env.default_metadata(), - 'status': 'discover'}), - headers=self.default_headers) - self.assertEquals(resp.status, 201) - - notifications = self.db.query(Notification).all() - self.assertEqual(len(notifications), 1) - self.assertEqual(notifications[0].status, "unread") - self.assertEqual(notifications[0].topic, "discover") - - def test_notification_delete_cluster_done(self): - cluster = self.env.create_cluster(api=False) - cluster_name = cluster.name - receiver = rcvr.NailgunReceiver() - - task = Task( - uuid=str(uuid.uuid4()), - name="cluster_deletion", - cluster_id=cluster.id - ) - self.db.add(task) - self.db.commit() - - kwargs = { - 'task_uuid': task.uuid, - 'status': 'ready', - } - - receiver.remove_cluster_resp(**kwargs) - - notifications = self.db.query(Notification).all() - self.assertEqual(len(notifications), 1) - self.assertEqual(notifications[0].status, "unread") - self.assertEqual(notifications[0].topic, "done") - self.assertEqual( - notifications[0].message, - "Environment '%s' and all its nodes " - "are deleted" % cluster_name - ) - - def test_notification_delete_cluster_failed(self): - cluster = self.env.create_cluster(api=False) - receiver = rcvr.NailgunReceiver() - - task = Task( - uuid=str(uuid.uuid4()), - name="cluster_deletion", - cluster_id=cluster.id - ) - self.db.add(task) - self.db.commit() - - kwargs = { - 'task_uuid': task.uuid, - 'status': 'error', - 'error': 'Cluster deletion fake error' - } - - receiver.remove_cluster_resp(**kwargs) - - notifications = self.db.query(Notification).filter_by( - cluster_id=cluster.id - ).all() - self.assertEqual(len(notifications), 1) - self.assertEqual(notifications[0].status, "unread") - self.assertEqual(notifications[0].topic, "error") - self.assertEqual(notifications[0].cluster_id, cluster.id) - self.assertEqual( - notifications[0].message, - "Cluster deletion fake error" - ) diff --git a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py b/nailgun/nailgun/test/integration/test_orchestrator_handlers.py deleted file mode 100644 index c6e5def37..000000000 --- a/nailgun/nailgun/test/integration/test_orchestrator_handlers.py +++ /dev/null @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Cluster -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def setUp(self): - super(TestHandlers, self).setUp() - self.cluster = self.env.create_cluster(api=False) - - def check_info_handler(self, handler_name, get_info): - # updating provisioning info - orchestrator_data = {"field": "test"} - put_resp = self.app.put( - reverse(handler_name, - kwargs={'cluster_id': self.cluster.id}), - json.dumps(orchestrator_data), - headers=self.default_headers) - - self.assertEquals(put_resp.status, 200) - self.assertEquals(get_info(), orchestrator_data) - - # getting provisioning info - get_resp = self.app.get( - reverse(handler_name, - kwargs={'cluster_id': self.cluster.id}), - headers=self.default_headers) - - self.assertEquals(get_resp.status, 200) - self.datadiff(orchestrator_data, json.loads(get_resp.body)) - - # deleting provisioning info - delete_resp = self.app.delete( - reverse(handler_name, - kwargs={'cluster_id': self.cluster.id}), - headers=self.default_headers) - - self.assertEquals(delete_resp.status, 202) - self.assertEqual(get_info(), {}) - - def test_cluster_provisioning_info(self): - self.check_info_handler( - 'ProvisioningInfo', - lambda: self.cluster.replaced_provisioning_info) - - def test_cluster_deployment_info(self): - self.check_info_handler( - 'DeploymentInfo', - lambda: self.cluster.replaced_deployment_info) - - -class TestDefaultOrchestratorHandlers(BaseIntegrationTest): - - def setUp(self): - super(TestDefaultOrchestratorHandlers, self).setUp() - - cluster = self.env.create( - cluster_kwargs={ - 'mode': 'multinode'}, - nodes_kwargs=[ - {'roles': ['controller'], 'pending_addition': True}, - {'roles': ['compute'], 'pending_addition': True}, - {'roles': ['cinder'], 'pending_addition': True}]) - - self.cluster = self.db.query(Cluster).get(cluster['id']) - - def test_default_deployment_handler(self): - resp = self.app.get( - reverse('DefaultDeploymentInfo', - kwargs={'cluster_id': self.cluster.id}), - headers=self.default_headers) - - self.assertEqual(resp.status, 200) - self.assertEqual(3, len(json.loads(resp.body))) - - def test_default_provisioning_handler(self): - resp = self.app.get( - reverse('DefaultProvisioningInfo', - kwargs={'cluster_id': self.cluster.id}), - headers=self.default_headers) - - self.assertEqual(resp.status, 200) - self.assertEqual(3, len(json.loads(resp.body)['nodes'])) diff --git a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py deleted file mode 100644 index a0009cb64..000000000 --- a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py +++ /dev/null @@ -1,348 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -from nailgun.api.models import Cluster -from nailgun.api.models import IPAddrRange -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.db import db -from nailgun.orchestrator.deployment_serializers \ - import OrchestratorHASerializer -from nailgun.orchestrator.deployment_serializers \ - import OrchestratorSerializer -from nailgun.settings import settings -from nailgun.test.base import BaseIntegrationTest - - -class OrchestratorSerializerTestBase(BaseIntegrationTest): - """Class containts helpers.""" - - def filter_by_role(self, nodes, role): - return filter(lambda node: node['role'] == role, nodes) - - def filter_by_uid(self, nodes, uid): - return filter(lambda node: node['uid'] == uid, nodes) - - def assert_nodes_with_role(self, nodes, role, count): - self.assertEquals(len(self.filter_by_role(nodes, role)), count) - - def get_controllers(self, cluster_id): - return db().query(Node).\ - filter_by(cluster_id=cluster_id, - pending_deletion=False).\ - filter(Node.role_list.any(name='controller')).\ - order_by(Node.id) - - -class TestOrchestratorSerializer(OrchestratorSerializerTestBase): - - def setUp(self): - super(TestOrchestratorSerializer, self).setUp() - self.cluster = self.create_env('multinode') - - def create_env(self, mode, network_manager='FlatDHCPManager'): - cluster = self.env.create( - cluster_kwargs={ - 'mode': mode, - 'net_manager': network_manager - }, - nodes_kwargs=[ - {'roles': ['controller', 'cinder'], 'pending_addition': True}, - {'roles': ['compute', 'cinder'], 'pending_addition': True}, - {'roles': ['compute'], 'pending_addition': True}, - {'roles': [], 'pending_roles': ['cinder'], - 'pending_addition': True}]) - - cluster_db = self.db.query(Cluster).get(cluster['id']) - cluster_db.prepare_for_deployment() - return cluster_db - - @property - def serializer(self): - return OrchestratorSerializer - - def assert_roles_flattened(self, nodes): - self.assertEquals(len(nodes), 6) - self.assert_nodes_with_role(nodes, 'controller', 1) - self.assert_nodes_with_role(nodes, 'compute', 2) - self.assert_nodes_with_role(nodes, 'cinder', 3) - - def test_serialize_nodes(self): - serialized_nodes = self.serializer.serialize_nodes(self.cluster.nodes) - self.assert_roles_flattened(serialized_nodes) - - # Each not should be same as result of - # serialize_node function - for serialized_node in serialized_nodes: - node_db = self.db.query(Node).get(int(serialized_node['uid'])) - - expected_node = self.serializer.serialize_node( - node_db, serialized_node['role']) - self.assertEquals(serialized_node, expected_node) - - def test_serialize_node(self): - node = self.env.create_node( - api=True, cluster_id=self.cluster.id, pending_addition=True) - self.cluster.prepare_for_deployment() - - node_db = self.db.query(Node).get(node['id']) - - serialized_data = self.serializer.serialize_node(node_db, 'controller') - - self.assertEquals(serialized_data['role'], 'controller') - self.assertEquals(serialized_data['uid'], str(node_db.id)) - self.assertEquals(serialized_data['status'], node_db.status) - self.assertEquals(serialized_data['online'], node_db.online) - self.assertEquals(serialized_data['fqdn'], - 'node-%d.%s' % (node_db.id, settings.DNS_DOMAIN)) - - def test_node_list(self): - node_list = self.serializer.node_list(self.cluster.nodes) - - # Check right nodes count with right roles - self.assert_roles_flattened(node_list) - - # Check common attrs - for node in node_list: - node_db = self.db.query(Node).get(int(node['uid'])) - self.assertEquals(node['public_netmask'], '255.255.255.0') - self.assertEquals(node['internal_netmask'], '255.255.255.0') - self.assertEquals(node['storage_netmask'], '255.255.255.0') - self.assertEquals(node['uid'], str(node_db.id)) - self.assertEquals(node['name'], 'node-%d' % node_db.id) - self.assertEquals(node['fqdn'], 'node-%d.%s' % - (node_db.id, settings.DNS_DOMAIN)) - - # Check uncommon attrs - node_uids = sorted(set([n['uid'] for n in node_list])) - expected_list = [ - { - 'roles': ['controller', 'cinder'], - 'attrs': { - 'uid': node_uids[0], - 'internal_address': '192.168.0.2', - 'public_address': '172.16.1.2', - 'storage_address': '192.168.1.2'}}, - { - 'roles': ['compute', 'cinder'], - 'attrs': { - 'uid': node_uids[1], - 'internal_address': '192.168.0.3', - 'public_address': '172.16.1.3', - 'storage_address': '192.168.1.3'}}, - { - 'roles': ['compute'], - 'attrs': { - 'uid': node_uids[2], - 'internal_address': '192.168.0.4', - 'public_address': '172.16.1.4', - 'storage_address': '192.168.1.4'}}, - { - 'roles': ['cinder'], - 'attrs': { - 'uid': node_uids[3], - 'internal_address': '192.168.0.5', - 'public_address': '172.16.1.5', - 'storage_address': '192.168.1.5'}}] - - for expected in expected_list: - attrs = expected['attrs'] - - for role in expected['roles']: - nodes = self.filter_by_role(node_list, role) - node = self.filter_by_uid(nodes, attrs['uid'])[0] - - self.assertEquals(attrs['internal_address'], - node['internal_address']) - self.assertEquals(attrs['public_address'], - node['public_address']) - self.assertEquals(attrs['storage_address'], - node['storage_address']) - - def test_controller_nodes(self): - ctrl_nodes = self.serializer.controller_nodes(self.cluster) - self.assertEquals(len(ctrl_nodes), 1) - - # And should equal to nodes in nodes_list - all_nodes = self.serializer.node_list(self.cluster.nodes) - ctrl_nodes_from_nodes_list = filter( - lambda node: node['role'] == 'controller', - all_nodes) - - self.assertEquals(ctrl_nodes, ctrl_nodes_from_nodes_list) - - def test_vlan_manager(self): - cluster = self.create_env('multinode', 'VlanManager') - facts = self.serializer.serialize(cluster) - - for fact in facts: - self.assertEquals(fact['vlan_interface'], 'eth0') - self.assertEquals(fact['fixed_interface'], 'eth0') - self.assertEquals( - fact['novanetwork_parameters']['network_manager'], - 'VlanManager') - self.assertEquals( - fact['novanetwork_parameters']['num_networks'], 1) - self.assertEquals( - fact['novanetwork_parameters']['vlan_start'], 103) - self.assertEquals( - fact['novanetwork_parameters']['network_size'], 256) - - def test_floatin_ranges_generation(self): - # Set ip ranges for floating ips - ranges = [['172.16.0.2', '172.16.0.4'], - ['172.16.0.3', '172.16.0.5'], - ['172.16.0.10', '172.16.0.12']] - - floating_network_group = self.db.query(NetworkGroup).filter( - NetworkGroup.name == 'floating').filter( - NetworkGroup.cluster_id == self.cluster.id).first() - - # Remove floating ip addr ranges - self.db.query(IPAddrRange).filter( - IPAddrRange.network_group_id == floating_network_group.id).delete() - - # Add new ranges - for ip_range in ranges: - new_ip_range = IPAddrRange( - first=ip_range[0], - last=ip_range[1], - network_group_id=floating_network_group.id) - - self.db.add(new_ip_range) - self.db.commit() - facts = self.serializer.serialize(self.cluster) - - for fact in facts: - self.assertEquals( - fact['floating_network_range'], - ['172.16.0.2-172.16.0.4', - '172.16.0.3-172.16.0.5', - '172.16.0.10-172.16.0.12']) - - def test_configure_interfaces_untagged_network(self): - network_data = [ - { - 'name': 'management', - 'ip': '192.168.0.4/24', - 'dev': 'eth1', - 'netmask': '255.255.255.0', - 'brd': '192.168.0.255', - 'gateway': '192.168.0.1'}, - { - 'name': 'public', - 'ip': '172.16.1.4/24', - 'dev': 'eth0', - 'netmask': '255.255.255.0', - 'brd': '172.16.1.255', - 'gateway': '172.16.1.1'}, - { - 'name': 'storage', - 'ip': '192.168.1.4/24', - 'dev': 'eth1', - 'netmask': '255.255.255.0', - 'brd': '192.168.1.255', - 'gateway': '192.168.1.1'}, - { - 'name': 'floating', 'dev': 'eth0'}, - { - 'name': 'fixed', 'dev': 'eth1'}, - { - 'name': 'admin', 'dev': 'eth0'}] - - for network in network_data: - network['vlan'] = None - - interfaces = self.serializer.configure_interfaces(network_data) - - expected_interfaces = { - 'lo': { - 'interface': 'lo', - 'ipaddr': ['127.0.0.1/8']}, - 'eth1': { - 'interface': 'eth1', - 'ipaddr': [ - '192.168.0.4/24', '192.168.1.4/24'], - '_name': 'management' - }, - 'eth0': { - 'interface': 'eth0', - 'ipaddr': 'dhcp', - 'gateway': '172.16.1.1', - '_name': 'public'}} - - self.assertEquals(expected_interfaces, interfaces) - - -class TestOrchestratorHASerializer(OrchestratorSerializerTestBase): - - def setUp(self): - super(TestOrchestratorHASerializer, self).setUp() - self.cluster = self.create_env('ha_compact') - - def create_env(self, mode): - cluster = self.env.create( - cluster_kwargs={ - 'mode': mode, - }, - nodes_kwargs=[ - {'roles': ['controller'], 'pending_addition': True}, - {'roles': ['controller'], 'pending_addition': True}, - {'roles': ['controller', 'cinder'], 'pending_addition': True}, - {'roles': ['compute', 'cinder'], 'pending_addition': True}, - {'roles': ['compute'], 'pending_addition': True}, - {'roles': ['cinder'], 'pending_addition': True}]) - - cluster_db = self.db.query(Cluster).get(cluster['id']) - cluster_db.prepare_for_deployment() - return cluster_db - - @property - def serializer(self): - return OrchestratorHASerializer - - def test_node_list(self): - serialized_nodes = self.serializer.node_list(self.cluster.nodes) - - for node in serialized_nodes: - # Each node has swift_zone - self.assertEquals(node['swift_zone'], node['uid']) - - def test_get_common_attrs(self): - attrs = self.serializer.get_common_attrs(self.cluster) - # vips - self.assertEquals(attrs['management_vip'], '192.168.0.8') - self.assertEquals(attrs['public_vip'], '172.16.1.8') - - # last_contrller - controllers = self.get_controllers(self.cluster.id) - self.assertEquals(attrs['last_controller'], - 'node-%d' % controllers[-1].id) - - # primary_controller - controllers = self.filter_by_role(attrs['nodes'], 'primary-controller') - self.assertEquals(controllers[0]['role'], 'primary-controller') - - # mountpoints and mp attrs - self.assertEquals( - attrs['mp'], - [{'point': '1', 'weight': '1'}, - {'point': '2', 'weight': '2'}]) - - self.assertEquals( - attrs['mountpoints'], - '1 1\\n2 2\\n') diff --git a/nailgun/nailgun/test/integration/test_plugin.py b/nailgun/nailgun/test/integration/test_plugin.py deleted file mode 100644 index c4b285e4a..000000000 --- a/nailgun/nailgun/test/integration/test_plugin.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -from nailgun.api.models import Task -from nailgun.plugin.thread import get_queue -from nailgun.plugin.thread import PluginThread -from nailgun.test.base import BaseIntegrationTest - - -class TestPluginProcess(BaseIntegrationTest): - def setUp(self): - super(TestPluginProcess, self).setUp() - self.plugin_thread = PluginThread() - self.plugin_thread.start() - - def tearDown(self): - super(TestPluginProcess, self).tearDown() - self.plugin_thread.soft_stop() - - def test_task_set_to_error_when_exception_raised(self): - queue = get_queue() - task = Task(name='install_plugin', cache={'plugin_id': -1}) - self.env.db.add(task) - self.env.db.commit() - - queue.put(task.uuid) - - def check_task_status_is_error(): - self.env.db.refresh(task) - return task.status == 'error' - - self.env.wait_for_true(check_task_status_is_error, timeout=2) - self.assertEquals(task.progress, 100) diff --git a/nailgun/nailgun/test/integration/test_provisioning.py b/nailgun/nailgun/test/integration/test_provisioning.py deleted file mode 100644 index 79cf1d79a..000000000 --- a/nailgun/nailgun/test/integration/test_provisioning.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import mock -from mock import patch - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks - - -class TestProvisioning(BaseIntegrationTest): - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_nodes_in_cluster(self, mocked_rpc): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False, "pending_addition": True}, - {"api": False, "cluster_id": None} - ] - ) - cluster_db = self.env.clusters[0] - map(cluster_db.nodes.append, self.env.nodes[:2]) - self.db.add(cluster_db) - self.db.commit() - - self.assertEqual(len(cluster_db.nodes), 2) - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_node_status_changes_to_provision(self, mocked_rpc=None): - cluster = self.env.create_cluster() - map( - lambda x: self.env.create_node( - api=False, - cluster_id=cluster['id'], - **x), - [ - {"status": "ready"}, - {"pending_addition": True}, - {"status": "provisioning", "pending_addition": True}, - {"status": "deploying", "pending_addition": True}, - {"status": "error", "error_type": "deploy"}, - {"status": "error", "error_type": "provision"}, - ] - ) - cluster = self.env.clusters[0] - cluster.clear_pending_changes() - - self.env.network_manager.assign_ips = mock.MagicMock() - self.env.launch_deployment() - - self.env.refresh_nodes() - self.assertEquals(self.env.nodes[0].status, 'ready') - # FIXME node status is not updated into "provisioning" for fake tasks - self.assertEquals(self.env.nodes[1].status, 'discover') - self.assertEquals(self.env.nodes[2].status, 'provisioning') - self.assertEquals(self.env.nodes[3].status, 'provisioned') - self.assertEquals(self.env.nodes[4].status, 'error') - # FIXME node status is not updated into "provisioning" for fake tasks - self.assertEquals(self.env.nodes[5].status, 'error') diff --git a/nailgun/nailgun/test/integration/test_redhat.py b/nailgun/nailgun/test/integration/test_redhat.py deleted file mode 100644 index c6148928a..000000000 --- a/nailgun/nailgun/test/integration/test_redhat.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Task -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - def setUp(self): - super(TestHandlers, self).setUp() - self.release = self.env.create_release(api=False) - - @fake_tasks() - def test_redhat_account_validation_failure(self): - resp = self.app.post( - reverse('RedHatSetupHandler'), - json.dumps({'license_type': 'rhsm', - 'username': 'some_user', - 'password': 'password', - 'release_id': self.release.id}), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 202) - - supertask = self.db.query(Task).filter_by( - name="redhat_check_credentials" - ).first() - self.env.wait_error(supertask) diff --git a/nailgun/nailgun/test/integration/test_rpc_consumer.py b/nailgun/nailgun/test/integration/test_rpc_consumer.py deleted file mode 100644 index 1450c1738..000000000 --- a/nailgun/nailgun/test/integration/test_rpc_consumer.py +++ /dev/null @@ -1,701 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -from mock import patch -import uuid - -from nailgun.api.models import Attributes -from nailgun.api.models import Cluster -from nailgun.api.models import IPAddr -from nailgun.api.models import Network -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.api.models import Notification -from nailgun.api.models import Task -from nailgun.api.models import Vlan -from nailgun.rpc import receiver as rcvr -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestVerifyNetworks(BaseIntegrationTest): - - def setUp(self): - super(TestVerifyNetworks, self).setUp() - self.receiver = rcvr.NailgunReceiver() - - def test_verify_networks_resp(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - nets = [{'iface': 'eth0', 'vlans': range(100, 105)}] - - task = Task( - name="verify_networks", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - "nodes": [{'uid': node1.id, 'networks': nets}, - {'uid': node2.id, 'networks': nets}] - } - } - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': [{'uid': node1.id, 'networks': nets}, - {'uid': node2.id, 'networks': nets}]} - self.receiver.verify_networks_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "ready") - self.assertEqual(task.message, None) - - def test_verify_networks_resp_error(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - nets_sent = [{'iface': 'eth0', 'vlans': range(100, 105)}] - nets_resp = [{'iface': 'eth0', 'vlans': range(100, 104)}] - - task = Task( - name="super", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}] - } - } - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': [{'uid': node1.id, 'networks': nets_resp}, - {'uid': node2.id, 'networks': nets_resp}]} - self.receiver.verify_networks_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "error") - error_nodes = [] - for node in self.env.nodes: - error_nodes.append({'uid': node.id, 'interface': 'eth0', - 'name': node.name, 'absent_vlans': [104], - 'mac': node.interfaces[0].mac}) - self.assertEqual(task.message, None) - self.assertEqual(task.result, error_nodes) - - def test_verify_networks_resp_error_with_removed_node(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - nets_sent = [{'iface': 'eth0', 'vlans': range(100, 105)}] - nets_resp = [{'iface': 'eth0', 'vlans': range(100, 104)}] - - task = Task( - name="super", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}] - } - } - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': [{'uid': node1.id, 'networks': nets_resp}, - {'uid': node2.id, 'networks': nets_resp}]} - self.db.delete(node2) - self.db.commit() - self.receiver.verify_networks_resp(**kwargs) - resp = self.app.get( - reverse('TaskHandler', kwargs={'task_id': task.id}), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - task = json.loads(resp.body) - self.assertEqual(task['status'], "error") - error_nodes = [{'uid': node1.id, 'interface': 'eth0', - 'name': node1.name, 'absent_vlans': [104], - 'mac': node1.interfaces[0].mac}, - {'uid': node2.id, 'interface': 'eth0', - 'absent_vlans': [104]}] - self.assertEqual(task.get('message'), None) - self.assertEqual(task['result'], error_nodes) - - def test_verify_networks_resp_empty_nodes_default_error(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - - task = Task( - name="super", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - 'nodes': [] - } - } - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': []} - self.receiver.verify_networks_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "error") - error_msg = 'At least two nodes are required to be in ' \ - 'the environment for network verification.' - self.assertEqual(task.message, error_msg) - - def test_verify_networks_resp_empty_nodes_custom_error(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - nets_sent = [{'iface': 'eth0', 'vlans': range(100, 105)}] - - task = Task( - name="super", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}] - } - } - self.db.add(task) - self.db.commit() - - error_msg = 'Custom error message.' - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': [], - 'error': error_msg} - self.receiver.verify_networks_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "error") - self.assertEqual(task.message, error_msg) - - def test_verify_networks_resp_extra_nodes_error(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - node3 = self.env.create_node(api=False) - nets_sent = [{'iface': 'eth0', 'vlans': range(100, 105)}] - - task = Task( - name="super", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}] - } - } - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': [{'uid': node3.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}, - {'uid': node1.id, 'networks': nets_sent}]} - self.receiver.verify_networks_resp(**kwargs) - self.db.refresh(task) - self.assertEquals(task.status, "ready") - self.assertEquals(task.message, None) - - def test_verify_networks_resp_forgotten_node_error(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False, 'name': 'node1'}, - {"api": False, 'name': 'node2'}, - {"api": False, 'name': 'node3'} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2, node3 = self.env.nodes - nets_sent = [{'iface': 'eth0', 'vlans': range(100, 105)}] - - task = Task( - name="super", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}, - {'uid': node3.id, 'networks': nets_sent}] - } - } - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}]} - self.receiver.verify_networks_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "error") - self.assertRegexpMatches(task.message, node3.name) - self.assertEqual(task.result, []) - - def test_verify_networks_resp_incomplete_network_data_error(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - nets_sent = [{'iface': 'eth0', 'vlans': range(100, 105)}] - - task = Task( - name="super", - cluster_id=cluster_db.id - ) - task.cache = { - "args": { - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': nets_sent}] - } - } - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'status': 'ready', - 'nodes': [{'uid': node1.id, 'networks': nets_sent}, - {'uid': node2.id, 'networks': []}]} - self.receiver.verify_networks_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "error") - self.assertEqual(task.message, None) - error_nodes = [{'uid': node2.id, 'interface': 'eth0', - 'name': node2.name, 'mac': node2.interfaces[0].mac, - 'absent_vlans': nets_sent[0]['vlans'], - }] - self.assertEqual(task.result, error_nodes) - - -class TestDhcpCheckTask(BaseIntegrationTest): - - def setUp(self): - super(TestDhcpCheckTask, self).setUp() - self.receiver = rcvr.NailgunReceiver() - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - self.node1, self.node2 = self.env.nodes - - self.task = Task( - name="check_dhcp", - cluster_id=cluster_db.id - ) - self.db.add(self.task) - self.db.commit() - - def test_check_dhcp_resp_master_mac(self): - kwargs = { - 'task_uuid': self.task.uuid, - 'status': 'ready', - 'nodes': [{'uid': '90', - 'status': 'ready', - 'data': [{'mac': 'bc:ae:c5:e0:f5:85', - 'server_id': '10.20.0.157', - 'yiaddr': '10.20.0.133', - 'iface': 'eth0'}]}, - {'uid': '91', - 'status': 'ready', - 'data': [{'mac': 'bc:ae:c5:e0:f5:85', - 'server_id': '10.20.0.20', - 'yiaddr': '10.20.0.131', - 'iface': 'eth0'}]}] - } - - with patch('nailgun.rpc.receiver.NailgunReceiver._get_master_macs') \ - as master_macs: - master_macs.return_value = [{'addr': 'bc:ae:c5:e0:f5:85'}] - self.receiver.check_dhcp_resp(**kwargs) - self.db.refresh(self.task) - self.assertEqual(self.task.status, "ready") - self.assertEqual(self.task.result, {}) - - def test_check_dhcp_resp_roque_dhcp_mac(self): - kwargs = { - 'task_uuid': self.task.uuid, - 'status': 'ready', - 'nodes': [{'uid': '90', - 'status': 'ready', - 'data': [{'mac': 'ee:ae:c5:e0:f5:17', - 'server_id': '10.20.0.157', - 'yiaddr': '10.20.0.133', - 'iface': 'eth0'}]}, - {'uid': '91', - 'status': 'ready', - 'data': [{'mac': 'bc:ae:c5:e0:f5:85', - 'server_id': '10.20.0.20', - 'yiaddr': '10.20.0.131', - 'iface': 'eth0'}]}] - } - with patch.object(self.receiver, '_get_master_macs') as master_macs: - master_macs.return_value = [{'addr': 'bc:ae:c5:e0:f5:85'}] - self.receiver.check_dhcp_resp(**kwargs) - self.db.refresh(self.task) - self.assertEqual(self.task.status, "error") - - def test_check_dhcp_resp_empty_nodes(self): - kwargs = { - 'task_uuid': self.task.uuid, - 'status': 'ready' - } - with patch.object(self.receiver, '_get_master_macs') as master_macs: - master_macs.return_value = [{'addr': 'bc:ae:c5:e0:f5:85'}] - self.receiver.check_dhcp_resp(**kwargs) - self.db.refresh(self.task) - self.assertEqual(self.task.status, "ready") - self.assertEqual(self.task.result, {}) - - def test_check_dhcp_resp_empty_nodes_erred(self): - kwargs = { - 'task_uuid': self.task.uuid, - 'status': 'error' - } - with patch.object(self.receiver, '_get_master_macs'): - self.receiver.check_dhcp_resp(**kwargs) - self.db.refresh(self.task) - self.assertEqual(self.task.status, 'error') - self.assertEqual(self.task.result, {}) - - -class TestConsumer(BaseIntegrationTest): - - def setUp(self): - super(TestConsumer, self).setUp() - self.receiver = rcvr.NailgunReceiver() - - def test_node_deploy_resp(self): - node = self.env.create_node(api=False) - node2 = self.env.create_node(api=False) - - task = Task( - uuid=str(uuid.uuid4()), - name="deploy" - ) - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'nodes': [{'uid': node.id, 'status': 'deploying'}, - {'uid': node2.id, 'status': 'error'}]} - self.receiver.deploy_resp(**kwargs) - self.db.refresh(node) - self.db.refresh(node2) - self.db.refresh(task) - self.assertEqual((node.status, node2.status), ("deploying", "error")) - # it is running because we don't stop deployment - # if there are error nodes - self.assertEqual(task.status, "running") - - def test_task_progress(self): - - task = Task( - uuid=str(uuid.uuid4()), - name="super", - status="running" - ) - self.db.add(task) - self.db.commit() - kwargs = {'task_uuid': task.uuid, 'progress': 20} - self.receiver.deploy_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.progress, 20) - self.assertEqual(task.status, "running") - - def test_error_node_progress(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False} - ] - ) - task = Task( - uuid=str(uuid.uuid4()), - name="super", - status="running" - ) - self.db.add(task) - self.db.commit() - kwargs = { - 'task_uuid': task.uuid, - 'progress': 20, - 'nodes': [ - { - 'uid': self.env.nodes[0].id, - 'status': 'error', - 'progress': 50 - } - ] - } - self.receiver.deploy_resp(**kwargs) - self.db.refresh(self.env.nodes[0]) - self.assertEqual(self.env.nodes[0].progress, 100) - - def test_remove_nodes_resp(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - - task = Task( - uuid=str(uuid.uuid4()), - name="super", - cluster_id=cluster_db.id - ) - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'progress': 100, - 'status': 'ready', - 'nodes': [{'uid': node1.id}, - {'uid': str(node2.id)}]} - - self.receiver.remove_nodes_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "ready") - nodes_db = self.db.query(Node).all() - self.assertEquals(len(nodes_db), 0) - - def test_remove_nodes_resp_failure(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - - task = Task( - uuid=str(uuid.uuid4()), - name="super", - cluster_id=cluster_db.id - ) - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'progress': 100, - 'status': 'error', - 'nodes': [], - 'error_nodes': [{'uid': node1.id, - 'error': "RPC method failed"}]} - - self.receiver.remove_nodes_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "error") - nodes_db = self.db.query(Node).all() - error_node = self.db.query(Node).get(node1.id) - self.db.refresh(error_node) - self.assertEquals(len(nodes_db), 2) - self.assertEquals(error_node.status, "error") - - def test_remove_cluster_resp(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_id = self.env.clusters[0].id - node1, node2 = self.env.nodes - node1_id, node2_id = [n.id for n in self.env.nodes] - self.env.create_notification( - cluster_id=cluster_id - ) - networks = self.db.query(Network)\ - .join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == cluster_id).all() - - vlans = [] - for net in networks: - vlans.append(net.vlan_id) - - task = Task( - uuid=str(uuid.uuid4()), - name="cluster_deletion", - cluster_id=cluster_id - ) - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'progress': 100, - 'status': 'ready', - 'nodes': [{'uid': node1.id}, - {'uid': str(node2.id)}], - 'error_nodes': [] - } - - self.receiver.remove_cluster_resp(**kwargs) - - nodes_db = self.db.query(Node)\ - .filter_by(cluster_id=cluster_id).all() - self.assertEquals(len(nodes_db), 0) - - ip_db = self.db.query(IPAddr)\ - .filter(IPAddr.node.in_([node1_id, node2_id])).all() - self.assertEquals(len(ip_db), 0) - - vlan_db = self.db.query(Vlan)\ - .filter(Vlan.id.in_(vlans)).all() - self.assertEquals(len(vlan_db), 0) - - attrs_db = self.db.query(Attributes)\ - .filter_by(cluster_id=cluster_id).all() - self.assertEquals(len(attrs_db), 0) - - nots_db = self.db.query(Notification)\ - .filter_by(cluster_id=cluster_id).all() - self.assertEquals(len(nots_db), 0) - - nets_db = self.db.query(Network)\ - .join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == cluster_id).all() - self.assertEquals(len(nets_db), 0) - - task_db = self.db.query(Task)\ - .filter_by(cluster_id=cluster_id).all() - self.assertEquals(len(task_db), 0) - - cluster_db = self.db.query(Cluster).get(cluster_id) - self.assertIsNone(cluster_db) - - def test_remove_cluster_resp_failed(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": False}, - {"api": False} - ] - ) - cluster_db = self.env.clusters[0] - node1, node2 = self.env.nodes - self.env.create_notification( - cluster_id=cluster_db.id - ) - - task = Task( - uuid=str(uuid.uuid4()), - name="cluster_deletion", - cluster_id=cluster_db.id - ) - self.db.add(task) - self.db.commit() - - kwargs = {'task_uuid': task.uuid, - 'progress': 100, - 'status': 'error', - 'nodes': [{'uid': node1.id}], - 'error_nodes': [{'uid': node1.id, - 'error': "RPC method failed"}], - } - - self.receiver.remove_cluster_resp(**kwargs) - self.db.refresh(task) - self.assertEqual(task.status, "error") - - nodes_db = self.db.query(Node)\ - .filter_by(cluster_id=cluster_db.id).all() - self.assertNotEqual(len(nodes_db), 0) - - attrs_db = self.db.query(Attributes)\ - .filter_by(cluster_id=cluster_db.id).all() - self.assertNotEqual(len(attrs_db), 0) - - nots_db = self.db.query(Notification)\ - .filter_by(cluster_id=cluster_db.id).all() - self.assertNotEqual(len(nots_db), 0) - - nets_db = self.db.query(Network)\ - .join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == cluster_db.id).all() - self.assertNotEqual(len(nets_db), 0) diff --git a/nailgun/nailgun/test/integration/test_task_managers.py b/nailgun/nailgun/test/integration/test_task_managers.py deleted file mode 100644 index 77120e79a..000000000 --- a/nailgun/nailgun/test/integration/test_task_managers.py +++ /dev/null @@ -1,446 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -import time - -from nailgun.settings import settings - -from nailgun.api.models import Cluster -from nailgun.api.models import Node -from nailgun.api.models import Notification -from nailgun.api.models import Task -from nailgun.errors import errors -import nailgun.rpc as rpc -from nailgun.task.manager import DeploymentTaskManager -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestTaskManagers(BaseIntegrationTest): - - def tearDown(self): - self._wait_for_threads() - super(TestTaskManagers, self).tearDown() - - @fake_tasks() - def test_deployment_task_managers(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - {"pending_deletion": True}, - ] - ) - supertask = self.env.launch_deployment() - self.assertEquals(supertask.name, 'deploy') - self.assertIn(supertask.status, ('running', 'ready')) - # we have three subtasks here - # deletion - # provision - # deployment - self.assertEquals(len(supertask.subtasks), 3) - - self.env.wait_for_nodes_status([self.env.nodes[0]], 'provisioning') - self.env.wait_ready( - supertask, - 60, - u"Successfully removed 1 node(s). No errors occurred; " - "Deployment of environment '{0}' is done".format( - self.env.clusters[0].name - ) - ) - self.env.refresh_nodes() - for n in filter( - lambda n: n.cluster_id == self.env.clusters[0].id, - self.env.nodes - ): - self.assertEquals(n.status, 'ready') - self.assertEquals(n.progress, 100) - - @fake_tasks() - def test_do_not_redeploy_nodes_in_ready_status(self): - self.env.create(nodes_kwargs=[ - {"pending_addition": True}, - {"pending_addition": True}]) - cluster_db = self.env.clusters[0] - # Generate ips, fqdns - cluster_db.prepare_for_deployment() - # First node with status ready - # should not be readeployed - self.env.nodes[0].status = 'ready' - self.db.commit() - - cluster_db.clear_pending_changes() - - supertask = self.env.launch_deployment() - self.assertEquals(supertask.name, 'deploy') - self.assertIn(supertask.status, ('running', 'ready')) - - self.assertEquals(self.env.nodes[0].status, 'ready') - self.env.wait_for_nodes_status([self.env.nodes[1]], 'provisioning') - self.env.wait_ready(supertask) - - self.env.refresh_nodes() - - self.assertEquals(self.env.nodes[1].status, 'ready') - self.assertEquals(self.env.nodes[1].progress, 100) - - @fake_tasks() - def test_deployment_fails_if_node_offline(self): - cluster = self.env.create_cluster(api=True) - self.env.create_node(cluster_id=cluster['id'], - roles=["controller"], - pending_addition=True) - self.env.create_node(cluster_id=cluster['id'], - roles=["compute"], - online=False, - name="Offline node", - pending_addition=True) - self.env.create_node(cluster_id=cluster['id'], - roles=["compute"], - pending_addition=True) - supertask = self.env.launch_deployment() - self.env.wait_error( - supertask, - 60, - u"Deployment has failed. Check these nodes:\n" - "'Offline node'" - ) - - @fake_tasks() - def test_redeployment_works(self): - self.env.create( - cluster_kwargs={"mode": "ha_compact"}, - nodes_kwargs=[ - {"pending_addition": True}, - {"pending_addition": True}, - {"pending_addition": True}, - {"roles": ["compute"], "pending_addition": True} - ] - ) - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, 60) - self.env.refresh_nodes() - - self.env.create_node( - cluster_id=self.env.clusters[0].id, - roles=["controller"], - pending_addition=True - ) - - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, 60) - self.env.refresh_nodes() - for n in self.env.nodes: - self.assertEquals(n.status, 'ready') - self.assertEquals(n.progress, 100) - - @fake_tasks() - def test_redeployment_error_nodes(self): - self.env.create( - cluster_kwargs={"mode": "ha_compact"}, - nodes_kwargs=[ - { - "pending_addition": True, - "status": "error", - "error_type": "provision", - "error_msg": "Test Error" - }, - {"pending_addition": True}, - {"pending_addition": True}, - {"roles": ["compute"], "pending_addition": True} - ] - ) - supertask = self.env.launch_deployment() - self.env.wait_error(supertask, 60) - self.env.refresh_nodes() - self.assertEquals(self.env.nodes[0].status, 'error') - self.assertEquals(self.env.nodes[0].needs_reprovision, True) - self.assertEquals(self.env.nodes[1].status, 'provisioned') - notif_node = self.db.query(Notification).filter_by( - topic="error", - message=u"Failed to deploy node '{0}': {1}".format( - self.env.nodes[0].name, - self.env.nodes[0].error_msg - ) - ).first() - self.assertIsNotNone(notif_node) - notif_deploy = self.db.query(Notification).filter_by( - topic="error", - message=u"Deployment has failed. " - "Check these nodes:\n'{0}'".format( - self.env.nodes[0].name - ) - ).first() - self.assertIsNotNone(notif_deploy) - all_notif = self.db.query(Notification).all() - self.assertEqual(len(all_notif), 2) - supertask = self.env.launch_deployment() - self.env.wait_error(supertask, 60) - - def test_deletion_empty_cluster_task_manager(self): - cluster = self.env.create_cluster(api=True) - resp = self.app.delete( - reverse( - 'ClusterHandler', - kwargs={'cluster_id': self.env.clusters[0].id}), - headers=self.default_headers - ) - self.assertEquals(202, resp.status) - - timer = time.time() - timeout = 15 - clstr = self.db.query(Cluster).get(self.env.clusters[0].id) - while clstr: - time.sleep(1) - try: - self.db.refresh(clstr) - except Exception: - break - if time.time() - timer > timeout: - raise Exception("Cluster deletion seems to be hanged") - - notification = self.db.query(Notification)\ - .filter(Notification.topic == "done")\ - .filter(Notification.message == "Environment '%s' and all its " - "nodes are deleted" % cluster["name"]).first() - self.assertIsNotNone(notification) - - tasks = self.db.query(Task).all() - self.assertEqual(tasks, []) - - @fake_tasks() - def test_deletion_cluster_task_manager(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"status": "ready", "progress": 100}, - {"roles": ["compute"], "status": "ready", "progress": 100}, - {"roles": ["compute"], "pending_addition": True}, - ] - ) - cluster_id = self.env.clusters[0].id - cluster_name = self.env.clusters[0].name - resp = self.app.delete( - reverse( - 'ClusterHandler', - kwargs={'cluster_id': cluster_id}), - headers=self.default_headers - ) - self.assertEquals(202, resp.status) - - timer = time.time() - timeout = 15 - clstr = self.db.query(Cluster).get(cluster_id) - while clstr: - time.sleep(1) - try: - self.db.refresh(clstr) - except Exception: - break - if time.time() - timer > timeout: - raise Exception("Cluster deletion seems to be hanged") - - notification = self.db.query(Notification)\ - .filter(Notification.topic == "done")\ - .filter(Notification.message == "Environment '%s' and all its " - "nodes are deleted" % cluster_name).first() - self.assertIsNotNone(notification) - - tasks = self.db.query(Task).all() - self.assertEqual(tasks, []) - - @fake_tasks() - def test_deletion_during_deployment(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"status": "ready", "pending_addition": True}, - ] - ) - cluster_id = self.env.clusters[0].id - resp = self.app.put( - reverse( - 'ClusterChangesHandler', - kwargs={'cluster_id': cluster_id}), - headers=self.default_headers - ) - deploy_uuid = json.loads(resp.body)['uuid'] - resp = self.app.delete( - reverse( - 'ClusterHandler', - kwargs={'cluster_id': cluster_id}), - headers=self.default_headers - ) - timeout = 120 - timer = time.time() - while True: - task_deploy = self.db.query(Task).filter_by( - uuid=deploy_uuid - ).first() - task_delete = self.db.query(Task).filter_by( - cluster_id=cluster_id, - name="cluster_deletion" - ).first() - if not task_delete: - break - self.db.expire(task_deploy) - self.db.expire(task_delete) - if (time.time() - timer) > timeout: - break - time.sleep(0.24) - - cluster_db = self.db.query(Cluster).get(cluster_id) - self.assertIsNone(cluster_db) - - @fake_tasks() - def test_deletion_cluster_ha_3x3(self): - self.env.create( - cluster_kwargs={ - "api": True, - "mode": "ha_compact" - }, - nodes_kwargs=[ - {"roles": ["controller"], "pending_addition": True}, - {"roles": ["compute"], "pending_addition": True} - ] * 3 - ) - cluster_id = self.env.clusters[0].id - cluster_name = self.env.clusters[0].name - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask) - - resp = self.app.delete( - reverse( - 'ClusterHandler', - kwargs={'cluster_id': cluster_id}), - headers=self.default_headers - ) - self.assertEquals(202, resp.status) - - timer = time.time() - timeout = 15 - clstr = self.db.query(Cluster).get(cluster_id) - while clstr: - time.sleep(1) - try: - self.db.refresh(clstr) - except Exception: - break - if time.time() - timer > timeout: - raise Exception("Cluster deletion seems to be hanged") - - notification = self.db.query(Notification)\ - .filter(Notification.topic == "done")\ - .filter(Notification.message == "Environment '%s' and all its " - "nodes are deleted" % cluster_name).first() - self.assertIsNotNone(notification) - - tasks = self.db.query(Task).all() - self.assertEqual(tasks, []) - - @fake_tasks() - def test_node_fqdn_is_assigned(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - {"pending_addition": True} - ] - ) - self.env.launch_deployment() - self.env.refresh_nodes() - for node in self.env.nodes: - fqdn = "node-%s.%s" % (node.id, settings.DNS_DOMAIN) - self.assertEquals(fqdn, node.fqdn) - - @fake_tasks() - def test_no_node_no_cry(self): - cluster = self.env.create_cluster(api=True) - rcvr = rpc.receiver.NailgunReceiver - manager = DeploymentTaskManager(cluster["id"]) - rcvr.deploy_resp(nodes=[ - {'uid': 666, 'id': 666, 'status': 'discover'} - ], uuid='no_freaking_way') # and wrong task also - self.assertRaises(errors.WrongNodeStatus, manager.execute) - - @fake_tasks() - def test_no_changes_no_cry(self): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"status": "ready"} - ] - ) - cluster_db = self.env.clusters[0] - cluster_db.clear_pending_changes() - manager = DeploymentTaskManager(cluster_db.id) - self.assertRaises(errors.WrongNodeStatus, manager.execute) - - @fake_tasks() - def test_deletion_offline_node(self): - cluster = self.env.create_cluster() - self.env.create_node( - cluster_id=cluster['id'], - online=False, - pending_deletion=True) - - self.env.create_node( - cluster_id=cluster['id'], - status='ready') - - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, timeout=5) - self.assertEquals(self.env.db.query(Node).count(), 1) - - @fake_tasks() - def test_deletion_three_offline_nodes_and_one_online(self): - cluster = self.env.create_cluster() - for _ in range(3): - self.env.create_node( - cluster_id=cluster['id'], - online=False, - pending_deletion=True) - - self.env.create_node( - cluster_id=cluster['id'], - online=True, - pending_deletion=True) - - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, timeout=5) - - self.assertEquals(self.env.db.query(Node).count(), 1) - node = self.db.query(Node).first() - self.assertEquals(node.status, 'discover') - self.assertEquals(node.cluster_id, None) - - @fake_tasks() - def test_deletion_offline_node_when_cluster_has_only_one_node(self): - cluster = self.env.create_cluster() - self.env.clusters[0].clear_pending_changes() - self.env.create_node( - cluster_id=cluster['id'], - online=False, - pending_deletion=True, - pending_addition=False, - status='ready') - - supertask = self.env.launch_deployment() - self.env.wait_ready(supertask, timeout=5) - self.assertEquals(self.env.db.query(Node).count(), 0) diff --git a/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py b/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py deleted file mode 100644 index bece5bf85..000000000 --- a/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py +++ /dev/null @@ -1,104 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -from mock import patch - -from nailgun.settings import settings - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -@patch('nailgun.rpc.receiver.NailgunReceiver._get_master_macs') -class TestVerifyNetworkTaskManagers(BaseIntegrationTest): - - def setUp(self): - self.master_macs = [{'addr': 'bc:ae:c5:e0:f5:85'}, - {'addr': 'ee:ae:c5:e0:f5:17'}] - self.not_master_macs = [{'addr': 'ee:ae:ee:e0:f5:85'}] - - super(TestVerifyNetworkTaskManagers, self).setUp() - - meta1 = self.env.generate_interfaces_in_meta(1) - mac1 = meta1['interfaces'][0]['mac'] - meta2 = self.env.generate_interfaces_in_meta(1) - mac2 = meta2['interfaces'][0]['mac'] - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"api": True, "meta": meta1, "mac": mac1}, - {"api": True, "meta": meta2, "mac": mac2}, - ] - ) - - def tearDown(self): - self._wait_for_threads() - super(TestVerifyNetworkTaskManagers, self).tearDown() - - @fake_tasks() - def test_network_verify_task_managers_dhcp_on_master(self, macs_mock): - macs_mock.return_value = self.master_macs - - task = self.env.launch_verify_networks() - self.env.wait_ready(task, 30) - - @fake_tasks() - def test_network_verify_compares_received_with_cached(self, macs_mock): - macs_mock.return_value = self.master_macs - - resp = self.app.get( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': self.env.clusters[0].id} - ), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - nets = json.loads(resp.body) - - nets['networks'][-1]["vlan_start"] = 500 - task = self.env.launch_verify_networks(nets) - self.env.wait_ready(task, 30) - - @fake_tasks(fake_rpc=False) - def test_network_verify_fails_if_admin_intersection(self, - mocked_rpc, macs_mock): - macs_mock.return_value = self.master_macs - - resp = self.app.get( - reverse( - 'NetworkConfigurationHandler', - kwargs={'cluster_id': self.env.clusters[0].id} - ), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - nets = json.loads(resp.body) - - nets['networks'][-1]['cidr'] = settings.ADMIN_NETWORK['cidr'] - - task = self.env.launch_verify_networks(nets) - self.env.wait_error(task, 30) - self.assertIn( - task.message, - "Intersection with admin " - "network(s) '{0}' found".format( - settings.ADMIN_NETWORK['cidr'] - ) - ) - self.assertEquals(mocked_rpc.called, False) diff --git a/nailgun/nailgun/test/unit/__init__.py b/nailgun/nailgun/test/unit/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/test/unit/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/test/unit/test_attributes_validator.py b/nailgun/nailgun/test/unit/test_attributes_validator.py deleted file mode 100644 index f1a1ea8fe..000000000 --- a/nailgun/nailgun/test/unit/test_attributes_validator.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.validators.cluster import AttributesValidator -from nailgun.errors import errors -from nailgun.test.base import BaseTestCase - - -class TestAttributesValidator(BaseTestCase): - def test_generated_attributes_validation(self): - self.assertRaises(errors.InvalidData, - AttributesValidator.validate, - '{"generated": {"name": "test"}}') - - def test_editable_attributes_validation(self): - self.assertRaises(errors.InvalidData, - AttributesValidator.validate, - '{"editable": "name"}') - - def test_valid_attributes(self): - valid_attibutes = [ - '{"editable": {"name":"test"}}', - '{"name":"test"}' - ] - - for attributes in valid_attibutes: - self.assertNotRaises(errors.InvalidData, - AttributesValidator.validate, - attributes) diff --git a/nailgun/nailgun/test/unit/test_checknetworkstask.py b/nailgun/nailgun/test/unit/test_checknetworkstask.py deleted file mode 100644 index 0e8c8c441..000000000 --- a/nailgun/nailgun/test/unit/test_checknetworkstask.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from netaddr import IPNetwork -from netaddr import IPRange - -from nailgun.network.manager import NetworkManager -from nailgun.test.base import BaseIntegrationTest - - -class TestHandlers(BaseIntegrationTest): - def test_ip_range_intersection(self): - nm = NetworkManager() - self.assertEqual(nm.is_range_in_cidr( - IPRange('192.168.0.0', '192.168.255.255'), - IPNetwork('192.168.1.0/24') - ), True) - self.assertEqual(nm.is_range_in_cidr( - IPRange('164.174.47.1', '191.0.0.0'), - IPNetwork('192.168.1.0/24') - ), False) - self.assertEqual(nm.is_range_in_cidr( - IPRange('192.168.0.0', '192.168.255.255'), - IPRange('164.174.47.1', '191.0.0.0') - ), False) - self.assertEqual(nm.is_range_in_cidr( - IPNetwork('192.168.1.0/8'), - IPNetwork('192.168.1.0/24') - ), True) diff --git a/nailgun/nailgun/test/unit/test_cluster_validator.py b/nailgun/nailgun/test/unit/test_cluster_validator.py deleted file mode 100644 index 7ea3501b8..000000000 --- a/nailgun/nailgun/test/unit/test_cluster_validator.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from mock import Mock -from mock import patch - -from nailgun.api.validators.cluster import ClusterValidator -from nailgun.errors import errors -from nailgun.test.base import BaseTestCase - - -class TestClusterValidator(BaseTestCase): - def setUp(self): - self.cluster_data = '{"name": "test"}' - self.release_data = '{"release": 1}' - - def test_cluster_exists_validation(self): - with patch('nailgun.api.validators.cluster.db', Mock()) as db: - db.return_value.query.return_value.filter_by.\ - return_value.first.return_value = 'cluster' - self.assertRaises(errors.AlreadyExists, - ClusterValidator.validate, self.cluster_data) - - def test_cluster_non_exists_validation(self): - with patch('nailgun.api.validators.cluster.db', Mock()) as db: - try: - db.return_value.query.return_value.filter_by.\ - return_value.first.return_value = None - ClusterValidator.validate(self.cluster_data) - except errors.AlreadyExists as e: - self.fail('Cluster exists validation failed: {0}'.format(e)) - - def test_release_exists_validation(self): - with patch('nailgun.api.validators.cluster.db', Mock()) as db: - db.return_value.query.return_value.get.\ - return_value = None - self.assertRaises(errors.InvalidData, - ClusterValidator.validate, self.release_data) - - def test_release_non_exists_validation(self): - with patch('nailgun.api.validators.cluster.db', Mock()) as db: - try: - db.return_value.query.return_value.get.\ - return_value = 'release' - ClusterValidator.validate(self.release_data) - except errors.InvalidData as e: - self.fail('Release exists validation failed: {0}'.format(e)) diff --git a/nailgun/nailgun/test/unit/test_fuel_key_handler.py b/nailgun/nailgun/test/unit/test_fuel_key_handler.py deleted file mode 100644 index 9d349f158..000000000 --- a/nailgun/nailgun/test/unit/test_fuel_key_handler.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import base64 -import json -from mock import patch - -from nailgun.test.base import BaseTestCase -from nailgun.test.base import reverse - - -class TestFuelKeyHandler(BaseTestCase): - - @patch('nailgun.api.handlers.version.settings.PRODUCT_VERSION', '0.1b') - @patch('nailgun.api.handlers.version.settings.COMMIT_SHA', '12345') - @patch('nailgun.api.handlers.version.settings.FUEL_KEY', 'uuid') - def test_version_handler(self): - resp = self.app.get( - reverse('FuelKeyHandler'), - headers=self.default_headers - ) - key_data = {"release": "0.1b", "sha": "12345", "uuid": "uuid"} - signature = base64.b64encode(json.dumps(key_data)) - key_data["signature"] = signature - - self.assertEqual(200, resp.status) - self.assertEqual( - json.loads(resp.body), - {"key": base64.b64encode(json.dumps(key_data))} - ) diff --git a/nailgun/nailgun/test/unit/test_handlers.py b/nailgun/nailgun/test/unit/test_handlers.py deleted file mode 100644 index 9a9cc1b47..000000000 --- a/nailgun/nailgun/test/unit/test_handlers.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - def test_all_api_urls_404_or_405(self): - urls = { - 'ClusterHandler': {'cluster_id': 1}, - 'NodeHandler': {'node_id': 1}, - 'ReleaseHandler': {'release_id': 1}, - } - for handler in urls: - test_url = reverse(handler, urls[handler]) - resp = self.app.get(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) - resp = self.app.delete(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) - resp = self.app.put(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) - resp = self.app.post(test_url, expect_errors=True) - self.assertTrue(resp.status in [404, 405]) diff --git a/nailgun/nailgun/test/unit/test_logs_handlers.py b/nailgun/nailgun/test/unit/test_logs_handlers.py deleted file mode 100644 index f0ab3a3ec..000000000 --- a/nailgun/nailgun/test/unit/test_logs_handlers.py +++ /dev/null @@ -1,452 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import gzip -import json -import os -import shutil -from StringIO import StringIO -import tarfile -import tempfile -import time -import unittest - -from mock import Mock -from mock import patch - -import nailgun -from nailgun.api.handlers.logs import read_backwards -from nailgun.api.models import RedHatAccount -from nailgun.errors import errors -from nailgun.settings import settings -from nailgun.task.manager import DumpTaskManager -from nailgun.task.task import DumpTask -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestLogs(BaseIntegrationTest): - - def setUp(self): - super(TestLogs, self).setUp() - self.log_dir = tempfile.mkdtemp() - self.local_log_file = os.path.join(self.log_dir, 'nailgun.log') - regexp = (r'^(?P\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}):' - '(?P\w+):(?P.+)$') - settings.update({ - 'LOGS': [ - { - 'id': 'nailgun', - 'name': 'Nailgun', - 'remote': False, - 'regexp': regexp, - 'date_format': settings.UI_LOG_DATE_FORMAT, - 'levels': [], - 'path': self.local_log_file - }, { - 'id': 'syslog', - 'name': 'Syslog', - 'remote': True, - 'regexp': regexp, - 'date_format': settings.UI_LOG_DATE_FORMAT, - 'base': self.log_dir, - 'levels': [], - 'path': 'test-syslog.log' - } - ] - }) - - def tearDown(self): - shutil.rmtree(self.log_dir) - super(TestLogs, self).tearDown() - - def test_log_source_collection_handler(self): - resp = self.app.get( - reverse('LogSourceCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(response, settings.LOGS) - - def test_log_source_by_node_collection_handler(self): - node_ip = '40.30.20.10' - node = self.env.create_node(api=False, ip=node_ip) - - resp = self.app.get( - reverse('LogSourceByNodeCollectionHandler', - kwargs={'node_id': node.id}), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(response, []) - - log_entry = ['date111', 'level222', 'text333'] - self._create_logfile_for_node(settings.LOGS[1], [log_entry], node) - resp = self.app.get( - reverse('LogSourceByNodeCollectionHandler', - kwargs={'node_id': node.id}), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(response, [settings.LOGS[1]]) - - def test_log_entry_collection_handler(self): - node_ip = '10.20.30.40' - log_entries = [ - [ - time.strftime(settings.UI_LOG_DATE_FORMAT), - 'LEVEL111', - 'text1', - ], - [ - time.strftime(settings.UI_LOG_DATE_FORMAT), - 'LEVEL222', - 'text2', - ], - ] - cluster = self.env.create_cluster(api=False) - node = self.env.create_node(cluster_id=cluster.id, ip=node_ip) - self._create_logfile_for_node(settings.LOGS[0], log_entries) - self._create_logfile_for_node(settings.LOGS[1], log_entries, node) - - resp = self.app.get( - reverse('LogEntryCollectionHandler'), - params={'source': settings.LOGS[0]['id']}, - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - response['entries'].reverse() - self.assertEquals(response['entries'], log_entries) - - resp = self.app.get( - reverse('LogEntryCollectionHandler'), - params={'node': node.id, 'source': settings.LOGS[1]['id']}, - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - response['entries'].reverse() - self.assertEquals(response['entries'], log_entries) - - def test_multiline_log_entry(self): - settings.LOGS[0]['multiline'] = True - log_entries = [ - [ - time.strftime(settings.UI_LOG_DATE_FORMAT), - 'LEVEL111', - 'text1', - ], - [ - time.strftime(settings.UI_LOG_DATE_FORMAT), - 'LEVEL222', - 'text\nmulti\nline', - ], - [ - time.strftime(settings.UI_LOG_DATE_FORMAT), - 'LEVEL333', - 'text3', - ], - ] - self.env.create_cluster(api=False) - self._create_logfile_for_node(settings.LOGS[0], log_entries) - - resp = self.app.get( - reverse('LogEntryCollectionHandler'), - params={'source': settings.LOGS[0]['id']}, - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - response['entries'].reverse() - self.assertEquals(response['entries'], log_entries) - settings.LOGS[0]['multiline'] = False - - def test_backward_reader(self): - f = tempfile.TemporaryFile(mode='r+') - forward_lines = [] - backward_lines = [] - - # test empty files - forward_lines = list(f) - backward_lines = list(read_backwards(f)) - backward_lines.reverse() - self.assertEquals(forward_lines, backward_lines) - - # filling file with content - contents = [ - 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do', - 'eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut', - 'enim ad minim veniam, quis nostrud exercitation ullamco laboris', - 'nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor', - 'in reprehenderit in voluptate velit esse cillum dolore eu fugiat', - 'nulla pariatur. Excepteur sint occaecat cupidatat non proident,', - 'sunt in culpa qui officia deserunt mollit anim id est laborum.', - ] - for i in range(5): - for line in contents: - f.write('%s\n' % line) - - # test with different buffer sizes - for bufsize in (1, 5000): - f.seek(0) - - # test full file reading - forward_lines = list(f) - backward_lines = list(read_backwards(f, bufsize)) - backward_lines.reverse() - self.assertEquals(forward_lines, backward_lines) - - # test partial file reading from middle to beginning - forward_lines = [] - for i in range(2 * len(contents)): - forward_lines.append(f.readline()) - backward_lines = list(read_backwards(f, bufsize)) - backward_lines.reverse() - self.assertEquals(forward_lines, backward_lines) - - f.close() - - def _create_logfile_for_node(self, log_config, log_entries, node=None): - if log_config['remote']: - log_dir = os.path.join(self.log_dir, node.ip) - not os.path.isdir(log_dir) and os.makedirs(log_dir) - log_file = os.path.join(log_dir, log_config['path']) - else: - log_file = log_config['path'] - with open(log_file, 'w') as f: - for log_entry in log_entries: - f.write(':'.join(log_entry) + '\n') - f.flush() - - @patch.dict('nailgun.task.task.settings.DUMP', - { - 'dump_roles': { - 'master': [], - 'slave': [] - }, - 'dump_objects': { - 'master': [ - { - 'type': 'subs', - 'path': '/var/log/remote', - 'subs': {} - } - ], - 'slave': [] - } - }) - def test_snapshot_conf(self): - self.env.create_node( - status='ready', - name='node1', - fqdn='node1.domain.tld' - ) - self.env.create_rh_account( - username='RHUSER', - password='RHPASS' - ) - conf = { - 'dump_roles': { - 'master': [], - 'slave': ['node1.domain.tld'] - }, - 'dump_objects': { - 'master': [ - { - 'type': 'subs', - 'path': '/var/log/remote', - 'subs': { - 'RHUSER': 'substituted_username', - 'RHPASS': 'substituted_password' - } - } - ], - 'slave': [] - } - } - self.datadiff(DumpTask.conf(), conf) - - @patch.dict('nailgun.task.task.settings.DUMP', {'lastdump': 'LASTDUMP'}) - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_snapshot_cast(self, mocked_rpc): - task = self.env.create_task(name='dump') - DumpTask.execute(task) - message = { - 'method': 'dump_environment', - 'respond_to': 'dump_environment_resp', - 'args': { - 'task_uuid': task.uuid, - 'lastdump': 'LASTDUMP' - } - } - args, kwargs = nailgun.task.task.rpc.cast.call_args - self.assertEquals(len(args), 2) - self.datadiff(args[1], message) - - def test_snapshot_task_manager(self): - tm = DumpTaskManager() - mock = Mock(return_value=None) - tm._call_silently = mock - task = tm.execute() - mock.assert_called_once_with(task, DumpTask) - - def test_snapshot_task_manager_already_running(self): - self.env.create_task(name="dump") - tm = DumpTaskManager() - self.assertRaises(errors.DumpRunning, tm.execute) - - def test_log_package_handler_ok(self): - task = json.dumps({ - "status": "running", - "name": "dump", - "progress": 0, - "message": None, - "id": 1, - "uuid": "00000000-0000-0000-0000-000000000000" - }) - tm_patcher = patch('nailgun.api.handlers.logs.DumpTaskManager') - th_patcher = patch('nailgun.api.handlers.logs.TaskHandler') - tm_mocked = tm_patcher.start() - th_mocked = th_patcher.start() - tm_instance = tm_mocked.return_value - tm_instance.execute.return_value = task - th_mocked.render.side_effect = lambda x: x - resp = self.app.put( - reverse('LogPackageHandler'), "[]", headers=self.default_headers - ) - tm_patcher.stop() - th_patcher.stop() - self.assertEquals(task, resp.body) - self.assertEquals(resp.status, 200) - - def test_log_package_handler_failed(self): - tm_patcher = patch('nailgun.api.handlers.logs.DumpTaskManager') - tm_mocked = tm_patcher.start() - tm_instance = tm_mocked.return_value - - def raiser(): - raise Exception() - - tm_instance.execute.side_effect = raiser - resp = self.app.put( - reverse('LogPackageHandler'), "[]", - headers=self.default_headers, - expect_errors=True - ) - tm_patcher.stop() - self.assertEquals(resp.status, 400) - - @unittest.skip("will be partly moved to shotgun") - def test_log_package_handler_old(self): - f = tempfile.NamedTemporaryFile(mode='r+b') - f.write('testcontent') - f.flush() - settings.LOGS_TO_PACK_FOR_SUPPORT = {'test': f.name} - resp = self.app.get(reverse('LogPackageHandler')) - self.assertEquals(200, resp.status) - tf = tarfile.open(fileobj=StringIO(resp.body), mode='r:gz') - m = tf.extractfile('test') - self.assertEquals(m.read(), 'testcontent') - f.close() - m.close() - - @unittest.skip("will be partly moved to shotgun") - def test_log_package_handler_sensitive(self): - account = RedHatAccount() - account.username = "REDHATUSERNAME" - account.password = "REDHATPASSWORD" - account.license_type = "rhsm" - self.db.add(account) - self.db.commit() - - f = tempfile.NamedTemporaryFile(mode='r+b') - f.write('begin\nREDHATUSERNAME\nREDHATPASSWORD\nend') - f.flush() - settings.LOGS_TO_PACK_FOR_SUPPORT = {'test': f.name} - resp = self.app.get(reverse('LogPackageHandler')) - self.assertEquals(200, resp.status) - tf = tarfile.open(fileobj=StringIO(resp.body), mode='r:gz') - m = tf.extractfile('test') - self.assertEquals(m.read(), 'begin\nusername\npassword\nend') - f.close() - m.close() - - @unittest.skip("will be partly moved to shotgun") - def test_log_package_handler_sensitive_gz(self): - account = RedHatAccount() - account.username = "REDHATUSERNAME" - account.password = "REDHATPASSWORD" - account.license_type = "rhsm" - self.db.add(account) - self.db.commit() - - f = tempfile.NamedTemporaryFile(mode='r+b', suffix='.gz') - fgz = gzip.GzipFile(mode='w+b', fileobj=f) - fgz.write('begin\nREDHATUSERNAME\nREDHATPASSWORD\nend') - fgz.flush() - fgz.close() - - settings.LOGS_TO_PACK_FOR_SUPPORT = {'test.gz': f.name} - resp = self.app.get(reverse('LogPackageHandler')) - self.assertEquals(200, resp.status) - tf = tarfile.open(fileobj=StringIO(resp.body), mode='r:gz') - - m = tf.extractfile('test.gz') - mgz = gzip.GzipFile(mode='r+b', fileobj=m) - self.assertEquals(mgz.read(), 'begin\nusername\npassword\nend') - mgz.close() - - f.close() - m.close() - - def test_log_entry_collection_handler_sensitive(self): - account = RedHatAccount() - account.username = "REDHATUSERNAME" - account.password = "REDHATPASSWORD" - account.license_type = "rhsm" - self.db.add(account) - self.db.commit() - - log_entries = [ - [ - time.strftime(settings.UI_LOG_DATE_FORMAT), - 'LEVEL111', - 'begin REDHATUSERNAME REDHATPASSWORD end', - ], - ] - response_log_entries = [ - [ - time.strftime(settings.UI_LOG_DATE_FORMAT), - 'LEVEL111', - 'begin username password end', - ], - ] - self._create_logfile_for_node(settings.LOGS[0], log_entries) - resp = self.app.get( - reverse('LogEntryCollectionHandler'), - params={'source': settings.LOGS[0]['id']}, - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - response['entries'].reverse() - self.assertEquals(response['entries'], response_log_entries) diff --git a/nailgun/nailgun/test/unit/test_node_deletion.py b/nailgun/nailgun/test/unit/test_node_deletion.py deleted file mode 100644 index b8c35a603..000000000 --- a/nailgun/nailgun/test/unit/test_node_deletion.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import logging - -from mock import patch - -from nailgun.api.models import IPAddr -from nailgun.api.models import Network -from nailgun.api.models import NetworkGroup -from nailgun.api.models import Node -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - -logger = logging.getLogger(__name__) - - -class TestNodeDeletion(BaseIntegrationTest): - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_node_deletion_and_attributes_clearing(self, mocked_rpc): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[ - {"pending_addition": True}, - ] - ) - - self.env.launch_deployment() - - cluster = self.env.clusters[0] - node = self.env.nodes[0] - - resp = self.app.delete( - reverse( - 'NodeHandler', - kwargs={'node_id': node.id}), - headers=self.default_headers - ) - self.assertEquals(204, resp.status) - - node_try = self.db.query(Node).filter_by( - cluster_id=cluster.id - ).first() - self.assertEquals(node_try, None) - - management_net = self.db.query(Network).join(NetworkGroup).\ - filter(NetworkGroup.cluster_id == cluster.id).filter_by( - name='management').first() - - ipaddrs = self.db.query(IPAddr).\ - filter_by(node=node.id).all() - - self.assertEquals(list(management_net.nodes), []) - self.assertEquals(list(ipaddrs), []) diff --git a/nailgun/nailgun/test/unit/test_node_disks.py b/nailgun/nailgun/test/unit/test_node_disks.py deleted file mode 100644 index ac95a1e27..000000000 --- a/nailgun/nailgun/test/unit/test_node_disks.py +++ /dev/null @@ -1,535 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from copy import deepcopy -import json - -from nailgun.errors import errors -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse -from nailgun.volumes.manager import Disk -from nailgun.volumes.manager import DisksFormatConvertor -from nailgun.volumes.manager import only_disks -from nailgun.volumes.manager import only_vg - - -class TestNodeDisksHandlers(BaseIntegrationTest): - - def create_node(self, role='controller'): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[{ - 'role': role, - 'pending_addition': True, - 'api': True}]) - - return self.env.nodes[0] - - def get(self, node_id): - resp = self.app.get( - reverse('NodeDisksHandler', kwargs={'node_id': node_id}), - headers=self.default_headers) - - self.assertEquals(200, resp.status) - return json.loads(resp.body) - - def put(self, node_id, data, expect_errors=False): - resp = self.app.put( - reverse('NodeDisksHandler', kwargs={'node_id': node_id}), - json.dumps(data), - headers=self.default_headers, - expect_errors=expect_errors) - - if not expect_errors: - self.assertEquals(200, resp.status) - return json.loads(resp.body) - else: - return resp - - def test_default_attrs_after_creation(self): - self.env.create_node(api=True) - node_db = self.env.nodes[0] - disks = self.get(node_db.id) - - self.assertGreater(len(disks), 0) - for disk in disks: - self.assertTrue(type(disk['size']) == int) - self.assertGreaterEqual(disk['size'], 0) - self.assertEqual(len(disk['volumes']), 0) - - def test_disks_recreation_after_node_agent_request(self): - self.env.create_node(api=True) - node_db = self.env.nodes[0] - response = self.put(node_db.id, []) - self.assertEquals(response, []) - - response = self.get(node_db.id) - self.assertEquals(response, []) - - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{"mac": node_db.mac, "is_agent": True}]), - headers=self.default_headers) - self.assertEquals(200, resp.status) - - response = self.get(node_db.id) - self.assertNotEquals(response, []) - - def test_disks_volumes_size_update(self): - node_db = self.create_node() - disks = self.get(node_db.id) - for disk in disks: - if disk['size'] > 0: - for volume in disk['volumes']: - volume['size'] = 4200 - expect_disks = deepcopy(disks) - - response = self.put(node_db.id, disks) - self.assertEquals(response, expect_disks) - - response = self.get(node_db.id) - self.assertEquals(response, expect_disks) - - def test_recalculates_vg_sizes_when_disks_volumes_size_update(self): - node_db = self.create_node() - disks = self.get(node_db.id) - - vgs_before_update = filter( - lambda volume: volume.get('type') == 'vg', - node_db.attributes.volumes) - - new_volume_size = 4200 - updated_disks_count = 0 - for disk in disks: - if disk['size'] > 0: - for volume in disk['volumes']: - volume['size'] = new_volume_size - updated_disks_count += 1 - - self.put(node_db.id, disks) - - vgs_after_update = filter( - lambda volume: volume.get('type') == 'vg', - node_db.attributes.volumes) - - for vg_before, vg_after in zip(vgs_before_update, vgs_after_update): - size_volumes_before = sum([ - volume.get('size', 0) for volume in vg_before['volumes']]) - size_volumes_after = sum([ - volume.get('size', 0) for volume in vg_after['volumes']]) - - self.assertNotEquals(size_volumes_before, size_volumes_after) - - volume_group_size = new_volume_size * updated_disks_count - self.assertEquals(size_volumes_after, volume_group_size) - - def test_update_ceph_partition(self): - node = self.create_node(role='ceph-osd') - disks = self.get(node.id) - - new_volume_size = 4321 - for disk in disks: - if disk['size'] > 0: - for volume in disk['volumes']: - volume['size'] = new_volume_size - - self.put(node.id, disks) - partitions_after_update = filter( - lambda volume: volume.get('type') == 'partition', - node.attributes.volumes) - - for partition_after in partitions_after_update: - self.assertEquals(partition_after['size'], new_volume_size) - - def test_validator_not_enough_size_for_volumes(self): - node = self.create_node() - disks = self.get(node.id) - - for disk in disks: - if disk['size'] > 0: - for volume in disk['volumes']: - volume['size'] = disk['size'] + 1 - - response = self.put(node.id, disks, True) - self.assertEquals(response.status, 400) - self.assertRegexpMatches( - response.body, '^Not enough free space on disk: .+') - - def test_validator_invalid_data(self): - node = self.create_node() - disks = self.get(node.id) - - for disk in disks: - for volume in disk['volumes']: - del volume['size'] - - response = self.put(node.id, disks, True) - self.assertEquals(response.status, 400) - self.assertRegexpMatches( - response.body, "'size' is a required property") - - -class TestNodeDefaultsDisksHandler(BaseIntegrationTest): - - def get(self, node_id): - resp = self.app.get( - reverse('NodeDefaultsDisksHandler', kwargs={'node_id': node_id}), - headers=self.default_headers) - - self.assertEquals(200, resp.status) - return json.loads(resp.body) - - def test_node_disk_amount_regenerates_volumes_info_if_new_disk_added(self): - cluster = self.env.create_cluster(api=False) - self.env.create_node( - api=True, - role='compute', # vgs: os, vm - cluster_id=cluster.id) - node_db = self.env.nodes[0] - response = self.get(node_db.id) - self.assertEquals(len(response), 6) - - new_meta = node_db.meta.copy() - new_meta['disks'].append({ - 'size': 1000022933376, - 'model': 'SAMSUNG B00B135', - 'name': 'sda', - 'disk': 'disk/id/b00b135'}) - - self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{ - "mac": node_db.mac, - "meta": new_meta, - "is_agent": True}]), - headers=self.default_headers) - - self.env.refresh_nodes() - - response = self.get(node_db.id) - self.assertEquals(len(response), 7) - - # check all groups on all disks - vgs = ['os', 'vm'] - for disk in response: - self.assertEquals(len(disk['volumes']), len(vgs)) - - def test_get_default_attrs(self): - self.env.create_node(api=True) - node_db = self.env.nodes[0] - volumes_from_api = self.get(node_db.id) - - default_volumes = node_db.volume_manager.gen_volumes_info() - disks = only_disks(default_volumes) - - self.assertEquals(len(disks), len(volumes_from_api)) - - -class TestNodeVolumesInformationHandler(BaseIntegrationTest): - - def get(self, node_id): - resp = self.app.get( - reverse('NodeVolumesInformationHandler', - kwargs={'node_id': node_id}), - headers=self.default_headers) - - self.assertEquals(200, resp.status) - return json.loads(resp.body) - - def create_node(self, role): - self.env.create( - nodes_kwargs=[{'roles': [role], 'pending_addition': True}]) - - return self.env.nodes[0] - - def check_volumes(self, volumes, volumes_ids): - self.assertEquals(len(volumes), len(volumes_ids)) - for volume_id in volumes_ids: - # Volume has name - volume = filter( - lambda volume: volume['name'] == volume_id, volumes)[0] - # min_size - self.assertTrue(type(volume['min_size']) == int) - self.assertGreaterEqual(volume['min_size'], 0) - # and label - self.assertTrue(type(volume['label']) in (str, unicode)) - self.assertGreater(volume['label'], 0) - - def test_volumes_information_for_cinder_role(self): - node_db = self.create_node('cinder') - response = self.get(node_db.id) - self.check_volumes(response, ['os', 'cinder']) - - def test_volumes_information_for_compute_role(self): - node_db = self.create_node('compute') - response = self.get(node_db.id) - self.check_volumes(response, ['os', 'vm']) - - def test_volumes_information_for_controller_role(self): - node_db = self.create_node('controller') - response = self.get(node_db.id) - self.check_volumes(response, ['os', 'image']) - - def test_volumes_information_for_ceph_role(self): - node_db = self.create_node('ceph-osd') - response = self.get(node_db.id) - self.check_volumes(response, ['os', 'ceph', 'cephjournal']) - - -class TestVolumeManager(BaseIntegrationTest): - - def create_node(self, role): - self.env.create( - cluster_kwargs={}, - nodes_kwargs=[{ - 'roles': [role], - 'pending_addition': True, - 'api': True}]) - - return self.env.nodes[-1] - - def non_zero_size(self, size): - self.assertTrue(type(size) == int) - self.assertGreater(size, 0) - - def os_size(self, disks, with_lvm_meta=True): - os_sum_size = 0 - for disk in only_disks(disks): - os_volume = filter( - lambda volume: volume.get('vg') == 'os', disk['volumes'])[0] - - os_sum_size += os_volume['size'] - if not with_lvm_meta: - os_sum_size -= os_volume['lvm_meta_size'] - - self.non_zero_size(os_sum_size) - return os_sum_size - - def glance_size(self, disks): - glance_sum_size = 0 - for disk in only_disks(disks): - glance_volume = filter( - lambda volume: volume.get('vg') == 'image', disk['volumes'] - )[0] - glance_sum_size += glance_volume['size'] - - self.non_zero_size(glance_sum_size) - return glance_sum_size - - def reserved_size(self, spaces): - reserved_size = 0 - for disk in only_disks(spaces): - reserved_size += DisksFormatConvertor.\ - calculate_service_partitions_size(disk['volumes']) - - return reserved_size - - def should_contain_os_with_minimal_size(self, volume_manager): - self.assertEquals( - self.os_size(volume_manager.volumes, with_lvm_meta=False), - volume_manager.call_generator('calc_min_os_size')) - - def all_free_space_except_os_for_volume(self, spaces, volume_name): - os_size = self.os_size(spaces) - reserved_size = self.reserved_size(spaces) - disk_sum_size = sum([disk['size'] for disk in only_disks(spaces)]) - vg_size = 0 - sum_lvm_meta = 0 - for disk in only_disks(spaces): - for volume in disk['volumes']: - if volume.get('vg') == volume_name or \ - volume.get('name') == volume_name: - vg_size += volume['size'] - vg_size -= volume.get('lvm_meta_size', 0) - sum_lvm_meta += volume.get('lvm_meta_size', 0) - - self.assertEquals( - vg_size, disk_sum_size - os_size - reserved_size - sum_lvm_meta) - - def logical_volume_sizes_should_equal_all_phisical_volumes(self, spaces): - vg_sizes = {} - for vg in only_vg(spaces): - for volume in vg['volumes']: - vg_name = vg['id'] - if not vg_sizes.get(vg_name): - vg_sizes[vg_name] = 0 - vg_sizes[vg_name] += volume['size'] - - pv_sizes = {} - for disk in only_disks(spaces): - for volume in disk['volumes']: - if volume['type'] == 'pv': - vg_name = volume['vg'] - if not pv_sizes.get(vg_name): - pv_sizes[vg_name] = 0 - - pv_sizes[vg_name] += volume['size'] - pv_sizes[vg_name] -= volume['lvm_meta_size'] - - self.assertEquals(vg_sizes, pv_sizes) - - def check_disk_size_equal_sum_of_all_volumes(self, spaces): - for disk in only_disks(spaces): - volumes_size = sum( - [volume.get('size', 0) for volume in disk['volumes']]) - - self.assertEquals(volumes_size, disk['size']) - - def test_allocates_all_free_space_for_os_for_controller_role(self): - node = self.create_node('controller') - disks = only_disks(node.volume_manager.volumes) - disks_size_sum = sum([disk['size'] for disk in disks]) - os_sum_size = self.os_size(disks) - glance_sum_size = self.glance_size(disks) - reserved_size = self.reserved_size(disks) - - self.assertEquals(disks_size_sum - reserved_size, - os_sum_size + glance_sum_size) - self.logical_volume_sizes_should_equal_all_phisical_volumes( - node.attributes.volumes) - self.check_disk_size_equal_sum_of_all_volumes(node.attributes.volumes) - - def test_allocates_all_free_space_for_vm_for_compute_role(self): - node = self.create_node('compute') - self.should_contain_os_with_minimal_size(node.volume_manager) - self.all_free_space_except_os_for_volume( - node.volume_manager.volumes, 'vm') - self.logical_volume_sizes_should_equal_all_phisical_volumes( - node.attributes.volumes) - self.check_disk_size_equal_sum_of_all_volumes(node.attributes.volumes) - - def test_allocates_all_free_space_for_vm_for_cinder_role(self): - node = self.create_node('cinder') - self.should_contain_os_with_minimal_size(node.volume_manager) - self.all_free_space_except_os_for_volume( - node.volume_manager.volumes, 'cinder') - self.check_disk_size_equal_sum_of_all_volumes(node.attributes.volumes) - - def test_allocates_all_free_space_for_ceph_for_ceph_role(self): - node = self.create_node('ceph-osd') - self.should_contain_os_with_minimal_size(node.volume_manager) - self.all_free_space_except_os_for_volume( - node.volume_manager.volumes, 'ceph') - self.check_disk_size_equal_sum_of_all_volumes(node.attributes.volumes) - - def create_node_and_calculate_min_size( - self, role, vg_names, volumes_metadata): - node = self.create_node(role) - volume_manager = node.volume_manager - volumes = volume_manager.expand_generators( - volumes_metadata['volumes']) - - min_installation_size = sum([ - volume['min_size'] for volume in - filter(lambda volume: volume['id'] in vg_names, volumes)]) - - boot_data_size = volume_manager.call_generator('calc_boot_size') +\ - volume_manager.call_generator('calc_boot_records_size') - - min_installation_size += boot_data_size - - return node, min_installation_size - - def update_node_with_single_disk(self, node, size): - new_meta = node.meta.copy() - new_meta['disks'] = [{ - # convert mbytes to bytes - 'size': size * (1024 ** 2), - 'model': 'SAMSUNG B00B135', - 'name': 'sda', - 'disk': 'disk/id/b00b135'}] - - self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([{ - 'mac': node.mac, - 'meta': new_meta, - 'is_agent': True}]), - headers=self.default_headers) - - def test_check_disk_space_for_deployment(self): - volumes_metadata = self.env.get_default_volumes_metadata() - volumes_roles_mapping = volumes_metadata['volumes_roles_mapping'] - - for role, vg_names in volumes_roles_mapping.iteritems(): - node, min_installation_size = self.\ - create_node_and_calculate_min_size( - role, vg_names, volumes_metadata) - - self.update_node_with_single_disk(node, min_installation_size) - node.volume_manager.check_disk_space_for_deployment() - - self.update_node_with_single_disk(node, min_installation_size - 1) - self.assertRaises( - errors.NotEnoughFreeSpace, - node.volume_manager.check_disk_space_for_deployment) - - -class TestDisks(BaseIntegrationTest): - - def get_boot(self, volumes): - return filter( - lambda volume: volume.get('mount') == '/boot', - volumes)[0] - - def create_disk(self, boot_is_raid=False, possible_pvs_count=0): - return Disk( - [], lambda name: 100, 'sda', 'sda', 10000, - boot_is_raid=boot_is_raid, possible_pvs_count=possible_pvs_count) - - def test_create_mbr_as_raid_if_disks_count_greater_than_zero(self): - disk = self.create_disk(boot_is_raid=True) - boot_partition = self.get_boot(disk.volumes) - self.assertEquals(boot_partition['type'], 'raid') - - def test_create_mbr_as_partition_if_disks_count_less_than_zero(self): - disk = self.create_disk() - boot_partition = self.get_boot(disk.volumes) - self.assertEquals(boot_partition['type'], 'partition') - - def test_remove_pv(self): - disk = self.create_disk(possible_pvs_count=1) - disk_without_pv = deepcopy(disk) - disk.create_pv({'id': 'pv_name'}, 100) - disk.remove_pv('pv_name') - - self.assertEquals(disk_without_pv.render(), disk.render()) - - def test_boot_partition_has_file_system(self): - disk = self.create_disk(possible_pvs_count=1) - boot_record = filter( - lambda volume: volume.get('mount') == '/boot', disk.volumes)[0] - self.assertEquals(boot_record['file_system'], 'ext2') - - -class TestFixtures(BaseIntegrationTest): - - @property - def get_vgs_for_releases(self): - openstack = self.env.read_fixtures( - ('openstack',))[0]['fields']['volumes_metadata']['volumes'] - redhat = self.env.read_fixtures( - ('openstack',))[1]['fields']['volumes_metadata']['volumes'] - - return [only_vg(openstack), only_vg(redhat)] - - def test_each_logical_volume_has_file_system(self): - for release_vgs in self.get_vgs_for_releases: - for vg in release_vgs: - for volume in vg['volumes']: - self.assertIn( - volume['file_system'], - ('ext2', 'ext4', 'swap', 'xfs', None)) diff --git a/nailgun/nailgun/test/unit/test_node_nic_handler.py b/nailgun/nailgun/test/unit/test_node_nic_handler.py deleted file mode 100644 index 31ef6a8e4..000000000 --- a/nailgun/nailgun/test/unit/test_node_nic_handler.py +++ /dev/null @@ -1,267 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def test_get_handler_with_wrong_nodeid(self): - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': 1}), - expect_errors=True, - headers=self.default_headers) - self.assertEquals(resp.status, 404) - - def test_get_handler_with_invalid_data(self): - meta = self.env.default_metadata() - meta["interfaces"] = [] - node = self.env.create_node(api=True, meta=meta) - meta_list = [ - {'interfaces': None}, - {'interfaces': {}} - ] - for nic_meta in meta_list: - meta = self.env.default_metadata() - meta.update(nic_meta) - node_data = {'mac': node['mac'], 'is_agent': True, - 'meta': meta} - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([node_data]), - expect_errors=True, - headers=self.default_headers - ) - self.assertEquals(resp.status, 400) - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - self.assertEquals(response, []) - - def test_get_handler_with_incompleted_iface_data(self): - meta = self.env.default_metadata() - meta["interfaces"] = [] - node = self.env.create_node(api=True, meta=meta) - meta_clean_list = [ - {'interfaces': [{'name': '', 'mac': '00:00:00'}]}, - {'interfaces': [{'name': 'eth0', 'mac': ''}]}, - {'interfaces': [{'mac': '00:00:00'}]}, - {'interfaces': [{'name': 'eth0'}]} - ] - - for nic_meta in meta_clean_list: - meta = self.env.default_metadata() - meta.update(nic_meta) - node_data = {'mac': node['mac'], 'is_agent': True, - 'meta': meta} - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([node_data]), - expect_errors=True, - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - ifaces = json.loads(resp.body)[0]["meta"]["interfaces"] - self.assertEquals(ifaces, []) - - def test_get_handler_with_invalid_speed_data(self): - meta = self.env.default_metadata() - meta["interfaces"] = [] - node = self.env.create_node(api=True, meta=meta) - - meta_clean_list = [ - {'interfaces': [{'name': 'eth0', 'mac': '00:00:00', - 'max_speed': -100}]}, - {'interfaces': [{'name': 'eth0', 'mac': '00:00:00', - 'current_speed': -100}]}, - {'interfaces': [{'name': 'eth0', 'mac': '00:00:00', - 'current_speed': '100'}]}, - {'interfaces': [{'name': 'eth0', 'mac': '00:00:00', - 'max_speed': 10.0}]}, - {'interfaces': [{'name': 'eth0', 'mac': '00:00:00', - 'max_speed': '100'}]}, - {'interfaces': [{'name': 'eth0', 'mac': '00:00:00', - 'current_speed': 10.0}]} - ] - for nic_meta in meta_clean_list: - meta = self.env.default_metadata() - meta.update(nic_meta) - node_data = {'mac': node['mac'], 'is_agent': True, - 'meta': meta} - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([node_data]), - expect_errors=True, - headers=self.default_headers - ) - self.assertEquals(resp.status, 200) - ifaces = json.loads(resp.body)[0]["meta"]["interfaces"] - self.assertEquals( - ifaces, - [ - {'name': 'eth0', 'mac': '00:00:00', - 'max_speed': None, 'current_speed': None} - ] - ) - - def test_get_handler_without_NICs(self): - meta = self.env.default_metadata() - meta["interfaces"] = [] - node = self.env.create_node(api=True, meta=meta) - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - self.assertEquals(response, []) - - def test_get_handler_with_NICs(self): - meta = self.env.default_metadata() - meta.update({'interfaces': [ - {'name': 'eth0', 'mac': '123', 'current_speed': 1, 'max_speed': 1}, - {'name': 'eth1', 'mac': '678', 'current_speed': 1, 'max_speed': 1}, - ]}) - self.env.create_node(api=True, meta=meta) - node_db = self.env.nodes[0] - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node_db.id}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - self.assertItemsEqual( - map(lambda i: i['id'], response), - map(lambda i: i.id, node_db.interfaces) - ) - for nic in meta['interfaces']: - filtered_nics = filter( - lambda i: i['mac'] == nic['mac'], - response - ) - resp_nic = filtered_nics[0] - self.assertEquals(resp_nic['mac'], nic['mac']) - self.assertEquals(resp_nic['current_speed'], nic['current_speed']) - self.assertEquals(resp_nic['max_speed'], nic['max_speed']) - for conn in ('assigned_networks', 'allowed_networks'): - self.assertEquals(resp_nic[conn], []) - - def test_NIC_removes_by_agent(self): - meta = self.env.default_metadata() - meta.update({'interfaces': [ - {'name': 'eth0', 'mac': '12345', 'current_speed': 1}, - ]}) - node = self.env.create_node(api=True, meta=meta) - - node_data = {'mac': node['mac'], 'is_agent': True, - 'meta': {'interfaces': []}} - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([node_data]), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - self.assertEquals(response, []) - - def test_NIC_updates_by_agent(self): - meta = self.env.default_metadata() - meta.update({'interfaces': [ - {'name': 'eth0', 'mac': '12345', 'current_speed': 1}, - ]}) - node = self.env.create_node(api=True, meta=meta) - new_meta = self.env.default_metadata() - new_meta.update({'interfaces': [ - {'name': 'new_nic', 'mac': '12345', 'current_speed': 10, - 'max_speed': 10}, - ]}) - node_data = {'mac': node['mac'], 'is_agent': True, - 'meta': new_meta} - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([node_data]), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - self.assertEquals(len(response), 1) - resp_nic = response[0] - nic = new_meta['interfaces'][0] - self.assertEquals(resp_nic['mac'], nic['mac']) - self.assertEquals(resp_nic['current_speed'], nic['current_speed']) - self.assertEquals(resp_nic['max_speed'], nic['max_speed']) - for conn in ('assigned_networks', 'allowed_networks'): - self.assertEquals(resp_nic[conn], []) - - def test_NIC_adds_by_agent(self): - meta = self.env.default_metadata() - meta.update({'interfaces': [ - {'name': 'eth0', 'mac': '12345', 'current_speed': 1}, - ]}) - node = self.env.create_node(api=True, meta=meta) - - meta['interfaces'].append({'name': 'new_nic', 'mac': '643'}) - node_data = {'mac': node['mac'], 'is_agent': True, - 'meta': meta} - resp = self.app.put( - reverse('NodeCollectionHandler'), - json.dumps([node_data]), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - self.assertEquals(len(response), len(meta['interfaces'])) - for nic in meta['interfaces']: - filtered_nics = filter( - lambda i: i['mac'] == nic['mac'], - response - ) - resp_nic = filtered_nics[0] - self.assertEquals(resp_nic['mac'], nic['mac']) - self.assertEquals(resp_nic['current_speed'], - nic.get('current_speed')) - self.assertEquals(resp_nic['max_speed'], nic.get('max_speed')) - for conn in ('assigned_networks', 'allowed_networks'): - self.assertEquals(resp_nic[conn], []) - - def test_ignore_NIC_id_in_meta(self): - fake_id = 'some_data' - meta = self.env.default_metadata() - meta.update({'interfaces': [ - {'id': fake_id, 'name': 'eth0', 'mac': '12345'}, - ]}) - node = self.env.create_node(api=True, meta=meta) - resp = self.app.get( - reverse('NodeNICsHandler', kwargs={'node_id': node['id']}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - response = json.loads(resp.body) - self.assertNotEquals(response[0]['id'], fake_id) diff --git a/nailgun/nailgun/test/unit/test_notification_collection_handler.py b/nailgun/nailgun/test/unit/test_notification_collection_handler.py deleted file mode 100644 index 2ad2b810d..000000000 --- a/nailgun/nailgun/test/unit/test_notification_collection_handler.py +++ /dev/null @@ -1,109 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Notification -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def test_empty(self): - resp = self.app.get( - reverse('NotificationCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals([], response) - - def test_not_empty(self): - c = self.env.create_cluster(api=False) - n0 = self.env.create_notification() - n1 = self.env.create_notification(cluster_id=c.id) - resp = self.app.get( - reverse('NotificationCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(len(response), 2) - if response[0]['id'] == n0.id: - rn0 = response[0] - rn1 = response[1] - else: - rn0 = response[1] - rn1 = response[0] - self.assertEquals(rn1['cluster'], n1.cluster_id) - self.assertIsNone(rn0.get('cluster', None)) - - def test_get_limit(self): - self.env.create_cluster(api=False) - for i in xrange(3): - self.env.create_notification() - - resp = self.app.get( - reverse('NotificationCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - notifications_count = self.db.query(Notification).count() - self.assertEquals(notifications_count, 3) - - resp = self.app.get( - reverse('NotificationCollectionHandler'), - params={'limit': 2}, - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(len(response), 2) - - def test_update(self): - c = self.env.create_cluster(api=False) - n0 = self.env.create_notification() - n1 = self.env.create_notification(cluster_id=c.id) - notification_update = [ - { - 'id': n0.id, - 'status': 'read' - }, - { - 'id': n1.id, - 'status': 'read' - } - ] - resp = self.app.put( - reverse('NotificationCollectionHandler'), - json.dumps(notification_update), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(len(response), 2) - if response[0]['id'] == n0.id: - rn0 = response[0] - rn1 = response[1] - else: - rn0 = response[1] - rn1 = response[0] - self.assertEquals(rn1['cluster'], n1.cluster_id) - self.assertEquals(rn1['status'], 'read') - self.assertIsNone(rn0.get('cluster', None)) - self.assertEquals(rn0['status'], 'read') diff --git a/nailgun/nailgun/test/unit/test_notification_handler.py b/nailgun/nailgun/test/unit/test_notification_handler.py deleted file mode 100644 index 36e44f28a..000000000 --- a/nailgun/nailgun/test/unit/test_notification_handler.py +++ /dev/null @@ -1,106 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - - def test_notification_get_without_cluster(self): - notification = self.env.create_notification() - resp = self.app.get( - reverse( - 'NotificationHandler', - kwargs={'notification_id': notification.id} - ), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertIsNone(response.get('cluster')) - self.assertEquals(notification.status, 'unread') - self.assertEquals(notification.id, response['id']) - self.assertEquals(notification.status, response['status']) - self.assertEquals(notification.topic, response['topic']) - self.assertEquals(notification.message, response['message']) - - def test_notification_datetime(self): - self.env.create_node( - api=True, - meta=self.env.default_metadata() - ) - resp = self.app.get( - reverse('NotificationCollectionHandler'), - headers=self.default_headers - ) - notif_api = json.loads(resp.body)[0] - self.assertIn('date', notif_api) - self.assertNotEqual(notif_api['date'], '') - self.assertIn('time', notif_api) - self.assertNotEqual(notif_api['time'], '') - - def test_notification_get_with_cluster(self): - cluster = self.env.create_cluster(api=False) - notification = self.env.create_notification(cluster_id=cluster.id) - resp = self.app.get( - reverse( - 'NotificationHandler', - kwargs={'notification_id': notification.id} - ), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals(response.get('cluster'), cluster.id) - self.assertEquals(notification.status, 'unread') - self.assertEquals(notification.id, response['id']) - self.assertEquals(notification.status, response['status']) - self.assertEquals(notification.topic, response['topic']) - self.assertEquals(notification.message, response['message']) - - def test_notification_update(self): - notification = self.env.create_notification() - notification_update = { - 'status': 'read' - } - resp = self.app.put( - reverse( - 'NotificationHandler', - kwargs={'notification_id': notification.id} - ), - json.dumps(notification_update), - headers=self.default_headers - ) - response = json.loads(resp.body) - self.assertEquals(notification.id, response['id']) - self.assertEquals('read', response['status']) - self.assertEquals(notification.topic, response['topic']) - self.assertEquals(notification.message, response['message']) - - def test_notification_not_found(self): - notification = self.env.create_notification() - resp = self.app.get( - reverse( - 'NotificationHandler', - kwargs={'notification_id': notification.id + 1} - ), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(404, resp.status) diff --git a/nailgun/nailgun/test/unit/test_red_hat_account_validator.py b/nailgun/nailgun/test/unit/test_red_hat_account_validator.py deleted file mode 100644 index cb7c8616c..000000000 --- a/nailgun/nailgun/test/unit/test_red_hat_account_validator.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api.validators.redhat import RedHatAccountValidator -from nailgun.errors import errors -from nailgun.test.base import BaseTestCase - - -class TestRedHatAccountValidator(BaseTestCase): - def test_valid_account_data(self): - """Tests for Red Hat account validator""" - accounts_data = [ - '{"release_id": 1, "license_type": "rhsm",' - ' "username": "u", "password": "p"}', - '{"release_id": 1, "license_type": "rhn", ' - '"username": "u", "password": "p", ' - '"satellite": "s", "activation_key": "k"}', - ] - for account_data in accounts_data: - self.assertNotRaises(errors.InvalidData, - RedHatAccountValidator.validate, - account_data) - - def test_invalid_account_data(self): - accounts_data = [ - 'account', - '{"release_id": 1, "license_type": "personal"}', - '{"release_id": 1, "license_type": "rhsm",' - ' "username": "u"}', - '{"release_id": 1, "license_type": "rhsm",' - '"password": "p"}', - '{"release_id": 1, "license_type": "rhn", ' - '"username": "u", "password": "p", ', - '{"release_id": 1, "license_type": "rhn", ' - '"username": "u", "password": "p", ' - '"satellite": "s"}', - '{"release_id": 1, "license_type": "rhn", ' - '"username": "u", "password": "p", ' - '"activation_key": "k"}', - ] - - for account_data in accounts_data: - self.assertRaises(errors.InvalidData, - RedHatAccountValidator.validate, - account_data) diff --git a/nailgun/nailgun/test/unit/test_redhat.py b/nailgun/nailgun/test/unit/test_redhat.py deleted file mode 100644 index 89da0c4b2..000000000 --- a/nailgun/nailgun/test/unit/test_redhat.py +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from mock import Mock -from mock import patch - -import nailgun -from nailgun.api.handlers.redhat import RedHatSetupHandler -from nailgun.api.models import RedHatAccount -from nailgun.api.models import Task -from nailgun.task.manager import RedHatSetupTaskManager -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import fake_tasks -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - def setUp(self): - super(TestHandlers, self).setUp() - self.release = self.env.create_release(api=False) - - @fake_tasks(fake_rpc=False, mock_rpc=False) - @patch('nailgun.rpc.cast') - def test_redhat_setup_task_manager(self, mocked_rpc): - test_release_data = { - 'release_id': self.release.id, - 'redhat': { - 'license_type': 'rhsm', - 'username': 'rheltest', - 'password': 'password' - } - } - rhm = RedHatSetupTaskManager(test_release_data) - rhm.execute() - - args, kwargs = nailgun.task.manager.rpc.cast.call_args - rpc_message = args[1] - - for i, name in enumerate(( - 'check_redhat_credentials', - 'check_redhat_licenses', - 'download_release' - )): - self.assertEquals(rpc_message[i]['method'], name) - self.assertEquals( - rpc_message[i]['args']['release_info'], - test_release_data - ) - - @fake_tasks() - def test_redhat_account_invalid_data_handler(self): - resp = self.app.post( - reverse('RedHatSetupHandler'), - json.dumps({'username': 'rheltest', - 'password': 'password'}), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 400) - - @fake_tasks() - def test_redhat_account_validation_success(self): - with patch('nailgun.api.handlers.redhat.db', Mock()): - manager = 'nailgun.api.handlers.redhat.RedHatSetupTaskManager' - with patch(manager, Mock()) as mng: - task = Task() - task.id = 0 - mng.return_value.execute.return_value = task - resp = self.app.post( - reverse('RedHatSetupHandler'), - json.dumps({'license_type': 'rhsm', - 'username': 'rheltest', - 'password': 'password', - 'release_id': self.release.id}), - headers=self.default_headers) - self.assertEquals(resp.status, 202) - - @fake_tasks() - def test_redhat_account_validation_failure(self): - resp = self.app.post( - reverse('RedHatSetupHandler'), - json.dumps({'license_type': 'rhsm', - 'username': 'some_user', - 'password': 'password', - 'release_id': self.release.id}), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 202) - - supertask = self.db.query(Task).filter_by( - name="redhat_check_credentials" - ).first() - self.env.wait_error(supertask) - - @fake_tasks() - def test_redhat_account_get(self): - resp = self.app.get( - reverse('RedHatAccountHandler'), - expect_errors=True) - self.assertEquals(resp.status, 404) - - resp = self.app.post( - reverse('RedHatAccountHandler'), - json.dumps({'license_type': 'rhsm', - 'username': 'rheltest', - 'password': 'password', - 'release_id': self.release.id}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - - resp = self.app.get( - reverse('RedHatAccountHandler'), - expect_errors=True) - self.assertEquals(resp.status, 200) - - response = json.loads(resp.body) - - self.assertTrue( - all(k in response for k in RedHatSetupHandler.fields)) - - @fake_tasks() - def test_redhat_account_update(self): - for i in xrange(2): - resp = self.app.post( - reverse('RedHatAccountHandler'), - json.dumps({'license_type': 'rhsm', - 'username': 'rheltest', - 'password': 'password', - 'release_id': self.release.id}), - headers=self.default_headers) - self.assertEquals(resp.status, 200) - query = self.env.db.query(RedHatAccount) - self.assertEquals(query.count(), 1) - self.assertEquals(query.filter_by(username='rheltest').count(), 1) diff --git a/nailgun/nailgun/test/unit/test_release_collection_handlers.py b/nailgun/nailgun/test/unit/test_release_collection_handlers.py deleted file mode 100644 index fca22777b..000000000 --- a/nailgun/nailgun/test/unit/test_release_collection_handlers.py +++ /dev/null @@ -1,125 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Release -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - def test_release_list_empty(self): - resp = self.app.get( - reverse('ReleaseCollectionHandler'), - headers=self.default_headers - ) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - self.assertEquals([], response) - - def test_release_creation(self): - resp = self.app.post( - reverse('ReleaseCollectionHandler'), - params=json.dumps({ - 'name': 'Another test release', - 'version': '1.0', - 'operating_system': 'CentOS' - }), - headers=self.default_headers - ) - self.assertEquals(resp.status, 201) - - def test_release_create(self): - release_name = "OpenStack" - release_version = "1.0.0" - release_description = "This is test release" - resp = self.app.post( - reverse('ReleaseCollectionHandler'), - json.dumps({ - 'name': release_name, - 'version': release_version, - 'description': release_description, - 'operating_system': 'CentOS', - 'networks_metadata': [ - {"name": "floating", "access": "public"}, - {"name": "fixed", "access": "private10"}, - {"name": "storage", "access": "private192"} - ] - }), - headers=self.default_headers - ) - self.assertEquals(resp.status, 201) - - resp = self.app.post( - reverse('ReleaseCollectionHandler'), - json.dumps({ - 'name': release_name, - 'version': release_version, - 'description': release_description, - 'operating_system': 'CentOS', - 'networks_metadata': [ - {"name": "fixed", "access": "private10"} - ] - }), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(resp.status, 409) - - release_from_db = self.db.query(Release).filter_by( - name=release_name, - version=release_version, - description=release_description - ).all() - self.assertEquals(len(release_from_db), 1) - - def test_release_create_already_exist(self): - release_name = "OpenStack" - release_version = "1.0.0" - release_description = "This is test release" - resp = self.app.post( - reverse('ReleaseCollectionHandler'), - json.dumps({ - 'name': release_name, - 'version': release_version, - 'description': release_description, - 'operating_system': 'CentOS', - 'networks_metadata': [ - {"name": "floating", "access": "public"}, - {"name": "fixed", "access": "private10"}, - {"name": "storage", "access": "private192"} - ] - }), - headers=self.default_headers - ) - self.assertEquals(resp.status, 201) - - resp = self.app.post( - reverse('ReleaseCollectionHandler'), - json.dumps({ - 'name': release_name, - 'version': release_version, - 'description': release_description, - 'operating_system': 'CentOS', - 'networks_metadata': [ - {"name": "fixed", "access": "private10"} - ] - }), - headers=self.default_headers, - expect_errors=True - ) - self.assertEquals(resp.status, 409) diff --git a/nailgun/nailgun/test/unit/test_release_handler.py b/nailgun/nailgun/test/unit/test_release_handler.py deleted file mode 100644 index b3a0fd6c4..000000000 --- a/nailgun/nailgun/test/unit/test_release_handler.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json - -from nailgun.api.models import Release -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestHandlers(BaseIntegrationTest): - def test_release_put_change_name_and_version(self): - release = self.env.create_release(api=False) - resp = self.app.put( - reverse('ReleaseHandler', kwargs={'release_id': release.id}), - params=json.dumps({ - 'name': 'modified release', - 'version': '5.1' - }), - headers=self.default_headers, - expect_errors=True) - self.assertEquals(200, resp.status) - response = json.loads(resp.body) - release_from_db = self.db.query(Release).one() - self.db.refresh(release_from_db) - self.assertEquals('5.1', release_from_db.version) - self.assertEquals('5.1', response['version']) - self.assertEquals('modified release', response['name']) - - def test_release_put_returns_400_if_no_body(self): - release = self.env.create_release(api=False) - resp = self.app.put( - reverse('ReleaseHandler', kwargs={'release_id': release.id}), - "", - headers=self.default_headers, - expect_errors=True) - self.assertEquals(resp.status, 400) diff --git a/nailgun/nailgun/test/unit/test_version_handler.py b/nailgun/nailgun/test/unit/test_version_handler.py deleted file mode 100644 index 9e0cf8120..000000000 --- a/nailgun/nailgun/test/unit/test_version_handler.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import json -from mock import patch - -from nailgun.test.base import BaseIntegrationTest -from nailgun.test.base import reverse - - -class TestVersionHandler(BaseIntegrationTest): - - @patch('nailgun.api.handlers.version.settings.PRODUCT_VERSION', '0.1b') - @patch('nailgun.api.handlers.version.settings.COMMIT_SHA', '12345') - def test_version_handler(self): - resp = self.app.get( - reverse('VersionHandler'), - headers=self.default_headers - ) - self.assertEqual(200, resp.status) - self.assertEqual( - json.loads(resp.body), - {"release": "0.1b", "sha": "12345", "fuel_sha": "Unknown build"} - ) diff --git a/nailgun/nailgun/unit_test.py b/nailgun/nailgun/unit_test.py deleted file mode 100644 index f916a63ea..000000000 --- a/nailgun/nailgun/unit_test.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import nose -import nose.config -from nose.plugins.manager import PluginManager -from nose.plugins.xunit import Xunit - -import nailgun.test as test - - -class TestRunner(object): - - @classmethod - def run(cls, *args, **kwargs): - nc = nose.config.Config() - nc.verbosity = 3 - nc.plugins = PluginManager(plugins=[Xunit()]) - nose.main(module=test, config=nc, argv=[ - __file__, - "--with-xunit", - "--xunit-file=nosetests.xml" - ]) diff --git a/nailgun/nailgun/urls.py b/nailgun/nailgun/urls.py deleted file mode 100644 index 64aaf881d..000000000 --- a/nailgun/nailgun/urls.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -from nailgun.api import urls as api_urls -from nailgun.webui import urls as webui_urls - -urls = ( - "/api", api_urls.app, - "", webui_urls.app -) diff --git a/nailgun/nailgun/volumes/__init__.py b/nailgun/nailgun/volumes/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/volumes/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/volumes/manager.py b/nailgun/nailgun/volumes/manager.py deleted file mode 100644 index 0416d30ca..000000000 --- a/nailgun/nailgun/volumes/manager.py +++ /dev/null @@ -1,805 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -''' -Classes for working with disks and volumes. -All sizes in megabytes. -''' - -import json - -from copy import deepcopy -from functools import partial -from nailgun.errors import errors -from nailgun.logger import logger - - -def only_disks(spaces): - '''Helper for retrieving only disks from spaces - ''' - return filter(lambda space: space['type'] == 'disk', spaces) - - -def only_vg(spaces): - '''Helper for retrieving only volumes groups from spaces - ''' - return filter(lambda space: space['type'] == 'vg', spaces) - - -def gb_to_mb(gb): - '''Convert gigabytes to megabytes - ''' - return int(gb * 1024) - - -def byte_to_megabyte(byte): - '''Convert bytes to megabytes - ''' - return byte / 1024 ** 2 - - -def get_node_volumes(node): - """Helper for retrieving node volumes in correct order. - If spaces don't defained for role, will be used - partitioning for role `other`. - """ - node_volumes = [] - - role_volumes = node.cluster.release.volumes_metadata[ - 'volumes_roles_mapping'] - roles = node.roles + node.pending_roles - - for role in roles: - if not role_volumes.get(role): - continue - - for volume in role_volumes[role]: - if volume not in node_volumes: - node_volumes.append(volume) - - # Use role other - if not node_volumes: - logger.warn('Cannot find volumes for node: %s assigning default ' - 'volumes' % (node.full_name)) - for volume in role_volumes['other']: - node_volumes.append(volume) - - return node_volumes - - -class DisksFormatConvertor(object): - '''Class converts format from `simple` in which we - communicate with UI to `full` in which we store - data about disks\volumes in database, send to - orchestrator and vice versa. - - Full disk format example: - [ - { - "type": "disk", - "id": "sda", - "size": 953869, - "volumes": [ - { - "mount": "/boot", - "type": "raid", - "size": 200 - }, - ..... - { - "size": 938905, - "type": "pv", - "vg": "os" - } - ] - } - ] - - Simple disk format example: - [ - { - "id": "sda", - "size": 953869, - "volumes": [ - { - "name": "os", - "size": 938905, - } - ] - } - ] - ''' - - @classmethod - def format_disks_to_full(cls, node, disks): - '''convert disks from simple format to full format - ''' - full_format = [] - volume_manager = node.volume_manager - for disk in disks: - for volume in disk['volumes']: - full_format = volume_manager.set_volume_size( - disk['id'], volume['name'], volume['size']) - - return full_format - - @classmethod - def format_disks_to_simple(cls, full): - '''convert disks from full format to simple format - ''' - disks_in_simple_format = [] - - # retrieve only physical disks - disks_full_format = only_disks(full) - - for disk in disks_full_format: - reserved_size = cls.calculate_service_partitions_size( - disk['volumes']) - - lvm_pvs_size = sum([ - volume.get('lvm_meta_size', 0) for volume in disk['volumes']]) - size = 0 - if disk['size'] >= reserved_size: - size = disk['size'] - reserved_size - lvm_pvs_size - - disk_simple = { - 'id': disk['id'], - 'name': disk['name'], - 'size': size, - 'volumes': cls.serialize_volumes(disk['volumes'])} - - disks_in_simple_format.append(disk_simple) - - return disks_in_simple_format - - @classmethod - def calculate_service_partitions_size(self, volumes): - service_partitions = filter( - lambda vg: vg.get('type') != 'pv' and - vg.get('type') != 'partition' and - (vg.get('type') != 'raid' or vg.get('mount') == '/boot'), - volumes) - - return sum( - [partition.get('size', 0) for partition in service_partitions]) - - @classmethod - def serialize_volumes(cls, all_partitions): - """Convert volumes from full format to simple format - """ - pv_full_format = filter( - lambda vg: vg.get('type') == 'pv', all_partitions) - - partitions_full_format = filter( - lambda vg: vg.get('type') == 'partition', all_partitions) - - raid_full_format = filter( - lambda vg: vg.get('type') == 'raid' and vg.get('mount') != '/boot', - all_partitions) - - volumes_simple_format = [] - for volume in pv_full_format: - calculated_size = volume['size'] - volume['lvm_meta_size'] - size = calculated_size if calculated_size > 0 else 0 - - volume_simple = { - 'name': volume['vg'], - 'size': size} - - volumes_simple_format.append(volume_simple) - - for partition in partitions_full_format: - volumes_simple_format.append({ - 'name': partition['name'], - 'size': partition['size'] - }) - - for raid in raid_full_format: - volumes_simple_format.append({ - 'name': raid['name'], - 'size': raid['size'] - }) - - return volumes_simple_format - - @classmethod - def get_volumes_info(cls, node): - '''Return volumes info for node - - :returns: [ - { - "name": "os", - "label": "Base System", - "minimum": 100002 - } - ] - ''' - volumes_info = [] - for volume_id in get_node_volumes(node): - volume = filter( - lambda volume: volume.get('id') == volume_id, - node.cluster.release.volumes_metadata['volumes'])[0] - - # Here we calculate min_size of nodes - min_size = node.volume_manager.expand_generators( - volume)['min_size'] - - volumes_info.append({ - 'name': volume_id, - 'label': volume['label'], - 'min_size': min_size}) - - return volumes_info - - -class Disk(object): - - def __init__(self, volumes, generator_method, disk_id, name, - size, boot_is_raid=True, possible_pvs_count=0): - """Create disk - - :param volumes: volumes which need to allocate on disk - :param generator_method: method with size generator - :param disk_id: uniq id for disk - :param name: name, used for UI only - :param size: size of disk - :param boot_is_raid: if True partition_type - equal to 'raid' else 'partition' - :param possible_pvs_count: used for lvm pool calculation - size of lvm pool = possible_pvs_count * lvm meta size - """ - self.call_generator = generator_method - self.id = disk_id - self.name = name - self.size = size - self.lvm_meta_size = self.call_generator('calc_lvm_meta_size') - self.max_lvm_meta_pool_size = self.lvm_meta_size * possible_pvs_count - self.free_space = self.size - self.set_volumes(volumes) - - # For determination type of boot - self.boot_is_raid = boot_is_raid - - # For each disk we need to create - # service partitions and reserve space - self.create_service_partitions() - - def set_volumes(self, volumes): - """Add volumes and reduce free space - """ - self.volumes = volumes - for volume in volumes: - self.free_space -= volume.get('size', 0) - - def create_service_partitions(self): - """Reserve space for service partitions - """ - self.create_boot_records() - self.create_boot_partition() - self.create_lvm_meta_pool(self.max_lvm_meta_pool_size) - - def create_boot_partition(self): - """Reserve space for boot partition - """ - boot_size = self.call_generator('calc_boot_size') - partition_type = 'partition' - if self.boot_is_raid: - partition_type = 'raid' - - existing_boot = filter( - lambda volume: volume.get('mount') == '/boot', self.volumes) - - if not existing_boot: - self.volumes.append({ - 'type': partition_type, - 'file_system': 'ext2', - 'mount': '/boot', - 'name': 'Boot', - 'size': self.get_size(boot_size)}) - - def create_boot_records(self): - """Reserve space for efi, gpt, bios - """ - boot_records_size = self.call_generator('calc_boot_records_size') - existing_boot = filter( - lambda volume: volume.get('type') == 'boot', self.volumes) - - if not existing_boot: - self.volumes.append( - {'type': 'boot', 'size': self.get_size(boot_records_size)}) - - def get_size(self, size): - """Get size and reduce free space. Returns 0 if - not enough free space. - """ - size_to_allocate = size if self.free_space >= size else 0 - self.free_space -= size_to_allocate - return size_to_allocate - - def create_lvm_meta_pool(self, size): - """Create lvm pool. - When new PV will be created, from this pool - deducated size of single lvm meta for each - PV on disk. - """ - existing_lvm_pool = filter( - lambda volume: volume['type'] == 'lvm_meta_pool', self.volumes) - - if not existing_lvm_pool: - self.volumes.append( - {'type': 'lvm_meta_pool', 'size': self.get_size(size)}) - - def get_lvm_meta_from_pool(self): - """Take lvm meta from lvm meta pool - """ - lvm_meta_pool = filter( - lambda volume: volume['type'] == 'lvm_meta_pool', self.volumes)[0] - - if lvm_meta_pool['size'] >= self.lvm_meta_size: - lvm_meta_pool['size'] -= self.lvm_meta_size - allocated_size = self.lvm_meta_size - else: - allocated_size = 0 - - return allocated_size - - def put_size_to_lvm_meta_pool(self, size): - """Return back lvm meta to pool - """ - lvm_meta_pool = filter( - lambda volume: volume['type'] == 'lvm_meta_pool', self.volumes)[0] - - lvm_meta_pool['size'] += size - - def create_pv(self, volume_info, size=None): - """Allocates all available space if size is None - Size in parameter should include size of lvm meta - """ - name = volume_info['id'] - logger.debug('Creating PV: disk=%s vg=%s, size=%s', - self.id, name, str(size)) - - if size is None: - logger.debug( - 'Size is not defined. Will use all free space on this disk.') - size = self.free_space - - self.free_space -= size - # Don't allocate lvm if size equal 0 - lvm_meta_size = self.get_lvm_meta_from_pool() if size else 0 - - logger.debug('Appending PV to volumes.') - self.volumes.append({ - 'type': 'pv', - 'vg': name, - 'size': size + lvm_meta_size, - 'lvm_meta_size': lvm_meta_size}) - - def create_partition(self, partition_info, size=None, ptype='partition'): - """Create partitions according templates in partition_info - """ - logger.debug('Creating or updating partition: disk=%s patition=%s', - self.id, partition_info) - - if size is None: - logger.debug( - 'Size is not defined. Will use all free space on this disk.') - size = self.free_space - - self.free_space -= size - - self.volumes.append({ - 'size': size, - 'type': ptype, - 'name': partition_info['id'], - 'file_system': partition_info['file_system'], - 'disk_label': partition_info.get('disk_label'), - 'mount': partition_info['mount']}) - - def remove_pv(self, name): - """Remove PV and return back lvm_meta size to pool - """ - for i, volume in enumerate(self.volumes[:]): - if volume.get('type') == 'pv' and volume.get('vg') == name: - lvm_meta_pool = filter( - lambda v: v['type'] == 'lvm_meta_pool', self.volumes)[0] - - # Return back size to lvm_meta_pool - lvm_meta_pool['size'] += volume['lvm_meta_size'] - # Return back size of PV, without size of lvm meta - # beacuse we return back size of lvm_meta above - self.free_space += (volume['size'] - volume['lvm_meta_size']) - - del self.volumes[i] - break - - def set_pv_size(self, name, size): - """Set PV size - """ - for volume in self.volumes: - if volume.get('type') == 'pv' and volume.get('vg') == name: - # Recreate lvm meta - self.remove_pv(name) - self.create_pv({"id": name}, size) - - def set_partition_size(self, name, size): - """Set partition size - """ - for volume in self.volumes: - if volume.get('type') == 'partition' and \ - volume.get('name') == name: - self.free_space += volume['size'] - volume['size'] = size - self.free_space -= size - - def set_raid_size(self, name, size): - """Set partition size - """ - for volume in self.volumes: - if volume.get('type') == 'raid' and \ - volume.get('name') == name and \ - volume.get('mount') != '/boot': - self.free_space += volume['size'] - volume['size'] = size - self.free_space -= size - - def reset(self): - self.volumes = [] - self.free_space = self.size - self.create_service_partitions() - - def render(self): - return { - 'id': self.id, - 'name': self.name, - 'type': 'disk', - 'size': self.size, - 'volumes': self.volumes, - 'free_space': self.free_space - } - - def __repr__(self): - return json.dumps(self.render()) - - def __str__(self): - return json.dumps(self.render(), indent=4) - - -class VolumeManager(object): - def __init__(self, node): - """Disks and volumes will be set according to node attributes. - VolumeManager should not make any updates in database. - """ - # Make sure that we don't change volumes directly from manager - self.volumes = deepcopy(node.attributes.volumes) or [] - # For swap calculation - self.ram = node.meta['memory']['total'] - self.allowed_volumes = [] - - # If node bound to the cluster than it has a role - # and volume groups which we should to allocate - if node.cluster: - volumes_metadata = node.cluster.release.volumes_metadata - # Adding volume groups in same order - # as they represent in volumes_roles_mapping list - for vg_name in get_node_volumes(node): - vg = filter(lambda vg: vg.get('id') == vg_name, - volumes_metadata['volumes'])[0] - self.allowed_volumes.append(vg) - - self.disks = [] - for d in sorted(node.meta['disks'], key=lambda i: i['name']): - disks_count = len(node.meta["disks"]) - boot_is_raid = True if disks_count > 1 else False - - existing_disk = filter( - lambda disk: d['disk'] == disk['id'], - only_disks(self.volumes)) - - disk_volumes = existing_disk[0].get( - 'volumes', []) if existing_disk else [] - - disk = Disk( - disk_volumes, - self.call_generator, - d["disk"], - d["name"], - byte_to_megabyte(d["size"]), - boot_is_raid=boot_is_raid, - # Count of possible PVs equal to count of allowed VGs - possible_pvs_count=len(only_vg(self.allowed_volumes))) - - self.disks.append(disk) - - self.__logger('Initialized with node: %s' % node.full_name) - self.__logger('Initialized with volumes: %s' % self.volumes) - self.__logger('Initialized with disks: %s' % self.disks) - - def set_volume_size(self, disk_id, volume_name, size): - """Set size of volume - """ - self.__logger('Update volume size for disk=%s volume_name=%s size=%s' % - (disk_id, volume_name, size)) - - disk = filter(lambda disk: disk.id == disk_id, self.disks)[0] - - volume_type = self.get_space_type(volume_name) - if volume_type == 'partition': - disk.set_partition_size(volume_name, size) - elif volume_type == 'vg': - disk.set_pv_size(volume_name, size) - elif volume_type == 'raid': - disk.set_raid_size(volume_name, size) - - for idx, volume in enumerate(self.volumes): - if volume.get('id') == disk.id: - self.volumes[idx] = disk.render() - - # Recalculate sizes of volume groups - for idx, volume in enumerate(self.volumes): - if volume.get('type') == 'vg': - vg_id = volume.get('id') - vg_template = filter( - lambda volume: volume.get('id') == vg_id, - self.allowed_volumes)[0] - - self.volumes[idx] = self.expand_generators(vg_template) - - self.__logger('Updated volume size %s' % self.volumes) - return self.volumes - - def get_space_type(self, volume_name): - """Get type of space which represents on disk - as volume with volume_name - """ - for volume in self.allowed_volumes: - if volume['id'] == volume_name: - return volume['type'] - - def get_pv_size(self, disk_id, volume_name): - """Get PV size without lvm meta size - """ - disk = filter( - lambda volume: volume['id'] == disk_id, - only_disks(self.volumes))[0] - - volume = filter( - lambda volume: volume_name == volume.get('vg'), - disk['volumes'])[0] - - size_without_lvm_meta = volume['size'] - \ - self.call_generator('calc_lvm_meta_size') - - return size_without_lvm_meta - - def call_generator(self, generator, *args): - generators = { - # Calculate swap space based on total RAM - 'calc_swap_size': self._calc_swap_size, - # root = 10GB - 'calc_root_size': lambda: gb_to_mb(10), - # boot = 200MB - 'calc_boot_size': lambda: 200, - # boot records size = 300MB - 'calc_boot_records_size': lambda: 300, - # let's think that size of mbr is 10MB - 'calc_mbr_size': lambda: 10, - # lvm meta = 64MB for one volume group - 'calc_lvm_meta_size': lambda: 64, - 'calc_total_vg': self._calc_total_vg, - # virtual storage = 5GB - 'calc_min_vm_size': lambda: gb_to_mb(5), - 'calc_min_glance_size': lambda: gb_to_mb(5), - 'calc_min_cinder_size': lambda: gb_to_mb(1.5), - 'calc_total_root_vg': self._calc_total_root_vg, - # 2GB reuquired for journal, leave 1GB for data - 'calc_min_ceph_size': lambda: gb_to_mb(3), - 'calc_min_ceph_journal_size': lambda: 0, - } - - generators['calc_os_size'] = \ - lambda: generators['calc_root_size']() + \ - generators['calc_swap_size']() - - generators['calc_os_vg_size'] = generators['calc_os_size'] - generators['calc_min_os_size'] = generators['calc_os_size'] - - if generator not in generators: - raise errors.CannotFindGenerator( - u'Cannot find generator %s' % generator) - - result = generators[generator](*args) - self.__logger('Generator %s with args %s returned result: %s' % - (generator, args, result)) - return result - - def _calc_total_root_vg(self): - return self._calc_total_vg('os') - \ - self.call_generator('calc_swap_size') - - def _calc_total_vg(self, vg): - vg_space = 0 - for v in only_disks(self.volumes): - for subv in v['volumes']: - if subv.get('type') == 'pv' and subv.get('vg') == vg: - vg_space += subv.get('size', 0) - \ - subv.get('lvm_meta_size', 0) - - return vg_space - - def _calc_swap_size(self): - '''Calc swap size according to RAM - - | RAM | Recommended swap space | - |--------------+-----------------------------| - | <= 2GB | 2 times the amount of RAM | - | > 2GB – 8GB | Equal to the amount of RAM | - | > 8GB – 64GB | 0.5 times the amount of RAM | - | > 64GB | 4GB of swap space | - - Source https://access.redhat.com/site/documentation/en-US/ - Red_Hat_Enterprise_Linux/6/html/Installation_Guide/ - s2-diskpartrecommend-ppc.html#id4394007 - ''' - mem = float(self.ram) / 1024 ** 3 - if mem <= 2: - return gb_to_mb(int(2 * mem)) - elif mem > 2 and mem <= 8: - return gb_to_mb(mem) - elif mem > 8 and mem <= 64: - return gb_to_mb(int(.5 * mem)) - else: - return gb_to_mb(4) - - def _allocate_volumes(self, volume_info, size=None): - '''Allocate volumes. If size is None, - then allocate all existing space on all disks. - ''' - self.__logger('Allocate volume group %s with size %s' % - (volume_info, size)) - - if size is None: - for disk in self.disks: - if disk.free_space > 0: - self.__logger('Allocating all available space for volume: ' - 'disk: %s volume: %s' % - (disk.id, volume_info)) - self._get_allocator(disk, volume_info)(volume_info) - else: - self.__logger('Not enough free space for volume ' - 'allocation: disk: %s volume: %s' % - (disk.id, volume_info)) - self._get_allocator(disk, volume_info)(volume_info, 0) - else: - not_allocated_size = size - for disk in self.disks: - self.__logger('Creating volume: disk: %s, vg: %s' % - (disk.id, volume_info)) - - if disk.free_space >= not_allocated_size: - # if we can allocate all required size - # on one disk, then just allocate it - size_to_allocation = not_allocated_size - elif disk.free_space > 0: - # if disk has free space, then allocate it - size_to_allocation = disk.free_space - else: - # else just allocate volume with size 0 - size_to_allocation = 0 - - self._get_allocator(disk, volume_info)(volume_info, - size_to_allocation) - not_allocated_size -= size_to_allocation - - def _get_allocator(self, disk, volume_info): - """Returns disk method for volume allocation - """ - if volume_info['type'] == 'vg': - return disk.create_pv - elif volume_info['type'] == 'partition': - return disk.create_partition - elif volume_info['type'] == 'raid': - return partial(disk.create_partition, ptype='raid') - - def gen_volumes_info(self): - self.__logger('Generating volumes info for node') - self.__logger('Purging volumes info for all node disks') - - map(lambda d: d.reset(), self.disks) - self.volumes = [d.render() for d in self.disks] - - if not self.allowed_volumes: - self.__logger('Role is None return volumes: %s' % self.volumes) - return self.volumes - - self.volumes.extend(only_vg(self.allowed_volumes)) - - for volume in self.allowed_volumes: - # For last volume group in allowed_volumes list - # we allocates all free space - if (len(self.allowed_volumes) == 1 or - volume == self.allowed_volumes[-1]): - self._allocate_volumes(volume) - else: - min_size = self.expand_generators(volume)['min_size'] - self._allocate_volumes(volume, min_size) - - self.volumes = self.expand_generators(self.volumes) - self.__logger('Generated volumes: %s' % self.volumes) - return self.volumes - - def expand_generators(self, cdict): - new_dict = {} - if isinstance(cdict, dict): - for i, val in cdict.iteritems(): - if type(val) in (str, unicode, int, float): - new_dict[i] = val - elif isinstance(val, dict): - if "generator" in val: - genval = self.call_generator( - val["generator"], - *(val.get("generator_args", [])) - ) - self.__logger( - 'Generator %s with args %s expanded to: %s' % - (val['generator'], - val.get('generator_args', []), - genval)) - - new_dict[i] = genval - else: - new_dict[i] = self.expand_generators(val) - elif isinstance(val, list): - new_dict[i] = [] - for d in val: - new_dict[i].append(self.expand_generators(d)) - elif isinstance(cdict, list): - new_dict = [] - for d in cdict: - new_dict.append(self.expand_generators(d)) - return new_dict - - def check_disk_space_for_deployment(self): - '''Check disks space for minimal installation. - This method calls in before deployment task. - - :raises: errors.NotEnoughFreeSpace - ''' - disks_space = sum([d.size for d in self.disks]) - minimal_installation_size = self.__calc_minimal_installation_size() - - self.__logger('Checking disks space: disks space %s, minimal size %s' % - (disks_space, minimal_installation_size)) - - if disks_space < minimal_installation_size: - raise errors.NotEnoughFreeSpace() - - def __calc_minimal_installation_size(self): - '''Calc minimal installation size depend on node role - ''' - disks_count = len(filter(lambda disk: disk.size > 0, self.disks)) - boot_size = self.call_generator('calc_boot_size') + \ - self.call_generator('calc_boot_records_size') - - min_installation_size = disks_count * boot_size - for vg in self.allowed_volumes: - min_size = self.expand_generators(vg)['min_size'] - min_installation_size += min_size - - return min_installation_size - - def __logger(self, message): - logger.debug('VolumeManager %s: %s', id(self), message) diff --git a/nailgun/nailgun/webui/__init__.py b/nailgun/nailgun/webui/__init__.py deleted file mode 100644 index 141ca6ab9..000000000 --- a/nailgun/nailgun/webui/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. diff --git a/nailgun/nailgun/webui/handlers.py b/nailgun/nailgun/webui/handlers.py deleted file mode 100644 index c740ba5e4..000000000 --- a/nailgun/nailgun/webui/handlers.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import mimetypes -import posixpath -import web - -from nailgun.settings import settings - -render = web.template.render(settings.TEMPLATE_DIR) - - -class IndexHandler(object): - def GET(self): - return render.index() - - -class StaticHandler(object): - def GET(self, fl): - fl_path = posixpath.join(settings.STATIC_DIR, fl) - mimetype = mimetypes.guess_type(fl_path)[0] - if mimetype: - web.header("Content-Type", mimetype) - try: - f = open(fl_path, 'r') - return f.read() - except Exception: - raise web.notfound() diff --git a/nailgun/nailgun/webui/urls.py b/nailgun/nailgun/webui/urls.py deleted file mode 100644 index bc3de5b74..000000000 --- a/nailgun/nailgun/webui/urls.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import web - -from nailgun.webui.handlers import IndexHandler -from nailgun.webui.handlers import StaticHandler - -urls = ( - r"/static/(.*)", StaticHandler.__name__, - r"/", IndexHandler.__name__, -) - -app = web.application(urls, locals()) diff --git a/nailgun/nailgun/wsgi.py b/nailgun/nailgun/wsgi.py deleted file mode 100644 index c3d302182..000000000 --- a/nailgun/nailgun/wsgi.py +++ /dev/null @@ -1,112 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2013 Mirantis, Inc. -# -# 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. - -import os -import sys -import web -from web.httpserver import StaticMiddleware -from web.httpserver import WSGIServer - -curdir = os.path.dirname(__file__) -sys.path.insert(0, curdir) - -from nailgun.api.handlers import forbid_client_caching -from nailgun.db import engine -from nailgun.db import load_db_driver -from nailgun.logger import HTTPLoggerMiddleware -from nailgun.logger import logger -from nailgun.settings import settings -from nailgun.urls import urls - - -def build_app(): - app = web.application(urls, locals()) - app.add_processor(load_db_driver) - app.add_processor(forbid_client_caching) - return app - - -def build_middleware(app): - middleware_list = [ - HTTPLoggerMiddleware - ] - - logger.debug('Initialize middleware: %s' % - (map(lambda x: x.__name__, middleware_list))) - - return app(*middleware_list) - - -def run_server(func, server_address=('0.0.0.0', 8080)): - """This function same as runsimple from web/httpserver - except removed LogMiddleware because we use - HTTPLoggerMiddleware instead - """ - global server - func = StaticMiddleware(func) - server = WSGIServer(server_address, func) - print('http://%s:%d/' % server_address) - - try: - server.start() - except (KeyboardInterrupt, SystemExit): - server.stop() - - -def appstart(keepalive=False): - logger.info("Fuel-Web {0} SHA: {1}\nFuel SHA: {2}".format( - settings.PRODUCT_VERSION, - settings.COMMIT_SHA, - settings.FUEL_COMMIT_SHA - )) - if not engine.dialect.has_table(engine.connect(), "nodes"): - logger.error( - "Database tables not created. Try './manage.py syncdb' first" - ) - sys.exit(1) - - app = build_app() - - from nailgun.keepalive import keep_alive - from nailgun.rpc import threaded - - if keepalive: - logger.info("Running KeepAlive watcher...") - keep_alive.start() - - if not settings.FAKE_TASKS: - if not keep_alive.is_alive() \ - and not settings.FAKE_TASKS_AMQP: - logger.info("Running KeepAlive watcher...") - keep_alive.start() - rpc_process = threaded.RPCKombuThread() - logger.info("Running RPC consumer...") - rpc_process.start() - logger.info("Running WSGI app...") - - wsgifunc = build_middleware(app.wsgifunc) - - run_server(wsgifunc, - (settings.LISTEN_ADDRESS, int(settings.LISTEN_PORT))) - - logger.info("Stopping WSGI app...") - if keep_alive.is_alive(): - logger.info("Stopping KeepAlive watcher...") - keep_alive.join() - if not settings.FAKE_TASKS: - logger.info("Stopping RPC consumer...") - rpc_process.join() - logger.info("Done") diff --git a/nailgun/run_tests.sh b/nailgun/run_tests.sh deleted file mode 100755 index bdf8cf968..000000000 --- a/nailgun/run_tests.sh +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/bash - -function usage { - echo "Usage: $0 [OPTION]..." - echo "Run tests" - echo "" - echo " -p, --flake8 Just run flake8 and HACKING compliance check" - echo " -f, --fail-first Nosetests will stop on first error" - echo " -j, --jslint Just run JSLint" - echo " -u, --ui-tests Just run UI tests" - echo " -i, --integration Just run integration tests" - echo " -u, --unit Just run unit tests" - echo " -x, --xunit Generate reports (useful in Jenkins environment)" - echo " -P, --no-flake8 Don't run static code checks" - echo " -J, --no-jslint Don't run JSLint" - echo " -U, --no-ui-tests Don't run UI tests" - echo " -c, --clean Only clean *.log, *.json, *.pyc, *.pid files, doesn't run tests" - echo " -h, --help Print this usage message" - echo "" - echo "By default it runs tests and flake8 check." - exit -} - -function process_option { - case "$1" in - -h|--help) usage;; - -p|--flake8) just_flake8=1;; - -f|--fail-first) fail_first=1;; - -j|--jslint) just_jslint=1;; - -u|--ui-tests) just_ui_tests=1;; - -P|--no-flake8) no_flake8=1;; - -J|--no-jslint) no_jslint=1;; - -U|--no-ui-tests) no_ui_tests=1;; - -I|--integration) integration_tests=1;; - -u|--unit) unit_tests=1;; - -x|--xunit) xunit=1;; - -c|--clean) clean=1;; - ui_tests*) ui_test_files="$ui_test_files $1";; - -*) noseopts="$noseopts $1";; - *) noseargs="$noseargs $1" - esac -} - -just_flake8=0 -no_flake8=0 -fail_first=0 -just_jslint=0 -no_jslint=0 -just_ui_tests=0 -no_ui_tests=0 -integration_tests=0 -unit_tests=0 -xunit=0 -clean=0 -ui_test_files= -default_noseargs="--with-timer" -noseargs="$default_noseargs" -noseopts= - -for arg in "$@"; do - process_option $arg -done - -if [ -n "$ui_test_files" ]; then - just_ui_tests=1 -fi - -function clean { - echo "cleaning *.pyc, *.json, *.log, *.pid files" - find . -type f -name "*.pyc" -delete - rm -f *.json - rm -f *.log - rm -f *.pid -} - -if [ $clean -eq 1 ]; then - clean - exit 0 -fi - -# If enabled, tell nose to create xunit report -if [ $xunit -eq 1 ]; then - noseopts=${noseopts}" --with-xunit" -fi - -if [ $fail_first -eq 1 ]; then - noseopts=${noseopts}" --stop" -fi - -function run_flake8 { - # H302 - "import only modules. does not import a module" requires to import only modules and not functions - # H802 - first line of git commit commentary should be less than 50 characters - # __init__.py - excluded because it doesn't comply with pep8 standard - flake8 --exclude=__init__.py --ignore=H302,H802 --show-source --show-pep8 --count . || return 1 - echo "Flake8 check passed successfully." -} - -if [ $just_flake8 -eq 1 ]; then - run_flake8 || exit 1 - exit -fi - -function run_jslint { - which jslint > /dev/null - if [ $? -ne 0 ]; then - echo "JSLint is not installed; install by running:" - echo "sudo apt-get install npm" - echo "sudo npm install -g jslint" - return 1 - fi - jsfiles=$(find static/js -type f | grep -v ^static/js/libs/ | grep \\.js$) - jslint_predef=(requirejs require define app Backbone $ _ alert confirm) - jslint_options="$(echo ${jslint_predef[@]} | sed 's/^\| / --predef=/g') --browser=true --nomen=true --eqeq=true --vars=true --white=true --es5=false" - jslint $jslint_options $jsfiles || return 1 -} - -if [ $just_jslint -eq 1 ]; then - run_jslint || exit 1 - exit -fi - -function run_ui_tests { - which casperjs > /dev/null - if [ $? -ne 0 ]; then - echo "CasperJS is not installed; install by running:" - echo "sudo apt-get install phantomjs" - echo "cd ~" - echo "git clone git://github.com/n1k0/casperjs.git" - echo "cd casperjs" - echo "git checkout tags/1.0.0-RC4" - echo "sudo ln -sf \`pwd\`/bin/casperjs /usr/local/bin/casperjs" - return 1 - fi - ui_tests_dir=ui_tests - if [ -z "$ui_test_files" ]; then - ui_test_files=$ui_tests_dir/test_*.js - fi - result=0 - test_server_port=5544 - test_server_cmd="./manage.py run --port=$test_server_port --fake-tasks --fake-tasks-tick-count=80 --fake-tasks-tick-interval=1" - old_server_pid=`ps aux | grep "$test_server_cmd" | grep -v grep | awk '{ print $2 }'` - if [ -n "$old_server_pid" ]; then - kill $old_server_pid - echo -n "Killing old test server... " - sleep 5 - fi - test_server_log_file=`tempfile` - for test_file in $ui_test_files; do - echo -n "Starting test server for $test_file ... " - ./manage.py dropdb > /dev/null - ./manage.py syncdb > /dev/null - ./manage.py loaddata nailgun/fixtures/openstack.json > /dev/null - ./manage.py loaddata nailgun/fixtures/admin_network.json > /dev/null - $test_server_cmd >> $test_server_log_file 2>&1 & - server_pid=$! - which nc > /dev/null - if [ $? -eq 0 ]; then - # nc is available, use it to check test server readiness - for i in {1..50}; do - nc -vz localhost $test_server_port 2> /dev/null - if [ $? -eq 0 ]; then break; fi - sleep 0.1 - done - else - # nc is not available, use sleep - sleep 5 - fi - kill -0 $server_pid 2> /dev/null - if [ $? -eq 0 ]; then - echo "Test server started" - casperjs test --includes=$ui_tests_dir/helpers.js --fail-fast $test_file - result=$(($result + $?)) - kill $server_pid - wait $server_pid 2> /dev/null - else - echo "Test server failed to start!" - cat $test_server_log_file - result=1 - break - fi - done - ./manage.py dropdb >> /dev/null - rm $test_server_log_file - return $result -} - -if [ $just_ui_tests -eq 1 ]; then - run_ui_tests || exit 1 - exit -fi - -function run_tests { - clean - ./manage.py dropdb > /dev/null - ./manage.py syncdb > /dev/null - [ -z "$noseargs" ] && test_args=. || test_args="$noseargs" - stderr=$(nosetests $noseopts $test_args --verbosity=2 3>&1 1>&2 2>&3 | tee /dev/stderr) -# TODO: uncomment after cluster deletion issue fix -# if [[ "$stderr" =~ "Exception" ]]; then -# echo "Tests executed with errors!" -# exit 1 -# fi -} - -function run_integration_tests { - noseargs="nailgun/test/integration" - run_tests -} - -if [ $integration_tests -eq 1 ]; then - run_integration_tests || exit 1 - exit -fi - -function run_unit_tests { - noseargs="nailgun/test/unit" - run_tests -} - -if [ $unit_tests -eq 1 ]; then - run_unit_tests || exit 1 - exit -fi - -errors='' - -trap drop_db INT - -function drop_db { - ./manage.py dropdb >> /dev/null - exit 1 -} - -run_tests || errors+=' unittests' - -if [ "$noseargs" == "$default_noseargs" ]; then - if [ $no_flake8 -eq 0 ]; then - run_flake8 || errors+=' flake8' - fi - if [ $no_jslint -eq 0 ]; then - run_jslint || errors+=' jslint' - fi - if [ $no_ui_tests -eq 0 ]; then - run_ui_tests || errors+=' ui-tests' - fi -fi - -if [ -n "$errors" ]; then - echo Failed tests: $errors - exit 1 -fi diff --git a/nailgun/setup.py b/nailgun/setup.py deleted file mode 100644 index e9ece2e1d..000000000 --- a/nailgun/setup.py +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 2013 Mirantis, Inc. -# -# 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. - - -import os -import os.path - -from setuptools import find_packages -from setuptools import setup - - -requires = [ - 'Jinja2==2.7', - 'Paste==1.7.5.1', - 'PyYAML==3.10', - 'SQLAlchemy==0.7.8', - 'amqplib==1.0.2', - 'anyjson==0.3.1', - 'argparse==1.2.1', - 'decorator==3.4.0', - 'kombu==2.1.8', - 'netaddr==0.7.10', - 'nose2==0.4.1', - 'nose==1.1.2', - 'pycrypto==2.6', - 'simplejson==2.6.2', - 'web.py==0.37', - 'wsgilog==0.3', - 'wsgiref==0.1.2', - 'fysom==1.0.11', - 'jsonschema==2.0.0', - 'Shotgun==0.1.0', - 'netifaces==0.8', - 'psycopg2==2.4.6' -] - -major_version = '0.1' -minor_version = '0' -name = 'Nailgun' - -version = "%s.%s" % (major_version, minor_version) - - -def recursive_data_files(spec_data_files): - result = [] - for dstdir, srcdir in spec_data_files: - for topdir, dirs, files in os.walk(srcdir): - for f in files: - result.append((os.path.join(dstdir, topdir), - [os.path.join(topdir, f)])) - return result - - -if __name__ == "__main__": - setup(name=name, - version=version, - description='Nailgun package', - long_description="""Nailgun package""", - classifiers=[ - "Development Status :: 4 - Beta", - "Programming Language :: Python", - "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: WSGI :: Application", - ], - author='Mirantis Inc.', - author_email='product@mirantis.com', - url='http://mirantis.com', - keywords='web wsgi nailgun mirantis', - packages=find_packages(), - zip_safe=False, - install_requires=requires, - include_package_data=True, - scripts=['manage.py', 'fuel-cli/fuel'], - entry_points={ - 'console_scripts': [ - 'nailgun_syncdb = nailgun.db:syncdb', - 'nailgun_fixtures = \ - nailgun.fixtures.fixman:upload_fixtures', - 'nailgund = nailgun.wsgi:appstart', - ], - }, - data_files=recursive_data_files([('share/nailgun', 'static')]) - ) diff --git a/nailgun/static/css/bootstrap.css b/nailgun/static/css/bootstrap.css deleted file mode 100755 index 1a20cf932..000000000 --- a/nailgun/static/css/bootstrap.css +++ /dev/null @@ -1,6168 +0,0 @@ -/*! - * Bootstrap v2.3.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -audio:not([controls]) { - display: none; -} - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -a:focus { - /* outline: thin dotted #333; */ - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -a:hover, -a:active { - outline: 0; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - width: auto\9; - height: auto; - max-width: 100%; - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -#map_canvas img, -.google-maps img { - max-width: none; -} - -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} - -button, -input { - *overflow: visible; - line-height: normal; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -@media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 0.5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } -} - -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - color: #333333; - /* background-color: #ffffff; */ -} - -a { - color: #0088cc; - text-decoration: none; -} - -a:hover, -a:focus { - color: #005580; - text-decoration: underline; -} - -.img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); -} - -.img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; -} - -.row { - margin-left: -20px; - *zoom: 1; -} - -.row:before, -.row:after { - display: table; - line-height: 0; - content: ""; -} - -.row:after { - clear: both; -} - -[class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; -} - -.container, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.span12 { - width: 940px; -} - -.span11 { - width: 860px; -} - -.span10 { - width: 780px; -} - -.span9 { - width: 700px; -} - -.span8 { - width: 620px; -} - -.span7 { - width: 540px; -} - -.span6 { - width: 460px; -} - -.span5 { - width: 380px; -} - -.span4 { - width: 300px; -} - -.span3 { - width: 220px; -} - -.span2 { - width: 140px; -} - -.span1 { - width: 60px; -} - -.offset12 { - margin-left: 980px; -} - -.offset11 { - margin-left: 900px; -} - -.offset10 { - margin-left: 820px; -} - -.offset9 { - margin-left: 740px; -} - -.offset8 { - margin-left: 660px; -} - -.offset7 { - margin-left: 580px; -} - -.offset6 { - margin-left: 500px; -} - -.offset5 { - margin-left: 420px; -} - -.offset4 { - margin-left: 340px; -} - -.offset3 { - margin-left: 260px; -} - -.offset2 { - margin-left: 180px; -} - -.offset1 { - margin-left: 100px; -} - -.row-fluid { - width: 100%; - *zoom: 1; -} - -.row-fluid:before, -.row-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.row-fluid:after { - clear: both; -} - -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.row-fluid [class*="span"]:first-child { - margin-left: 0; -} - -.row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; -} - -.row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; -} - -.row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; -} - -.row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; -} - -.row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; -} - -.row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; -} - -.row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; -} - -.row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; -} - -.row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; -} - -.row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; -} - -.row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; -} - -.row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; -} - -.row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; -} - -.row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; -} - -.row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; -} - -.row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; -} - -.row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; -} - -.row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; -} - -.row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; -} - -.row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; -} - -.row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; -} - -.row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; -} - -.row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; -} - -.row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; -} - -.row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; -} - -.row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; -} - -.row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; -} - -.row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; -} - -.row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; -} - -.row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; -} - -.row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; -} - -.row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; -} - -.row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; -} - -.row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; -} - -.row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; -} - -.row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; -} - -.row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; -} - -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} - -.container { - margin-right: auto; - margin-left: auto; - *zoom: 1; -} - -.container:before, -.container:after { - display: table; - line-height: 0; - content: ""; -} - -.container:after { - clear: both; -} - -.container-fluid { - padding-right: 20px; - padding-left: 20px; - *zoom: 1; -} - -.container-fluid:before, -.container-fluid:after { - display: table; - line-height: 0; - content: ""; -} - -.container-fluid:after { - clear: both; -} - -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 21px; - font-weight: 200; - line-height: 30px; -} - -small { - font-size: 85%; -} - -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - -cite { - font-style: normal; -} - -.muted { - color: #999999; -} - -a.muted:hover, -a.muted:focus { - color: #808080; -} - -.text-warning { - color: #c09853; -} - -a.text-warning:hover, -a.text-warning:focus { - color: #a47e3c; -} - -.text-error { - color: #b94a48; -} - -a.text-error:hover, -a.text-error:focus { - color: #953b39; -} - -.text-info { - color: #3a87ad; -} - -a.text-info:hover, -a.text-info:focus { - color: #2d6987; -} - -.text-success { - color: #468847; -} - -a.text-success:hover, -a.text-success:focus { - color: #356635; -} - -.text-left { - text-align: left; -} - -.text-right { - text-align: right; -} - -.text-center { - text-align: center; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 10px 0; - font-family: inherit; - font-weight: bold; - line-height: 20px; - color: inherit; - text-rendering: optimizelegibility; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - line-height: 1; - color: #999999; -} - -h1, -h2, -h3 { - line-height: 40px; -} - -h1 { - font-size: 38.5px; -} - -h2 { - font-size: 31.5px; -} - -h3 { - font-size: 24.5px; -} - -h4 { - font-size: 17.5px; -} - -h5 { - font-size: 14px; -} - -h6 { - font-size: 11.9px; -} - -h1 small { - font-size: 24.5px; -} - -h2 small { - font-size: 17.5px; -} - -h3 small { - font-size: 14px; -} - -h4 small { - font-size: 14px; -} - -.page-header { - padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #eeeeee; -} - -ul, -ol { - padding: 0; - margin: 0 0 10px 25px; -} - -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} - -li { - line-height: 20px; -} - -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -ul.inline, -ol.inline { - margin-left: 0; - list-style: none; -} - -ul.inline > li, -ol.inline > li { - display: inline-block; - *display: inline; - padding-right: 5px; - padding-left: 5px; - *zoom: 1; -} - -dl { - margin-bottom: 20px; -} - -dt, -dd { - line-height: 20px; -} - -dt { - font-weight: bold; -} - -dd { - margin-left: 10px; -} - -.dl-horizontal { - *zoom: 1; -} - -.dl-horizontal:before, -.dl-horizontal:after { - display: table; - line-height: 0; - content: ""; -} - -.dl-horizontal:after { - clear: both; -} - -.dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 180px; -} - -hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} - -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #999999; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - margin-bottom: 0; - font-size: 17.5px; - font-weight: 300; - line-height: 1.25; -} - -blockquote small { - display: block; - line-height: 20px; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -blockquote.pull-right small:before { - content: ''; -} - -blockquote.pull-right small:after { - content: '\00A0 \2014'; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 20px; - font-style: normal; - line-height: 20px; -} - -code, -pre { - padding: 0 3px 2px; - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -code { - padding: 2px 4px; - color: #d14; - white-space: nowrap; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 20px; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -pre.prettyprint { - margin-bottom: 20px; -} - -pre code { - padding: 0; - color: inherit; - white-space: pre; - white-space: pre-wrap; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -form { - margin: 0 0 20px; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 20px; - font-size: 21px; - line-height: 40px; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; -} - -legend small { - font-size: 15px; - color: #999999; -} - -label, -input, -button, -select, -textarea { - font-size: 14px; - font-weight: normal; - line-height: 20px; -} - -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -label { - display: block; - margin-bottom: 5px; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: 20px; - padding: 4px 6px; - margin-bottom: 10px; - font-size: 14px; - line-height: 20px; - color: #555555; - vertical-align: middle; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -input, -textarea, -.uneditable-input { - width: 206px; -} - -textarea { - height: auto; -} - -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: #ffffff; - border: 1px solid #cccccc; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} - -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus, -.uneditable-input:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); -} - -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - margin-top: 1px \9; - *margin-top: 0; - line-height: normal; -} - -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; -} - -select, -input[type="file"] { - height: 30px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 30px; -} - -select { - width: 220px; - background-color: #ffffff; - border: 1px solid #cccccc; -} - -select[multiple], -select[size] { - height: auto; -} - -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.uneditable-input, -.uneditable-textarea { - color: #999999; - cursor: not-allowed; - background-color: #fcfcfc; - border-color: #cccccc; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -} - -.uneditable-input { - overflow: hidden; - white-space: nowrap; -} - -.uneditable-textarea { - width: auto; - height: auto; -} - -input:-moz-placeholder, -textarea:-moz-placeholder { - color: #999999; -} - -input:-ms-input-placeholder, -textarea:-ms-input-placeholder { - color: #999999; -} - -input::-webkit-input-placeholder, -textarea::-webkit-input-placeholder { - color: #999999; -} - -.radio, -.checkbox { - min-height: 20px; - padding-left: 20px; -} - -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -20px; -} - -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} - -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} - -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} - -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; -} - -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} - -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - -input, -textarea, -.uneditable-input { - margin-left: 0; -} - -.controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; -} - -input.span12, -textarea.span12, -.uneditable-input.span12 { - width: 926px; -} - -input.span11, -textarea.span11, -.uneditable-input.span11 { - width: 846px; -} - -input.span10, -textarea.span10, -.uneditable-input.span10 { - width: 766px; -} - -input.span9, -textarea.span9, -.uneditable-input.span9 { - width: 686px; -} - -input.span8, -textarea.span8, -.uneditable-input.span8 { - width: 606px; -} - -input.span7, -textarea.span7, -.uneditable-input.span7 { - width: 526px; -} - -input.span6, -textarea.span6, -.uneditable-input.span6 { - width: 446px; -} - -input.span5, -textarea.span5, -.uneditable-input.span5 { - width: 366px; -} - -input.span4, -textarea.span4, -.uneditable-input.span4 { - width: 286px; -} - -input.span3, -textarea.span3, -.uneditable-input.span3 { - width: 206px; -} - -input.span2, -textarea.span2, -.uneditable-input.span2 { - width: 126px; -} - -input.span1, -textarea.span1, -.uneditable-input.span1 { - width: 46px; -} - -.controls-row { - *zoom: 1; -} - -.controls-row:before, -.controls-row:after { - display: table; - line-height: 0; - content: ""; -} - -.controls-row:after { - clear: both; -} - -.controls-row [class*="span"], -.row-fluid .controls-row [class*="span"] { - float: left; -} - -.controls-row .checkbox[class*="span"], -.controls-row .radio[class*="span"] { - padding-top: 5px; -} - -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: #eeeeee; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - -.control-group.warning .control-label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} - -.control-group.warning .checkbox, -.control-group.warning .radio, -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; -} - -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -} - -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.control-group.error .control-label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} - -.control-group.error .checkbox, -.control-group.error .radio, -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; -} - -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.control-group.success .control-label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} - -.control-group.success .checkbox, -.control-group.success .radio, -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; -} - -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} - -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -.control-group.info .control-label, -.control-group.info .help-block, -.control-group.info .help-inline { - color: #3a87ad; -} - -.control-group.info .checkbox, -.control-group.info .radio, -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - color: #3a87ad; -} - -.control-group.info input, -.control-group.info select, -.control-group.info textarea { - border-color: #3a87ad; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.control-group.info input:focus, -.control-group.info select:focus, -.control-group.info textarea:focus { - border-color: #2d6987; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -} - -.control-group.info .input-prepend .add-on, -.control-group.info .input-append .add-on { - color: #3a87ad; - background-color: #d9edf7; - border-color: #3a87ad; -} - -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - -.form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; - *zoom: 1; -} - -.form-actions:before, -.form-actions:after { - display: table; - line-height: 0; - content: ""; -} - -.form-actions:after { - clear: both; -} - -.help-block, -.help-inline { - color: #595959; -} - -.help-block { - display: block; - margin-bottom: 10px; -} - -.help-inline { - display: inline-block; - *display: inline; - padding-left: 5px; - vertical-align: middle; - *zoom: 1; -} - -.input-append, -.input-prepend { - display: inline-block; - margin-bottom: 10px; - font-size: 0; - white-space: nowrap; - vertical-align: middle; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input, -.input-append .dropdown-menu, -.input-prepend .dropdown-menu, -.input-append .popover, -.input-prepend .popover { - font-size: 14px; -} - -.input-append input, -.input-prepend input, -.input-append select, -.input-prepend select, -.input-append .uneditable-input, -.input-prepend .uneditable-input { - position: relative; - margin-bottom: 0; - *margin-left: 0; - vertical-align: top; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append input:focus, -.input-prepend input:focus, -.input-append select:focus, -.input-prepend select:focus, -.input-append .uneditable-input:focus, -.input-prepend .uneditable-input:focus { - z-index: 2; -} - -.input-append .add-on, -.input-prepend .add-on { - display: inline-block; - width: auto; - height: 20px; - min-width: 16px; - padding: 4px 5px; - font-size: 14px; - font-weight: normal; - line-height: 20px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #eeeeee; - border: 1px solid #ccc; -} - -.input-append .add-on, -.input-prepend .add-on, -.input-append .btn, -.input-prepend .btn, -.input-append .btn-group > .dropdown-toggle, -.input-prepend .btn-group > .dropdown-toggle { - vertical-align: top; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-append .active, -.input-prepend .active { - background-color: #a9dba9; - border-color: #46a546; -} - -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} - -.input-prepend .add-on:first-child, -.input-prepend .btn:first-child { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input, -.input-append select, -.input-append .uneditable-input { - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-append input + .btn-group .btn:last-child, -.input-append select + .btn-group .btn:last-child, -.input-append .uneditable-input + .btn-group .btn:last-child { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-append .add-on, -.input-append .btn, -.input-append .btn-group { - margin-left: -1px; -} - -.input-append .add-on:last-child, -.input-append .btn:last-child, -.input-append .btn-group:last-child > .dropdown-toggle { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.input-prepend.input-append input + .btn-group .btn, -.input-prepend.input-append select + .btn-group .btn, -.input-prepend.input-append .uneditable-input + .btn-group .btn { - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.input-prepend.input-append .btn-group:first-child { - margin-left: 0; -} - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; - /* IE7-8 doesn't have border-radius, so don't indent the padding */ - - margin-bottom: 0; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -/* Allow for input prepend/append in search forms */ - -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.form-search .input-append .search-query { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search .input-append .btn { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .search-query { - -webkit-border-radius: 0 14px 14px 0; - -moz-border-radius: 0 14px 14px 0; - border-radius: 0 14px 14px 0; -} - -.form-search .input-prepend .btn { - -webkit-border-radius: 14px 0 0 14px; - -moz-border-radius: 14px 0 0 14px; - border-radius: 14px 0 0 14px; -} - -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - *display: inline; - margin-bottom: 0; - vertical-align: middle; - *zoom: 1; -} - -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} - -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; -} - -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} - -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} - -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - -.control-group { - margin-bottom: 10px; -} - -legend + .control-group { - margin-top: 20px; - -webkit-margin-top-collapse: separate; -} - -.form-horizontal .control-group { - margin-bottom: 20px; - *zoom: 1; -} - -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - line-height: 0; - content: ""; -} - -.form-horizontal .control-group:after { - clear: both; -} - -.form-horizontal .control-label { - float: left; - width: 160px; - padding-top: 5px; - text-align: right; -} - -.form-horizontal .controls { - *display: inline-block; - *padding-left: 20px; - margin-left: 180px; - *margin-left: 0; -} - -.form-horizontal .controls:first-child { - *padding-left: 180px; -} - -.form-horizontal .help-block { - margin-bottom: 0; -} - -.form-horizontal input + .help-block, -.form-horizontal select + .help-block, -.form-horizontal textarea + .help-block, -.form-horizontal .uneditable-input + .help-block, -.form-horizontal .input-prepend + .help-block, -.form-horizontal .input-append + .help-block { - margin-top: 10px; -} - -.form-horizontal .form-actions { - padding-left: 180px; -} - -table { - max-width: 100%; - background-color: transparent; - border-collapse: collapse; - border-spacing: 0; -} - -.table { - width: 100%; - margin-bottom: 20px; -} - -.table th, -.table td { - padding: 8px; - line-height: 20px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table th { - font-weight: bold; -} - -.table thead th { - vertical-align: bottom; -} - -.table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table .table { - background-color: #ffffff; -} - -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} - -.table-bordered { - border: 1px solid #dddddd; - border-collapse: separate; - *border-collapse: collapse; - border-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} - -.table-bordered caption + thead tr:first-child th, -.table-bordered caption + tbody tr:first-child th, -.table-bordered caption + tbody tr:first-child td, -.table-bordered colgroup + thead tr:first-child th, -.table-bordered colgroup + tbody tr:first-child th, -.table-bordered colgroup + tbody tr:first-child td, -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} - -.table-bordered thead:first-child tr:first-child > th:first-child, -.table-bordered tbody:first-child tr:first-child > td:first-child, -.table-bordered tbody:first-child tr:first-child > th:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered thead:first-child tr:first-child > th:last-child, -.table-bordered tbody:first-child tr:first-child > td:last-child, -.table-bordered tbody:first-child tr:first-child > th:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:first-child, -.table-bordered tbody:last-child tr:last-child > td:first-child, -.table-bordered tbody:last-child tr:last-child > th:first-child, -.table-bordered tfoot:last-child tr:last-child > td:first-child, -.table-bordered tfoot:last-child tr:last-child > th:first-child { - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.table-bordered thead:last-child tr:last-child > th:last-child, -.table-bordered tbody:last-child tr:last-child > td:last-child, -.table-bordered tbody:last-child tr:last-child > th:last-child, -.table-bordered tfoot:last-child tr:last-child > td:last-child, -.table-bordered tfoot:last-child tr:last-child > th:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:first-child { - -webkit-border-bottom-left-radius: 0; - border-bottom-left-radius: 0; - -moz-border-radius-bottomleft: 0; -} - -.table-bordered tfoot + tbody:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - -moz-border-radius-bottomright: 0; -} - -.table-bordered caption + thead tr:first-child th:first-child, -.table-bordered caption + tbody tr:first-child td:first-child, -.table-bordered colgroup + thead tr:first-child th:first-child, -.table-bordered colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; -} - -.table-bordered caption + thead tr:first-child th:last-child, -.table-bordered caption + tbody tr:first-child td:last-child, -.table-bordered colgroup + thead tr:first-child th:last-child, -.table-bordered colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; -} - -.table-striped tbody > tr:nth-child(odd) > td, -.table-striped tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} - -.table-hover tbody tr:hover > td, -.table-hover tbody tr:hover > th { - background-color: #f5f5f5; -} - -table td[class*="span"], -table th[class*="span"], -.row-fluid table td[class*="span"], -.row-fluid table th[class*="span"] { - display: table-cell; - float: none; - margin-left: 0; -} - -.table td.span1, -.table th.span1 { - float: none; - width: 44px; - margin-left: 0; -} - -.table td.span2, -.table th.span2 { - float: none; - width: 124px; - margin-left: 0; -} - -.table td.span3, -.table th.span3 { - float: none; - width: 204px; - margin-left: 0; -} - -.table td.span4, -.table th.span4 { - float: none; - width: 284px; - margin-left: 0; -} - -.table td.span5, -.table th.span5 { - float: none; - width: 364px; - margin-left: 0; -} - -.table td.span6, -.table th.span6 { - float: none; - width: 444px; - margin-left: 0; -} - -.table td.span7, -.table th.span7 { - float: none; - width: 524px; - margin-left: 0; -} - -.table td.span8, -.table th.span8 { - float: none; - width: 604px; - margin-left: 0; -} - -.table td.span9, -.table th.span9 { - float: none; - width: 684px; - margin-left: 0; -} - -.table td.span10, -.table th.span10 { - float: none; - width: 764px; - margin-left: 0; -} - -.table td.span11, -.table th.span11 { - float: none; - width: 844px; - margin-left: 0; -} - -.table td.span12, -.table th.span12 { - float: none; - width: 924px; - margin-left: 0; -} - -.table tbody tr.success > td { - background-color: #dff0d8; -} - -.table tbody tr.error > td { - background-color: #f2dede; -} - -.table tbody tr.warning > td { - background-color: #fcf8e3; -} - -.table tbody tr.info > td { - background-color: #d9edf7; -} - -.table-hover tbody tr.success:hover > td { - background-color: #d0e9c6; -} - -.table-hover tbody tr.error:hover > td { - background-color: #ebcccc; -} - -.table-hover tbody tr.warning:hover > td { - background-color: #faf2cc; -} - -.table-hover tbody tr.info:hover > td { - background-color: #c4e3f3; -} - -/* -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - *margin-right: .3em; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; -} -*/ -/* White icons with optional class, or on hover/focus/active states of certain elements */ -/* -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:focus > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > li > a:focus > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:focus > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"], -.dropdown-submenu:focus > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); -} - -.icon-glass { - background-position: 0 0; -} - -.icon-music { - background-position: -24px 0; -} - -.icon-search { - background-position: -48px 0; -} - -.icon-envelope { - background-position: -72px 0; -} - -.icon-heart { - background-position: -96px 0; -} - -.icon-star { - background-position: -120px 0; -} - -.icon-star-empty { - background-position: -144px 0; -} - -.icon-user { - background-position: -168px 0; -} - -.icon-film { - background-position: -192px 0; -} - -.icon-th-large { - background-position: -216px 0; -} - -.icon-th { - background-position: -240px 0; -} - -.icon-th-list { - background-position: -264px 0; -} - -.icon-ok { - background-position: -288px 0; -} - -.icon-remove { - background-position: -312px 0; -} - -.icon-zoom-in { - background-position: -336px 0; -} - -.icon-zoom-out { - background-position: -360px 0; -} - -.icon-off { - background-position: -384px 0; -} - -.icon-signal { - background-position: -408px 0; -} - -.icon-cog { - background-position: -432px 0; -} - -.icon-trash { - background-position: -456px 0; -} - -.icon-home { - background-position: 0 -24px; -} - -.icon-file { - background-position: -24px -24px; -} - -.icon-time { - background-position: -48px -24px; -} - -.icon-road { - background-position: -72px -24px; -} - -.icon-download-alt { - background-position: -96px -24px; -} - -.icon-download { - background-position: -120px -24px; -} - -.icon-upload { - background-position: -144px -24px; -} - -.icon-inbox { - background-position: -168px -24px; -} - -.icon-play-circle { - background-position: -192px -24px; -} - -.icon-repeat { - background-position: -216px -24px; -} - -.icon-refresh { - background-position: -240px -24px; -} - -.icon-list-alt { - background-position: -264px -24px; -} - -.icon-lock { - background-position: -287px -24px; -} - -.icon-flag { - background-position: -312px -24px; -} - -.icon-headphones { - background-position: -336px -24px; -} - -.icon-volume-off { - background-position: -360px -24px; -} - -.icon-volume-down { - background-position: -384px -24px; -} - -.icon-volume-up { - background-position: -408px -24px; -} - -.icon-qrcode { - background-position: -432px -24px; -} - -.icon-barcode { - background-position: -456px -24px; -} - -.icon-tag { - background-position: 0 -48px; -} - -.icon-tags { - background-position: -25px -48px; -} - -.icon-book { - background-position: -48px -48px; -} - -.icon-bookmark { - background-position: -72px -48px; -} - -.icon-print { - background-position: -96px -48px; -} - -.icon-camera { - background-position: -120px -48px; -} - -.icon-font { - background-position: -144px -48px; -} - -.icon-bold { - background-position: -167px -48px; -} - -.icon-italic { - background-position: -192px -48px; -} - -.icon-text-height { - background-position: -216px -48px; -} - -.icon-text-width { - background-position: -240px -48px; -} - -.icon-align-left { - background-position: -264px -48px; -} - -.icon-align-center { - background-position: -288px -48px; -} - -.icon-align-right { - background-position: -312px -48px; -} - -.icon-align-justify { - background-position: -336px -48px; -} - -.icon-list { - background-position: -360px -48px; -} - -.icon-indent-left { - background-position: -384px -48px; -} - -.icon-indent-right { - background-position: -408px -48px; -} - -.icon-facetime-video { - background-position: -432px -48px; -} - -.icon-picture { - background-position: -456px -48px; -} - -.icon-pencil { - background-position: 0 -72px; -} - -.icon-map-marker { - background-position: -24px -72px; -} - -.icon-adjust { - background-position: -48px -72px; -} - -.icon-tint { - background-position: -72px -72px; -} - -.icon-edit { - background-position: -96px -72px; -} - -.icon-share { - background-position: -120px -72px; -} - -.icon-check { - background-position: -144px -72px; -} - -.icon-move { - background-position: -168px -72px; -} - -.icon-step-backward { - background-position: -192px -72px; -} - -.icon-fast-backward { - background-position: -216px -72px; -} - -.icon-backward { - background-position: -240px -72px; -} - -.icon-play { - background-position: -264px -72px; -} - -.icon-pause { - background-position: -288px -72px; -} - -.icon-stop { - background-position: -312px -72px; -} - -.icon-forward { - background-position: -336px -72px; -} - -.icon-fast-forward { - background-position: -360px -72px; -} - -.icon-step-forward { - background-position: -384px -72px; -} - -.icon-eject { - background-position: -408px -72px; -} - -.icon-chevron-left { - background-position: -432px -72px; -} - -.icon-chevron-right { - background-position: -456px -72px; -} - -.icon-plus-sign { - background-position: 0 -96px; -} - -.icon-minus-sign { - background-position: -24px -96px; -} - -.icon-remove-sign { - background-position: -48px -96px; -} - -.icon-ok-sign { - background-position: -72px -96px; -} - -.icon-question-sign { - background-position: -96px -96px; -} - -.icon-info-sign { - background-position: -120px -96px; -} - -.icon-screenshot { - background-position: -144px -96px; -} - -.icon-remove-circle { - background-position: -168px -96px; -} - -.icon-ok-circle { - background-position: -192px -96px; -} - -.icon-ban-circle { - background-position: -216px -96px; -} - -.icon-arrow-left { - background-position: -240px -96px; -} - -.icon-arrow-right { - background-position: -264px -96px; -} - -.icon-arrow-up { - background-position: -289px -96px; -} - -.icon-arrow-down { - background-position: -312px -96px; -} - -.icon-share-alt { - background-position: -336px -96px; -} - -.icon-resize-full { - background-position: -360px -96px; -} - -.icon-resize-small { - background-position: -384px -96px; -} - -.icon-plus { - background-position: -408px -96px; -} - -.icon-minus { - background-position: -433px -96px; -} - -.icon-asterisk { - background-position: -456px -96px; -} - -.icon-exclamation-sign { - background-position: 0 -120px; -} - -.icon-gift { - background-position: -24px -120px; -} - -.icon-leaf { - background-position: -48px -120px; -} - -.icon-fire { - background-position: -72px -120px; -} - -.icon-eye-open { - background-position: -96px -120px; -} - -.icon-eye-close { - background-position: -120px -120px; -} - -.icon-warning-sign { - background-position: -144px -120px; -} - -.icon-plane { - background-position: -168px -120px; -} - -.icon-calendar { - background-position: -192px -120px; -} - -.icon-random { - width: 16px; - background-position: -216px -120px; -} - -.icon-comment { - background-position: -240px -120px; -} - -.icon-magnet { - background-position: -264px -120px; -} - -.icon-chevron-up { - background-position: -288px -120px; -} - -.icon-chevron-down { - background-position: -313px -119px; -} - -.icon-retweet { - background-position: -336px -120px; -} - -.icon-shopping-cart { - background-position: -360px -120px; -} - -.icon-folder-close { - width: 16px; - background-position: -384px -120px; -} - -.icon-folder-open { - width: 16px; - background-position: -408px -120px; -} - -.icon-resize-vertical { - background-position: -432px -119px; -} - -.icon-resize-horizontal { - background-position: -456px -118px; -} - -.icon-hdd { - background-position: 0 -144px; -} - -.icon-bullhorn { - background-position: -24px -144px; -} - -.icon-bell { - background-position: -48px -144px; -} - -.icon-certificate { - background-position: -72px -144px; -} - -.icon-thumbs-up { - background-position: -96px -144px; -} - -.icon-thumbs-down { - background-position: -120px -144px; -} - -.icon-hand-right { - background-position: -144px -144px; -} - -.icon-hand-left { - background-position: -168px -144px; -} - -.icon-hand-up { - background-position: -192px -144px; -} - -.icon-hand-down { - background-position: -216px -144px; -} - -.icon-circle-arrow-right { - background-position: -240px -144px; -} - -.icon-circle-arrow-left { - background-position: -264px -144px; -} - -.icon-circle-arrow-up { - background-position: -288px -144px; -} - -.icon-circle-arrow-down { - background-position: -312px -144px; -} - -.icon-globe { - background-position: -336px -144px; -} - -.icon-wrench { - background-position: -360px -144px; -} - -.icon-tasks { - background-position: -384px -144px; -} - -.icon-filter { - background-position: -408px -144px; -} - -.icon-briefcase { - background-position: -432px -144px; -} - -.icon-fullscreen { - background-position: -456px -144px; -} -*/ -.dropup, -.dropdown { - position: relative; -} - -.dropdown-toggle { - *margin-bottom: -3px; -} - -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; -} - -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - list-style: none; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.dropdown-menu > li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 20px; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus, -.dropdown-submenu:hover > a, -.dropdown-submenu:focus > a { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:hover, -.dropdown-menu > .active > a:focus { - color: #ffffff; - text-decoration: none; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - outline: 0; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0); -} - -.dropdown-menu > .disabled > a, -.dropdown-menu > .disabled > a:hover, -.dropdown-menu > .disabled > a:focus { - color: #999999; -} - -.dropdown-menu > .disabled > a:hover, -.dropdown-menu > .disabled > a:focus { - text-decoration: none; - cursor: default; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.open { - *z-index: 1000; -} - -.open > .dropdown-menu { - display: block; -} - -.dropdown-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 990; -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: ""; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - -webkit-border-radius: 5px 5px 5px 0; - -moz-border-radius: 5px 5px 5px 0; - border-radius: 5px 5px 5px 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.dropdown .dropdown-menu .nav-header { - padding-right: 20px; - padding-left: 20px; -} - -.typeahead { - z-index: 1051; - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -.collapse.in { - height: auto; -} - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 20px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover, -.close:focus { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.4; - filter: alpha(opacity=40); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.btn { - display: inline-block; - *display: inline; - padding: 4px 12px; - margin-bottom: 0; - *margin-left: .3em; - font-size: 14px; - line-height: 20px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - cursor: pointer; - background-color: #f5f5f5; - *background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); - background-repeat: repeat-x; - border: 1px solid #cccccc; - *border: 0; - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-bottom-color: #b3b3b3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn:hover, -.btn:focus, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; -} - -.btn:active, -.btn.active { - background-color: #cccccc \9; -} - -.btn:first-child { - *margin-left: 0; -} - -.btn:hover, -.btn:focus { - color: #333333; - text-decoration: none; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn.active, -.btn:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-large { - padding: 11px 19px; - font-size: 17.5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.btn-large [class^="icon-"], -.btn-large [class*=" icon-"] { - margin-top: 4px; -} - -.btn-small { - padding: 2px 10px; - font-size: 11.9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-small [class^="icon-"], -.btn-small [class*=" icon-"] { - margin-top: 0; -} - -.btn-mini [class^="icon-"], -.btn-mini [class*=" icon-"] { - margin-top: -1px; -} - -.btn-mini { - padding: 0 6px; - font-size: 10.5px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} - -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #006dcc; - *background-color: #0044cc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(to bottom, #0088cc, #0044cc); - background-repeat: repeat-x; - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-primary:hover, -.btn-primary:focus, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #0044cc; - *background-color: #003bb3; -} - -.btn-primary:active, -.btn-primary.active { - background-color: #003399 \9; -} - -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #faa732; - *background-color: #f89406; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-warning:hover, -.btn-warning:focus, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f89406; - *background-color: #df8505; -} - -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} - -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - *background-color: #bd362f; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); - background-repeat: repeat-x; - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-danger:hover, -.btn-danger:focus, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; -} - -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} - -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - *background-color: #51a351; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-success:hover, -.btn-success:focus, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; -} - -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} - -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - *background-color: #2f96b4; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-info:hover, -.btn-info:focus, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; -} - -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} - -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #363636; - *background-color: #222222; - background-image: -moz-linear-gradient(top, #444444, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222)); - background-image: -webkit-linear-gradient(top, #444444, #222222); - background-image: -o-linear-gradient(top, #444444, #222222); - background-image: linear-gradient(to bottom, #444444, #222222); - background-repeat: repeat-x; - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.btn-inverse:hover, -.btn-inverse:focus, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #222222; - *background-color: #151515; -} - -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} - -button.btn, -input[type="submit"].btn { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} - -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} - -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} - -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} - -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-link { - color: #0088cc; - cursor: pointer; - border-color: transparent; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-link:hover, -.btn-link:focus { - color: #005580; - text-decoration: underline; - background-color: transparent; -} - -.btn-link[disabled]:hover, -.btn-link[disabled]:focus { - color: #333333; - text-decoration: none; -} - -.btn-group { - position: relative; - display: inline-block; - *display: inline; - *margin-left: .3em; - font-size: 0; - white-space: nowrap; - vertical-align: middle; - *zoom: 1; -} - -.btn-group:first-child { - *margin-left: 0; -} - -.btn-group + .btn-group { - margin-left: 5px; -} - -.btn-toolbar { - margin-top: 10px; - margin-bottom: 10px; - font-size: 0; -} - -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group { - margin-left: 5px; -} - -.btn-group > .btn { - position: relative; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group > .btn + .btn { - margin-left: -1px; -} - -.btn-group > .btn, -.btn-group > .dropdown-menu, -.btn-group > .popover { - font-size: 14px; -} - -.btn-group > .btn-mini { - font-size: 10.5px; -} - -.btn-group > .btn-small { - font-size: 11.9px; -} - -.btn-group > .btn-large { - font-size: 17.5px; -} - -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group > .btn + .dropdown-toggle { - *padding-top: 5px; - padding-right: 8px; - *padding-bottom: 5px; - padding-left: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group > .btn-mini + .dropdown-toggle { - *padding-top: 2px; - padding-right: 5px; - *padding-bottom: 2px; - padding-left: 5px; -} - -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} - -.btn-group > .btn-large + .dropdown-toggle { - *padding-top: 7px; - padding-right: 12px; - *padding-bottom: 7px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; -} - -.btn-group.open .btn-primary.dropdown-toggle { - background-color: #0044cc; -} - -.btn-group.open .btn-warning.dropdown-toggle { - background-color: #f89406; -} - -.btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; -} - -.btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; -} - -.btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; -} - -.btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; -} - -.btn .caret { - margin-top: 8px; - margin-left: 0; -} - -.btn-large .caret { - margin-top: 6px; -} - -.btn-large .caret { - border-top-width: 5px; - border-right-width: 5px; - border-left-width: 5px; -} - -.btn-mini .caret, -.btn-small .caret { - margin-top: 8px; -} - -.dropup .btn-large .caret { - border-bottom-width: 5px; -} - -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.btn-group-vertical { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} - -.btn-group-vertical > .btn { - display: block; - float: none; - max-width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.btn-group-vertical > .btn + .btn { - margin-top: -1px; - margin-left: 0; -} - -.btn-group-vertical > .btn:first-child { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.btn-group-vertical > .btn:last-child { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.btn-group-vertical > .btn-large:first-child { - -webkit-border-radius: 6px 6px 0 0; - -moz-border-radius: 6px 6px 0 0; - border-radius: 6px 6px 0 0; -} - -.btn-group-vertical > .btn-large:last-child { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.alert, -.alert h4 { - color: #c09853; -} - -.alert h4 { - margin: 0; -} - -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 20px; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-success h4 { - color: #468847; -} - -.alert-danger, -.alert-error { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-danger h4, -.alert-error h4 { - color: #b94a48; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-info h4 { - color: #3a87ad; -} - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - -.nav { - margin-bottom: 20px; - margin-left: 0; - list-style: none; -} - -.nav > li > a { - display: block; -} - -.nav > li > a:hover, -.nav > li > a:focus { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > li > a > img { - max-width: none; -} - -.nav > .pull-right { - float: right; -} - -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 20px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} - -.nav li + .nav-header { - margin-top: 9px; -} - -.nav-list { - padding-right: 15px; - padding-left: 15px; - margin-bottom: 0; -} - -.nav-list > li > a, -.nav-list .nav-header { - margin-right: -15px; - margin-left: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} - -.nav-list > li > a { - padding: 3px 15px; -} - -.nav-list > .active > a, -.nav-list > .active > a:hover, -.nav-list > .active > a:focus { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} - -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - margin-right: 2px; -} - -.nav-list .divider { - *width: 100%; - height: 1px; - margin: 9px 1px; - *margin: -5px 0 5px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; -} - -.nav-tabs, -.nav-pills { - *zoom: 1; -} - -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - line-height: 0; - content: ""; -} - -.nav-tabs:after, -.nav-pills:after { - clear: both; -} - -.nav-tabs > li, -.nav-pills > li { - float: left; -} - -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} - -.nav-tabs { - border-bottom: 1px solid #ddd; -} - -.nav-tabs > li { - margin-bottom: -1px; -} - -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 20px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover, -.nav-tabs > li > a:focus { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover, -.nav-tabs > .active > a:focus { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} - -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} - -.nav-pills > .active > a, -.nav-pills > .active > a:hover, -.nav-pills > .active > a:focus { - color: #ffffff; - background-color: #0088cc; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li > a { - margin-right: 0; -} - -.nav-tabs.nav-stacked { - border-bottom: 0; -} - -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; -} - -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomright: 4px; - -moz-border-radius-bottomleft: 4px; -} - -.nav-tabs.nav-stacked > li > a:hover, -.nav-tabs.nav-stacked > li > a:focus { - z-index: 2; - border-color: #ddd; -} - -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} - -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} - -.nav-tabs .dropdown-menu { - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; -} - -.nav-pills .dropdown-menu { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.nav .dropdown-toggle .caret { - margin-top: 6px; - border-top-color: #0088cc; - border-bottom-color: #0088cc; -} - -.nav .dropdown-toggle:hover .caret, -.nav .dropdown-toggle:focus .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} - -/* move down carets for tabs */ - -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} - -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.nav > .dropdown.active > a:hover, -.nav > .dropdown.active > a:focus { - cursor: pointer; -} - -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover, -.nav > li.dropdown.open.active > a:focus { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} - -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret, -.nav li.dropdown.open a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} - -.tabs-stacked .open > a:hover, -.tabs-stacked .open > a:focus { - border-color: #999999; -} - -.tabbable { - *zoom: 1; -} - -.tabbable:before, -.tabbable:after { - display: table; - line-height: 0; - content: ""; -} - -.tabbable:after { - clear: both; -} - -.tab-content { - overflow: auto; -} - -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} - -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} - -.tabs-below > .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} - -.tabs-below > .nav-tabs > li > a:hover, -.tabs-below > .nav-tabs > li > a:focus { - border-top-color: #ddd; - border-bottom-color: transparent; -} - -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover, -.tabs-below > .nav-tabs > .active > a:focus { - border-color: transparent #ddd #ddd #ddd; -} - -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} - -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} - -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} - -.tabs-left > .nav-tabs > li > a:hover, -.tabs-left > .nav-tabs > li > a:focus { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} - -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover, -.tabs-left > .nav-tabs .active > a:focus { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} - -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} - -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} - -.tabs-right > .nav-tabs > li > a:hover, -.tabs-right > .nav-tabs > li > a:focus { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} - -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover, -.tabs-right > .nav-tabs .active > a:focus { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} - -.nav > .disabled > a { - color: #999999; -} - -.nav > .disabled > a:hover, -.nav > .disabled > a:focus { - text-decoration: none; - cursor: default; - background-color: transparent; -} - -.navbar { - *position: relative; - *z-index: 2; - margin-bottom: 20px; - overflow: visible; -} - -.navbar-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} - -.navbar-inner:before, -.navbar-inner:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-inner:after { - clear: both; -} - -.navbar .container { - width: auto; -} - -.nav-collapse.collapse { - height: auto; - overflow: visible; -} - -.navbar .brand { - display: block; - float: left; - padding: 10px 20px 10px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - color: #777777; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .brand:hover, -.navbar .brand:focus { - text-decoration: none; -} - -.navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #777777; -} - -.navbar-link { - color: #777777; -} - -.navbar-link:hover, -.navbar-link:focus { - color: #333333; -} - -.navbar .divider-vertical { - height: 40px; - margin: 0 9px; - border-right: 1px solid #ffffff; - border-left: 1px solid #f2f2f2; -} - -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} - -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn, -.navbar .input-prepend .btn-group, -.navbar .input-append .btn-group { - margin-top: 0; -} - -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} - -.navbar-form:before, -.navbar-form:after { - display: table; - line-height: 0; - content: ""; -} - -.navbar-form:after { - clear: both; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} - -.navbar-form input, -.navbar-form select, -.navbar-form .btn { - display: inline-block; - margin-bottom: 0; -} - -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} - -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 5px; - white-space: nowrap; -} - -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} - -.navbar-search { - position: relative; - float: left; - margin-top: 5px; - margin-bottom: 0; -} - -.navbar-search .search-query { - padding: 4px 14px; - margin-bottom: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.navbar-static-top { - position: static; - margin-bottom: 0; -} - -.navbar-static-top .navbar-inner { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; -} - -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-right: 0; - padding-left: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} - -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} - -.navbar-fixed-top { - top: 0; -} - -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar-fixed-bottom { - bottom: 0; -} - -.navbar-fixed-bottom .navbar-inner { - -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1); -} - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} - -.navbar .nav.pull-right { - float: right; - margin-right: 0; -} - -.navbar .nav > li { - float: left; -} - -.navbar .nav > li > a { - float: none; - padding: 10px 15px 10px; - color: #777777; - text-decoration: none; - text-shadow: 0 1px 0 #ffffff; -} - -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; -} - -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - color: #333333; - text-decoration: none; - background-color: transparent; -} - -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: #555555; - text-decoration: none; - background-color: #e5e5e5; - -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -} - -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-right: 5px; - margin-left: 5px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ededed; - *background-color: #e5e5e5; - background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5); - background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5); - background-repeat: repeat-x; - border-color: #e5e5e5 #e5e5e5 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} - -.navbar .btn-navbar:hover, -.navbar .btn-navbar:focus, -.navbar .btn-navbar:active, -.navbar .btn-navbar.active, -.navbar .btn-navbar.disabled, -.navbar .btn-navbar[disabled] { - color: #ffffff; - background-color: #e5e5e5; - *background-color: #d9d9d9; -} - -.navbar .btn-navbar:active, -.navbar .btn-navbar.active { - background-color: #cccccc \9; -} - -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} - -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - -.navbar .nav > li > .dropdown-menu:before { - position: absolute; - top: -7px; - left: 9px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.navbar .nav > li > .dropdown-menu:after { - position: absolute; - top: -6px; - left: 10px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ''; -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:before { - top: auto; - bottom: -7px; - border-top: 7px solid #ccc; - border-bottom: 0; - border-top-color: rgba(0, 0, 0, 0.2); -} - -.navbar-fixed-bottom .nav > li > .dropdown-menu:after { - top: auto; - bottom: -6px; - border-top: 6px solid #ffffff; - border-bottom: 0; -} - -.navbar .nav li.dropdown > a:hover .caret, -.navbar .nav li.dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - color: #555555; - background-color: #e5e5e5; -} - -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:before, -.navbar .nav > li > .dropdown-menu.pull-right:before { - right: 12px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu:after, -.navbar .nav > li > .dropdown-menu.pull-right:after { - right: 13px; - left: auto; -} - -.navbar .pull-right > li > .dropdown-menu .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu { - right: 100%; - left: auto; - margin-right: -1px; - margin-left: 0; - -webkit-border-radius: 6px 0 6px 6px; - -moz-border-radius: 6px 0 6px 6px; - border-radius: 6px 0 6px 6px; -} - -.navbar-inverse .navbar-inner { - background-color: #1b1b1b; - background-image: -moz-linear-gradient(top, #222222, #111111); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111)); - background-image: -webkit-linear-gradient(top, #222222, #111111); - background-image: -o-linear-gradient(top, #222222, #111111); - background-image: linear-gradient(to bottom, #222222, #111111); - background-repeat: repeat-x; - border-color: #252525; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0); -} - -.navbar-inverse .brand, -.navbar-inverse .nav > li > a { - color: #999999; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} - -.navbar-inverse .brand:hover, -.navbar-inverse .nav > li > a:hover, -.navbar-inverse .brand:focus, -.navbar-inverse .nav > li > a:focus { - color: #ffffff; -} - -.navbar-inverse .brand { - color: #999999; -} - -.navbar-inverse .navbar-text { - color: #999999; -} - -.navbar-inverse .nav > li > a:focus, -.navbar-inverse .nav > li > a:hover { - color: #ffffff; - background-color: transparent; -} - -.navbar-inverse .nav .active > a, -.navbar-inverse .nav .active > a:hover, -.navbar-inverse .nav .active > a:focus { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .navbar-link { - color: #999999; -} - -.navbar-inverse .navbar-link:hover, -.navbar-inverse .navbar-link:focus { - color: #ffffff; -} - -.navbar-inverse .divider-vertical { - border-right-color: #222222; - border-left-color: #111111; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - color: #ffffff; - background-color: #111111; -} - -.navbar-inverse .nav li.dropdown > a:hover .caret, -.navbar-inverse .nav li.dropdown > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-search .search-query { - color: #ffffff; - background-color: #515151; - border-color: #111111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -o-transition: none; - transition: none; -} - -.navbar-inverse .navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} - -.navbar-inverse .navbar-search .search-query:focus, -.navbar-inverse .navbar-search .search-query.focused { - padding: 5px 15px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - outline: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); -} - -.navbar-inverse .btn-navbar { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e0e0e; - *background-color: #040404; - background-image: -moz-linear-gradient(top, #151515, #040404); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404)); - background-image: -webkit-linear-gradient(top, #151515, #040404); - background-image: -o-linear-gradient(top, #151515, #040404); - background-image: linear-gradient(to bottom, #151515, #040404); - background-repeat: repeat-x; - border-color: #040404 #040404 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0); - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.navbar-inverse .btn-navbar:hover, -.navbar-inverse .btn-navbar:focus, -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active, -.navbar-inverse .btn-navbar.disabled, -.navbar-inverse .btn-navbar[disabled] { - color: #ffffff; - background-color: #040404; - *background-color: #000000; -} - -.navbar-inverse .btn-navbar:active, -.navbar-inverse .btn-navbar.active { - background-color: #000000 \9; -} - -.breadcrumb { - padding: 8px 15px; - margin: 0 0 20px; - list-style: none; - background-color: #f5f5f5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.breadcrumb > li { - display: inline-block; - *display: inline; - text-shadow: 0 1px 0 #ffffff; - *zoom: 1; -} - -.breadcrumb > li > .divider { - padding: 0 5px; - color: #ccc; -} - -.breadcrumb > .active { - color: #999999; -} - -.pagination { - margin: 20px 0; -} - -.pagination ul { - display: inline-block; - *display: inline; - margin-bottom: 0; - margin-left: 0; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - *zoom: 1; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.pagination ul > li { - display: inline; -} - -.pagination ul > li > a, -.pagination ul > li > span { - float: left; - padding: 4px 12px; - line-height: 20px; - text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; - border-left-width: 0; -} - -.pagination ul > li > a:hover, -.pagination ul > li > a:focus, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: #f5f5f5; -} - -.pagination ul > .active > a, -.pagination ul > .active > span { - color: #999999; - cursor: default; -} - -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover, -.pagination ul > .disabled > a:focus { - color: #999999; - cursor: default; - background-color: transparent; -} - -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - -moz-border-radius-topleft: 4px; -} - -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-bottomright: 4px; -} - -.pagination-centered { - text-align: center; -} - -.pagination-right { - text-align: right; -} - -.pagination-large ul > li > a, -.pagination-large ul > li > span { - padding: 11px 19px; - font-size: 17.5px; -} - -.pagination-large ul > li:first-child > a, -.pagination-large ul > li:first-child > span { - -webkit-border-bottom-left-radius: 6px; - border-bottom-left-radius: 6px; - -webkit-border-top-left-radius: 6px; - border-top-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - -moz-border-radius-topleft: 6px; -} - -.pagination-large ul > li:last-child > a, -.pagination-large ul > li:last-child > span { - -webkit-border-top-right-radius: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - border-bottom-right-radius: 6px; - -moz-border-radius-topright: 6px; - -moz-border-radius-bottomright: 6px; -} - -.pagination-mini ul > li:first-child > a, -.pagination-small ul > li:first-child > a, -.pagination-mini ul > li:first-child > span, -.pagination-small ul > li:first-child > span { - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-bottomleft: 3px; - -moz-border-radius-topleft: 3px; -} - -.pagination-mini ul > li:last-child > a, -.pagination-small ul > li:last-child > a, -.pagination-mini ul > li:last-child > span, -.pagination-small ul > li:last-child > span { - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; -} - -.pagination-small ul > li > a, -.pagination-small ul > li > span { - padding: 2px 10px; - font-size: 11.9px; -} - -.pagination-mini ul > li > a, -.pagination-mini ul > li > span { - padding: 0 6px; - font-size: 10.5px; -} - -.pager { - margin: 20px 0; - text-align: center; - list-style: none; - *zoom: 1; -} - -.pager:before, -.pager:after { - display: table; - line-height: 0; - content: ""; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} - -.pager li > a:hover, -.pager li > a:focus { - text-decoration: none; - background-color: #f5f5f5; -} - -.pager .next > a, -.pager .next > span { - float: right; -} - -.pager .previous > a, -.pager .previous > span { - float: left; -} - -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > a:focus, -.pager .disabled > span { - color: #999999; - cursor: default; - background-color: #fff; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; -} - -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.modal { - position: fixed; - top: 10%; - left: 50%; - z-index: 1050; - width: 560px; - margin-left: -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.modal.fade { - top: -25%; - -webkit-transition: opacity 0.3s linear, top 0.3s ease-out; - -moz-transition: opacity 0.3s linear, top 0.3s ease-out; - -o-transition: opacity 0.3s linear, top 0.3s ease-out; - transition: opacity 0.3s linear, top 0.3s ease-out; -} - -.modal.fade.in { - top: 10%; -} - -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} - -.modal-header .close { - margin-top: 2px; -} - -.modal-header h3 { - margin: 0; - line-height: 30px; -} - -.modal-body { - position: relative; - max-height: 400px; - padding: 15px; - overflow-y: auto; -} - -.modal-form { - margin-bottom: 0; -} - -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - line-height: 0; - content: ""; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} - -.tooltip { - position: absolute; - z-index: 1030; - display: block; - font-size: 11px; - line-height: 1.4; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} - -.tooltip.top { - padding: 5px 0; - margin-top: -3px; -} - -.tooltip.right { - padding: 0 5px; - margin-left: 3px; -} - -.tooltip.bottom { - padding: 5px 0; - margin-top: 3px; -} - -.tooltip.left { - padding: 0 5px; - margin-left: -3px; -} - -.tooltip-inner { - max-width: 200px; - padding: 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - max-width: 276px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.popover.top { - margin-top: -10px; -} - -.popover.right { - margin-left: 10px; -} - -.popover.bottom { - margin-top: 10px; -} - -.popover.left { - margin-left: -10px; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - -webkit-border-radius: 5px 5px 0 0; - -moz-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; -} - -.popover-title:empty { - display: none; -} - -.popover-content { - padding: 9px 14px; -} - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.popover .arrow { - border-width: 11px; -} - -.popover .arrow:after { - border-width: 10px; - content: ""; -} - -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; -} - -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; -} - -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; -} - -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; -} - -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; -} - -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; -} - -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; -} - -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; -} - -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} - -.thumbnails:before, -.thumbnails:after { - display: table; - line-height: 0; - content: ""; -} - -.thumbnails:after { - clear: both; -} - -.row-fluid .thumbnails { - margin-left: 0; -} - -.thumbnails > li { - float: left; - margin-bottom: 20px; - margin-left: 20px; -} - -.thumbnail { - display: block; - padding: 4px; - line-height: 20px; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055); - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -a.thumbnail:hover, -a.thumbnail:focus { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} - -.thumbnail > img { - display: block; - max-width: 100%; - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; - color: #555555; -} - -.media, -.media-body { - overflow: hidden; - *overflow: visible; - zoom: 1; -} - -.media, -.media .media { - margin-top: 15px; -} - -.media:first-child { - margin-top: 0; -} - -.media-object { - display: block; -} - -.media-heading { - margin: 0 0 5px; -} - -.media > .pull-left { - margin-right: 10px; -} - -.media > .pull-right { - margin-left: 10px; -} - -.media-list { - margin-left: 0; - list-style: none; -} - -.label, -.badge { - display: inline-block; - padding: 2px 4px; - font-size: 11.844px; - font-weight: bold; - line-height: 14px; - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; -} - -.label { - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.badge { - padding-right: 9px; - padding-left: 9px; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} - -.label:empty, -.badge:empty { - display: none; -} - -a.label:hover, -a.label:focus, -a.badge:hover, -a.badge:focus { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label-important, -.badge-important { - background-color: #b94a48; -} - -.label-important[href], -.badge-important[href] { - background-color: #953b39; -} - -.label-warning, -.badge-warning { - background-color: #f89406; -} - -.label-warning[href], -.badge-warning[href] { - background-color: #c67605; -} - -.label-success, -.badge-success { - background-color: #468847; -} - -.label-success[href], -.badge-success[href] { - background-color: #356635; -} - -.label-info, -.badge-info { - background-color: #3a87ad; -} - -.label-info[href], -.badge-info[href] { - background-color: #2d6987; -} - -.label-inverse, -.badge-inverse { - background-color: #333333; -} - -.label-inverse[href], -.badge-inverse[href] { - background-color: #1a1a1a; -} - -.btn .label, -.btn .badge { - position: relative; - top: -1px; -} - -.btn-mini .label, -.btn-mini .badge { - top: 0; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress .bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - color: #ffffff; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress .bar + .bar { - -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); -} - -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} - -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-danger .bar, -.progress .bar-danger { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); -} - -.progress-danger.progress-striped .bar, -.progress-striped .bar-danger { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-success .bar, -.progress .bar-success { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(to bottom, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); -} - -.progress-success.progress-striped .bar, -.progress-striped .bar-success { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-info .bar, -.progress .bar-info { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); -} - -.progress-info.progress-striped .bar, -.progress-striped .bar-info { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-warning .bar, -.progress .bar-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(to bottom, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); -} - -.progress-warning.progress-striped .bar, -.progress-striped .bar-warning { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.accordion { - margin-bottom: 20px; -} - -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.accordion-heading { - border-bottom: 0; -} - -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -.accordion-toggle { - cursor: pointer; -} - -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} - -.carousel { - position: relative; - margin-bottom: 20px; - line-height: 1; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel-inner > .item > img, -.carousel-inner > .item > a > img { - display: block; - line-height: 1; -} - -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - display: block; -} - -.carousel-inner > .active { - left: 0; -} - -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel-inner > .next { - left: 100%; -} - -.carousel-inner > .prev { - left: -100%; -} - -.carousel-inner > .next.left, -.carousel-inner > .prev.right { - left: 0; -} - -.carousel-inner > .active.left { - left: -100%; -} - -.carousel-inner > .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.right { - right: 15px; - left: auto; -} - -.carousel-control:hover, -.carousel-control:focus { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-indicators { - position: absolute; - top: 15px; - right: 15px; - z-index: 5; - margin: 0; - list-style: none; -} - -.carousel-indicators li { - display: block; - float: left; - width: 10px; - height: 10px; - margin-left: 5px; - text-indent: -999px; - background-color: #ccc; - background-color: rgba(255, 255, 255, 0.25); - border-radius: 5px; -} - -.carousel-indicators .active { - background-color: #fff; -} - -.carousel-caption { - position: absolute; - right: 0; - bottom: 0; - left: 0; - padding: 15px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} - -.carousel-caption h4, -.carousel-caption p { - line-height: 20px; - color: #ffffff; -} - -.carousel-caption h4 { - margin: 0 0 5px; -} - -.carousel-caption p { - margin-bottom: 0; -} - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - font-size: 18px; - font-weight: 200; - line-height: 30px; - color: inherit; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} - -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; - color: inherit; -} - -.hero-unit li { - line-height: 30px; -} - -.pull-right { - float: right; -} - -.pull-left { - float: left; -} - -.hide { - display: none; -} - -.show { - display: block; -} - -.invisible { - visibility: hidden; -} - -.affix { - position: fixed; -} diff --git a/nailgun/static/css/fonticon.css b/nailgun/static/css/fonticon.css deleted file mode 100644 index 2148f5fce..000000000 --- a/nailgun/static/css/fonticon.css +++ /dev/null @@ -1,87 +0,0 @@ -@charset "UTF-8"; - - @font-face { - font-family: 'fontello'; - src: url('../font/fontello.eot?86495975'); - src: url('../font/fontello.eot?86495975#iefix') format('embedded-opentype'), - url('../font/fontello.woff?86495975') format('woff'), - url('../font/fontello.ttf?86495975') format('truetype'), - url('../font/fontello.svg?86495975#fontello') format('svg'); - font-weight: normal; - font-style: normal; -} -/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ -/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ -/* -@media screen and (-webkit-min-device-pixel-ratio:0) { - @font-face { - font-family: 'fontello'; - src: url('../font/fontello.svg?86495975#fontello') format('svg'); - } -} -*/ - - [class^="icon-"]:before, [class*=" icon-"]:before { - font-family: "fontello"; - font-style: normal; - font-weight: normal; - speak: none; - - display: inline-block; - text-decoration: inherit; - width: 1em; - margin-right: .2em; - text-align: center; - /* opacity: .8; */ - - /* For safety - reset parent styles, that can break glyph codes*/ - font-variant: normal; - text-transform: none; - - /* fix buttons height, for twitter bootstrap */ - line-height: 1em; - - /* Animation center compensation - margins should be symmetric */ - /* remove if not needed */ - margin-left: .2em; - - /* you can be more comfortable with increased icons size */ - /* font-size: 120%; */ - - /* Uncomment for 3D effect */ - /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ -} - -.icon-plus:before { content: '\2b'; } /* '+' */ -.icon-minus:before { content: '\2d'; } /* '-' */ -.icon-expand:before { content: '\229e'; } /* '⊞' */ -.icon-collapse:before { content: '\229f'; } /* '⊟' */ -.icon-settings:before { content: '\2699'; } /* '⚙' */ -.icon-attention:before { content: '\26a0'; } /* '⚠' */ -.icon-edit:before { content: '\270e'; } /* '✎' */ -.icon-ok:before { content: '\2713'; } /* '✓' */ -.icon-ok-circle:before { content: '\2714'; } /* '✔' */ -.icon-cancel:before { content: '\2715'; } /* '✕' */ -.icon-cancel-circle:before { content: '\e800'; } /* '' */ -.icon-plus-circle:before { content: '\2795'; } /* '➕' */ -.icon-minus-circle:before { content: '\2796'; } /* '➖' */ -.icon-ok-circle-empty:before { content: '\e702'; } /* '' */ -.icon-cancel-empty:before { content: '\e703'; } /* '' */ -.icon-help-circled:before { content: '\e704'; } /* '' */ -.icon-info-circled:before { content: '\e705'; } /* '' */ -.icon-eye:before { content: '\e806'; } /* '' */ -.icon-eye-off:before { content: '\e805'; } /* '' */ -.icon-upload-cloud:before { content: '\e711'; } /* '' */ -.icon-comment:before { content: '\e718'; } /* '' */ -.icon-logs:before { content: '\e730'; } /* '' */ -.icon-arrows-cw:before { content: '\e760'; } /* '' */ -.icon-back-in-time:before { content: '\e771'; } /* '' */ -.icon-install:before { content: '\e778'; } /* '' */ -.icon-process:before { content: '\e803'; } /* '' */ -.icon-passed:before { content: '\e801'; } /* '' */ -.icon-failed:before { content: '\e802'; } /* '' */ -.icon-user:before { content: '\1f464'; } /* '👤' */ -.icon-bell:before { content: '\1f514'; } /* '🔔' */ -.icon-clock:before { content: '\1f554'; } /* '🕔' */ -.icon-block:before { content: '\1f6ab'; } /* '🚫' */ -.icon-clock-1:before { content: '\e804'; } /* '' */ diff --git a/nailgun/static/css/main.css b/nailgun/static/css/main.css deleted file mode 100755 index 4ed5fcf11..000000000 --- a/nailgun/static/css/main.css +++ /dev/null @@ -1,4436 +0,0 @@ -@import 'fonticon.css'; -@import 'bootstrap.css'; - -html { - background-color: #39444F; - background-image: url(../img/bg-main.png); - background-repeat: repeat; - font-family: 'Segoe UI', Arial, 'Helvetica Neue', Helvetica, Oswald, Verdana, Tahoma, Arial, san-serif; - height: 100%; -} - -body { - overflow-y: scroll; - background: -moz-radial-gradient(center top, rgba(128, 134, 143, 0.3) 0%, rgba(128, 134, 143, 0.3) 30%, rgba(128, 134, 143, 0.0) 55%); - background: -webkit-gradient(radial, center top, 0, center top, 30%, center top, 55%, color-stop(100%,rgba(128, 134, 143, 0.3)), color-stop(100%,rgba(128, 134, 143, 0.3)), color-stop(100%,rgba(128, 134, 143, 0.0))); - background: -webkit-radial-gradient(center top, rgba(128, 134, 143, 0.3) 0%, rgba(128, 134, 143, 0.3) 30%, rgba(128, 134, 143, 0.0) 55%); - background: -o-radial-gradient(center top, rgba(128, 134, 143, 0.3) 0%, rgba(128, 134, 143, 0.3) 30%, rgba(128, 134, 143, 0.0) 55%); - background: -ms-radial-gradient(center top, rgba(128, 134, 143, 0.3) 0%, rgba(128, 134, 143, 0.3) 30%, rgba(128, 134, 143, 0.0) 55%); - background: radial-gradient(center top, rgba(128, 134, 143, 0.3) 0%, rgba(128, 134, 143, 0.3) 30%, rgba(128, 134, 143, 0.0) 55%); - font-family: 'Segoe UI', Arial, 'Helvetica Neue', Helvetica, Oswald, Verdana, Tahoma, Arial, san-serif; - -webkit-font-smoothing: antialiased; - height: 100%; - -webkit-user-select: none; - -moz-user-select: -moz-none; - -ms-user-select: none; - user-select: none; -} - -button { - font-family: 'Segoe UI', Arial, 'Helvetica Neue', Helvetica, Oswald, Verdana, Tahoma, Arial, san-serif; -} - -.btn { - padding: 3px 12px 5px; -} - -.enable-selection { - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; -} - -.center { - text-align: center !important; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: "Segoe UI Light", "Segoe UI", Helvetica, Georgia, Tahoma, Arial; - font-weight: 100; -} - -h1.page-title, -h2.page-title, -h3.page-title, -h4.page-title, -h5.page-title, -h6.page-title { - color: #ffffff; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.35); - display: inline-block; -} - -.page-sub-title {margin-top: 10px; margin-bottom: 19px;} -.page-sub-title .select-all {margin-top: 12px;} -.page-sub-title .action-btn {margin-top: 7px;} - -.container, -#footer, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - /* width: 982px; */ - /* width: 940px; */ - width: 1030px; -} - -/* Navigation */ -.navigation-bar { - margin-top: -1px; - margin-bottom: 10px; - display: block; - width: 100%; - height: 47px; - border: solid 1px #1f2328; - border-radius: 0px 0px 4px 4px; - overflow: hidden; - color: #999999; - font-weight: 200; - - -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.55), inset 0 -5px rgba(34,34,35,.75); - -moz-box-shadow: 0 3px 9px rgba(0,0,0,.55), inset 0 -5px rgba(34,34,35,.75); - box-shadow: 0 3px 9px rgba(0,0,0,.55), inset 0 -5px rgba(34,34,35,.75); - - background: url(../img/nav_bg.png) repeat-x top left; - /* - background-image: -webkit-linear-gradient(top, #555, #333); - background-image: -moz-linear-gradient(top, #555, #333); - background-image: -o-linear-gradient(top, #555, #333); - background-image: -ms-linear-gradient(top, #555, #333); - background-image: linear-gradient(to bottom, #555, #333); - */ - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -.navigation-bar-box { - display: block; - width: 100%; - height: 40px; - overflow: hidden; - - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - - -webkit-box-shadow: 0 2px 6px rgba(0,0,0,.0), inset 0 1px rgba(255,255,255,.1); - -moz-box-shadow: 0 2px 6px rgba(0,0,0,.0), inset 0 1px rgba(255,255,255,.1); - box-shadow: 0 2px 6px rgba(0,0,0,.0), inset 0 1px rgba(255,255,255,.1); -} - -.navigation-bar-ul { - margin: 0px; - padding: 0px; -} - -.navigation-bar-ul > li { - display: block; - overflow: hidden; - height: 40px; - font-size: 14px; - font-weight: 400; - float: left; - border-left: 1px solid #7789a0; - border-right: 1px solid #3c3c3c; - -webkit-font-smoothing: subpixel-antialiased; -} - -.navigation-bar-ul > .product-logo { - font-weight: 800; - font-size: 16px; - color: #ffffff; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); -} - -.navigation-bar-ul > .product-logo a { - margin: 0px; - padding: 0px 20px 0px 20px; -} - -.navigation-bar-ul > .product-logo a .logo { - display: block; - width: 92px; - height: 40px; - background: url(../img/product-logo.png) no-repeat top left; - -} - -.navigation-bar-ul > li:first-child {border-left: none;} - - -.navigation-bar-ul li:after {clear: both;} - -.navigation-bar-ul li a { - display: block; - width: 100%; - height: 100%; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - overflow: hidden; - padding: 10px 20px 0px 20px; - color: #bbbbbb; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); -} - -.navigation-bar-ul li.product-logo a { - color: #FFFFFF; -} - -.navigation-bar-ul li a:hover { - display: block; - width: 100%; - height: 100%; - color: #ffffff; - text-decoration: none; - background-image: -webkit-linear-gradient(top, #6f7e95, #586476); - background-image: -moz-linear-gradient(top, #6f7e95, #586476); - background-image: -o-linear-gradient(top, #6f7e95, #586476); - background-image: -ms-linear-gradient(top, #6f7e95, #586476); - background-image: linear-gradient(to bottom, #6f7e95, #586476); - /* - -webkit-box-shadow: 0 2px 6px rgba(0,0,0,.0), inset 0px 6px rgba(255,255,255,.5); - -moz-box-shadow: 0 2px 6px rgba(0,0,0,.0), inset 0 1px rgba(255,255,255,.1); - box-shadow: 0 2px 6px rgba(0,0,0,.0), inset 0px 4px 8px rgba(0,0,0,.3); - */ -} - -.navigation-bar-ul .space {border-right: none;} - -.navigation-bar-ul .active { - color: #dadada; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0); - background: -moz-linear-gradient(top, rgba(0,0,0,0.45) 0%, rgba(0,0,0,0) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0.45)), color-stop(100%,rgba(0,0,0,0))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(0,0,0,0.45) 0%,rgba(0,0,0,0) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(0,0,0,0.45) 0%,rgba(0,0,0,0) 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, rgba(0,0,0,0.45) 0%,rgba(0,0,0,0) 100%); /* IE10+ */ - background: linear-gradient(to bottom, rgba(0,0,0,0.45) 0%,rgba(0,0,0,0) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#a6000000', endColorstr='#00000000',GradientType=0 ); /* IE6-9 */ -} - -.navigation-bar-icon { - float: right !important; - border: none !important; -} - -.navigation-bar-icon i { - color: #2b3139; - font-size: 32px; - display: block; - width: 100%; - height: 100%; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - padding: 6px 10px 0px 20px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2); - cursor: pointer; - } - .navigation-bar-icon i:hover { - color: #1a1d22; - /* text-shadow: 0 1px 1px rgba(0, 1px, 0, 0.5); */ -} -.navigation-bar-icon .badge { - position: relative; - top: -34px; - left: 36px; - padding: 1px 6px 1px 5px; - cursor: pointer; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - background-color: #cc2229; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.45), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.45), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 2px rgba(0,0,0,.45), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #cf600e; - background-image: -webkit-linear-gradient(bottom, #f46705, #f9841f); - background-image: -moz-linear-gradient(bottom, #f46705, #f9841f); - background-image: -o-linear-gradient(bottom, #f46705, #f9841f); - background-image: -ms-linear-gradient(bottom, #f46705, #f9841f); - background-image: linear-gradient(to top, #f46705, #f9841f); - -} - -/* footer */ -#wrap { - min-height: 100%; - height: auto !important; - height: 100%; - /* Negative indent footer by it's height */ - margin: 0 auto -70px; -} - -#push, #footer { - height: 70px; -} - -#footer { - display: block; - margin-right: auto; - margin-left: auto; - cursor: default; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -#footer:after { - clear: both; -} - -.footer-box { - background: rgba(0,0,0,0.1); - border-radius: 4px; - height: 50px; -} - -.footer-logo { - display: block; - float: left; - width: 67px; - height: 34px; - background: url(../img/mirantis-logo-small2.png) no-repeat top left; - margin: 8px 0px 0px 10px; - overflow: hidden; - cursor: pointer; -} - -.footer-logo:hover { - display: block; - float: left; - width: 67px; - height: 34px; - background: url(../img/mirantis-logo-small2.png) no-repeat 0px -34px; - margin: 8px 0px 0px 10px; - overflow: hidden; -} - -.footer-copyright { - display: block; - padding: 14px 20px 0px 20px; - color: #f0f0f0; - font-size: 11px; - margin-top: 0px; -} - -.footer-version { - display: block; - padding: 14px 20px 0px 20px; - color: #7789a0; - font-size: 11px; - margin-top: 0px; -} - -.roles-action-link { - padding-top: 8px; -} - -.roles-action-link button { - /* color: #999999; */ -} - -.roles-action-link button.disabled { - color: #999999; - opacity: 1; - background-color: transparent; -} - -.roles-action-link button:hover { - /* color: #666666; */ - text-decoration: none; -} - -.roles-action-link button.disabled:hover { - color: #999999; -} - -/* White Box for Cluster content*/ -.whitebox { - display: block; - width: 100%; - margin: 60px 0px 20px 0px; - padding: 20px 0px 20px 0px; - - /* padding: 20px; */ - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - - background-color: #ffffff; - border: 1px solid #52555a; - - -webkit-border-radius: 4px; - -webkit-border-top-left-radius: 0; - -moz-border-radius: 4px; - -moz-border-radius-topleft: 0; - - border-radius: 4px; - border-top-left-radius: 0; -} - -.whitebox hr { - border-width: 1px 0 0 0; - margin: 10px 0 15px 0; -} - -.roles-block-row { - margin-left: -20px; - padding: 0 20px 3px; - *zoom: 1; -} - -.roles-block-row:before, .roles-block-row:after { - display: table; - line-height: 0; - content: ""; -} - -.roles-block-row:after { - clear: both; -} - -.tab-pane h3 { - color: #333333; - margin: 0px; - padding: 0px; - font-weight: 100; - text-shadow: 0 0 0 rgba(0, 0, 0, 0); -} - -/* -.nodesbox-header { - margin-bottom: 10px; -} - -.nodesbox-header .checkbox { - padding-left: 68px; - padding-top: 10px; -} - -.nodesbox-header h3 > span { - font-size: 16px; -} -*/ - -/* === Node Block === */ - -.node { - display: block; - width: auto; - background-color: #ffffff; - padding: 2px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - margin-bottom: 6px; - overflow: hidden; -} -.node.checked { - background-color: #dedede; -} -.node-box { - display: block; - width: 100%; - height: 52px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - border: 1px solid #a0a0a0; -} -.node-box:hover { - /* border-color: #999999; */ - box-shadow: 0 0 6px rgba(0,0,0,.2); -} -.node-content { - display: block; - width: 100%; - height: 50px; - background: #e5e6e8; /* Old browsers */ - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VkZWVlZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZmUyZTQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #edeeef 0%, #dfe2e4 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #edeeef), color-stop(100%, #dfe2e4)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #edeeef 0%, #dfe2e4 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #edeeef 0%, #dfe2e4 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #edeeef 0%, #dfe2e4 100%); /* IE10+ */ - background: linear-gradient(to bottom, #edeeef 0%, #dfe2e4 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#edeeef', endColorstr='#dfe2e4', GradientType=0 ); /* IE6-8 */ - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - border: 1px solid #f8f9f9; -} -.node-content:hover { - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U1ZTZlOCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkMWQ1ZDgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #e5e6e8 0%, #d1d5d8 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e5e6e8), color-stop(100%, #d1d5d8)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #e5e6e8 0%, #d1d5d8 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #e5e6e8 0%, #d1d5d8 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #e5e6e8 0%, #d1d5d8 100%); /* IE10+ */ - background: linear-gradient(to bottom, #e5e6e8 0%, #d1d5d8 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5e6e8', endColorstr='#d1d5d8', GradientType=0 ); /* IE6-8 */ -} - -/* chekbox animation -.node-content:hover > .node-checkbox { - margin-left: 0px; - -webkit-transition: all 0.3s ease; - -moz-transition: all 0.3s ease; - -o-transition: all 0.3s ease; - -ms-transition: all 0.3s ease; -} -*/ - -.unallocated { - overflow: hidden; - background: #afafaf; /* Old browsers */ - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2FmYWZhZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkNWQ1ZDUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #afafaf 0%, #d5d5d5 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#afafaf), color-stop(100%,#d5d5d5)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #afafaf 0%,#d5d5d5 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #afafaf 0%,#d5d5d5 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #afafaf 0%,#d5d5d5 100%); /* IE10+ */ - background: linear-gradient(to bottom, #afafaf 0%,#d5d5d5 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afafaf', endColorstr='#d5d5d5',GradientType=0 ); /* IE6-8 */ - color: #555555; -} - -.node-checkbox { - display: block; - width: 48px; - height: 48px; - float: left; - padding: 8px 0px 0px 11px; - border-right: 1px dotted #a0a0a0; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - /* margin-left: -49px; */ - -webkit-transition: all 0.3s ease; - -moz-transition: all 0.3s ease; - -o-transition: all 0.3s ease; - -ms-transition: all 0.3s ease; -} -.node-logo { - width: 64px; - float: left; -} -.node-name {/* width: 320px; float: left; */ - -webkit-font-smoothing: antialiased; - height: 50px; - display: block; -} -.roles { - display: block; - height: 18px; - overflow: hidden; - margin: 0; - padding: 0; - margin-top: -2px; -} -.roles > ul { - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - margin: 0px; - padding: 0px; - font-size: 10px; - text-transform: uppercase; - margin-top: 1px; - -webkit-font-smoothing: antialiased; - color: #666666; -} -.roles > ul > li { - display: inline-block; - float: left; - margin-right: 3px; -} -.roles > ul > li:after { - margin-left: 3px; - font-weight: 600; - content: '·'; -} -.roles > ul > li:last-child:after { - margin-left: 3px; - font-weight: 600; - content: ' '; -} - -.node-status { - width: 145px; - height: 20px; - display: block; - overflow: hidden; - float: right; - text-transform: uppercase; - font-size: 10px; - margin: 14px 20px 0px 20px; -} -.node-status > .progress { - background-color: #b9bdbf; - background-image: none; - border-radius: 3px 3px 3px 3px; - height: 15px; - margin-top: 3px; -} -.node-status > .progress > .bar { - border-radius: 3px 3px 3px 3px; - height: 13px; - margin: 1px; -} -.node-status > .progress > .bar > p { - color: #FFFFFF; - font-size: 10px; - line-height: 20px; - letter-spacing: 0px; - margin: -4px 0 0 4px; - text-align: left; - text-shadow: none; -} -.node-hardware { - width: 240px; - float: right; -} -.node-hardware > ul { - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - cursor: default; - margin: 0px; - padding: 0px; - font-size: 11px; - text-transform: uppercase; - margin-top: 14px; - -webkit-font-smoothing: antialiased; - font-size: 11px; - color: #666666; -} -.node-hardware > ul > li { - display: inline-block; - height: 20px; - width: 37%; - overflow: hidden; - float: left; -} -.node-hardware > ul > li:first-child { - width: 26%; -} -.node-details { - display: block; - height: 22px; - width: 22px; - overflow: hidden; - float: right; - background: url(/static/img/icons.png) 0px 0px no-repeat; - margin: 13px 13px 0px 14px; - cursor: pointer; -} -.node-details:hover { - background: url(/static/img/icons.png) 0px -22px no-repeat; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} -.node-name > .name { - display: block; - overflow: hidden; - height: 22px; - margin: 3px 0px 0px 0px; -} - -.node-name > .name input { - font-size: 12px; - height: 11px; -} - -.nodes-management-panel > .cluster-actions { - width: 100px; -} - -.nodes-management-panel > .nodes-filter { - width: 300px; -} - -.nodes-management-panel > .nodes-filter select { - margin: 0; -} - -.nodes-management-panel > .batch-actions-buttons { - text-align: right; - width: 583px; - float: right; -} - -.nodes-management-panel .assign-roles-panel { - clear: both; - float: none; -} - -#tab-nodes .cluster-name { - margin-top: 10px !important; -} - -.cluster-info { - clear: both; - float: none; - margin-bottom: 15px; -} - -.cluster-info span { - padding-right: 20px; - color: #888; -} - -.cluster-list .cluster-name { - height: 34px; - overflow: hidden; - margin: 20px 20px 0px 20px; - font-size: 16px; - font-weight: 500; - line-height: 16px; - color: #333333; - word-break: break-all; -} - -.node-list-header { - margin-bottom: 15px; -} - -.node-list-header p { - margin-bottom: 0; -} - -.node-list-header a, .node-list-header label { - padding-top: 13px; - padding-right: 0; - text-align: right; -} - -.node-group-header label { - text-align: right; - line-height: 20px; - margin: 0 !important; - padding: 10px 0 !important; -} - -.node-group-header label input, .node-list-header label input { - margin-top: 0; - margin-right: 3px; - position: relative; - top: -2px; -} - -.node-group-header h4 { - text-transform: capitalize; -} - -.roles-panel { - display: block; - padding: 20px; - background-color: #e0e0e0; - border: 1px solid #a0a0a0; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -.roles-panel > h4 { - display: block; - margin: 0px; - padding: 0px; - font-size: 16px; - color: #666666; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.35); - margin-bottom: 10px; -} - -.node-name > .name > p { - display: inline; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - font-size: 15px; - font-weight: 500; - border-bottom: 1px dotted #afafaf; - color: #4a4a4a; -} -.node-name > .name > p.node-renameable:hover { - border-bottom: 1px dotted #0178b3; - cursor: pointer; - color: #0178b3; - cursor: pointer; -} -.node-new { - border-color: #61a466; -} -.node-delete { - border-color: #a46161; -} -.node-offline { - border-сolor: red; -} -.node-offline > .node-box, -.node-offline > .node-box > .node-content, -.node-offline > .node-box > .node-content > .node-checkbox, -.node-offline > .node-box > .node-content > .node-checkbox > .node-settings, -.node-offline > .node-box > .node-content > .node-checkbox > .node-hardware, -.node-offline > .node-box > .node-content > .node-checkbox > .node-status { - opacity: 0.7; - cursor: default; -} - -.node-offline > .node-box > .node-content > .node-name > .name, -.node-offline > .node-box > .node-content > .node-name > .name:hover - { - opacity: 0.7; - cursor: default; -} - -.node-delete > .node-content > .node-name > .name > p { - text-decoration: line-through !important; - cursor: default; - border-bottom: none; -} -.node-delete > .node-content > .node-name > .name > p:hover { - border-bottom: none; - color: #4a4a4a; -} -.node-delete > .node-content > .node-settings { - visibility: hidden; -} -.unallocated .node-content .node-settings { - visibility: hidden; -} - -/* === Node Block End === */ - -.node-logo { - display: block; - margin: 0px; - padding: 0px; - width: 60px; - height: 40px; - float: left; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -.node-renameable { - display: inline; - color: #333333; - cursor: pointer; - display: inline; - font-size: 12px; - font-weight: 500; - line-height: 16px; - border-bottom: 1px dotted #b0b0b0; -} - -.roles .pending { - color: #468847; -} - -.node-status:hover > div { - display: none !important; -} - -.node-status i { - font-size: 12px; -} - -.node-status .logs-link, .node-status .btn-discard-node-changes { - display: block; - height: 25px; - color: #2c67a0 !important; - font-size: 9.5px !important; - text-transform: uppercase; -} - -.node-status .btn-discard-node-changes { - padding: 0; -} - -.breaker { - margin: 0px 20px 20px 20px; -} - -.node-status > .msg-offline, -.node-status > .msg-discover { - display: block; - height: 25px; - font-size: 9.5px; - text-transform: uppercase; -} - -.node-status > .msg-warning, -.node-status > .msg-ok, -.node-status > .msg-provisioned, -.node-status > .msg-error { - display: block; - height: 25px; - color: #B44200; - font-size: 9.5px; - text-transform: uppercase; -} - -.node-status > .msg-warning > i, -.node-status > .msg-ok > i, -.node-status > .msg-provisioned > i, -.node-status > .msg-error > i, -.node-status > .logs-link > i { - font-size: 11px; -} - -.checktoinstall { - display: block; - background-color: rgba(0, 100, 38, 0.25); - width: 172px; - height: 86px; - float: left; - margin-left: -172px; - border-radius: 4px; - line-height: 52px; - font-size: 50px; - cursor: pointer; -} -.checktoinstall > i { - margin: 0px 0px 0px 60px; - color: rgba(255, 255, 255, 0.65); -} -.checktodelete { - display: block; - background-color: rgba(121, 0, 0, 0.25); - width: 172px; - height: 86px; - float: left; - margin-left: -172px; - border-radius: 4px; - line-height: 52px; - font-size: 50px; - cursor: pointer; -} -.checktodelete > i { - margin: 0px 0px 0px 60px; - color: rgba(255, 255, 255, 0.65); -} - -.node-status > .msg-ok {color: #17824b;} -.node-status > .msg-info {color: #4794cf;} -.node-status > .msg-error {color: #8b0000;} -.node-status > .msg-warning {color: #b44200;} -.node-status > .msg-unimportant {color: #888888;} -.node-status > .msg-provisioned {color: #0088cc;} - -.manufacturer-hp { - background: url(../img/node_manufacturer_logos.png) 0px 0px no-repeat; -} -.manufacturer-dell { - background: url(../img/node_manufacturer_logos.png) 0px -120px no-repeat; -} -.manufacturer-vbox, .manufacturer-virtualbox { - background: url(../img/node_manufacturer_logos.png) 0px -240px no-repeat; -} -.manufacturer-vmware { - background: url(../img/node_manufacturer_logos.png) 0px -360px no-repeat; -} -.manufacturer-xen { - background: url(../img/node_manufacturer_logos.png) 0px -480px no-repeat; -} -.manufacturer-openvz { - background: url(../img/node_manufacturer_logos.png) 0px -600px no-repeat; -} -.manufacturer-cisco { - background: url(../img/node_manufacturer_logos.png) 0px -720px no-repeat; -} -.manufacturer-qemu { - background: url(../img/node_manufacturer_logos.png) 0px -840px no-repeat; -} -.manufacturer-supermicro { - background: url(../img/node_manufacturer_logos.png) 0px -960px no-repeat; -} -.manufacturer-kvm { - background: url(../img/node_manufacturer_logos.png) 0px -1080px no-repeat; -} -.openstack { - background: url(../img/cluster_logos.png) 0px 0px no-repeat; - background-position: 168px 0px; -} - -.breadcrumb { - background-color: rgba(0,0,0,.1); - margin: -10px 0 10px 0; - border-radius: 0 0 4px 4px; - min-height: 20px; -} - - -.breadcrumb > li { - text-shadow: 0 0 0; -} - -.breadcrumb > li > a { - color: #B0B0B0; - text-decoration: underline; -} - -.breadcrumb > li > a:hover { - color: #d0d0d0; -} - -.breadcrumb > .active { - color: #d0d0d0; - cursor: default; -} - -.nav-tabs { - border: none; - margin-top: -70px; -} - -.nav-tabs li { - margin-left: -1px; - min-width: 98px; -} - -.nav-tabs li a { - height: 50px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - color: #444444; - line-height: 20px; - border-color: #404c5c #404c5c #404c5c; - background-color: #d0d0d0; - background-image: -webkit-linear-gradient(bottom, #b0b0b0, #d0d0d0 30%); - background-image: -moz-linear-gradient(bottom, #b0b0b0, #d0d0d0 30%); - background-image: -o-linear-gradient(bottom, #b0b0b0, #d0d0d0 30%); - background-image: -ms-linear-gradient(bottom, #b0b0b0, #d0d0d0 30%); - background-image: linear-gradient(to top, #b0b0b0, #d0d0d0 30%); - - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; - -webkit-box-shadow: 0 0 0 rgba(0,0,0,.0), inset 0px 1px 0px rgba(255,255,255,.45); - -moz-box-shadow: 0 0 0 rgba(0,0,0,.0), inset 0px 1px 0px rgba(255,255,255,.45); - box-shadow: 0 0 0 rgba(0,0,0,.0), inset 0px 1px 0px rgba(255,255,255,.45); - -} - -.nav-tabs .tab-title { - display: block; - font-size: 11px; - text-align: center; -} - -.nav-tabs > li > a { margin-right: 3px;} -.nav-tabs > li > a > b {display: block; width: 30px; height: 30px; margin: -5px auto -5px auto;} -.tab-nodes-normal {background: url(../img/tab_icons.png) no-repeat 0px 0px;} -.tab-nodes-good {background: url(../img/tab_icons.png) no-repeat -30px 0px;} -.tab-nodes-bad {background: url(../img/tab_icons.png) no-repeat -60px 0px;} - -.tab-network-normal {background: url(../img/tab_icons.png) no-repeat 0px -30px;} -.tab-network-good {background: url(../img/tab_icons.png) no-repeat -30px -30px;} -.tab-network-bad {background: url(../img/tab_icons.png) no-repeat -60px -30px;} - -.tab-settings-normal {background: url(../img/tab_icons.png) no-repeat 0px -60px;} -.tab-settings-good {background: url(../img/tab_icons.png) no-repeat -30px -60px;} -.tab-settings-bad {background: url(../img/tab_icons.png) no-repeat -60px -60px;} - -.tab-actions-normal {background: url(../img/tab_icons.png) no-repeat 0px -90px;} -.tab-actions-good {background: url(../img/tab_icons.png) no-repeat -30px -90px;} -.tab-actions-bad {background: url(../img/tab_icons.png) no-repeat -60px -90px;} - -.tab-logs-normal {background: url(../img/tab_icons.png) no-repeat 0px -120px;} -.tab-logs-good {background: url(../img/tab_icons.png) no-repeat -30px -120px;} -.tab-logs-bad {background: url(../img/tab_icons.png) no-repeat -60px -120px;} - -.tab-redhat-normal {background: url(../img/tab_icons.png) no-repeat 0px -150px;} -.tab-redhat-good {background: url(../img/tab_icons.png) no-repeat -30px -150px;} -.tab-redhat-bad {background: url(../img/tab_icons.png) no-repeat -60px -150px;} - -.tab-healthcheck-normal {background: url(../img/tab_icons.png) no-repeat 0px -180px;} -.tab-healthcheck-good {background: url(../img/tab_icons.png) no-repeat -30px -180px;} -.tab-healthcheck-bad {background: url(../img/tab_icons.png) no-repeat -60px -180px;} - -.nav-tabs li a:hover { - border-color: #404c5c #404c5c #404c5c; - background-image: -webkit-linear-gradient(bottom, #b8b8b8, #e8e8e8 30%); - background-image: -moz-linear-gradient(bottom, #b8b8b8, #e8e8e8 30%); - background-image: -o-linear-gradient(bottom, #b8b8b8, #e8e8e8 30%); - background-image: -ms-linear-gradient(bottom, #b8b8b8, #e8e8e8 30%); - background-image: linear-gradient(to top, #b8b8b8, #e8e8e8 30%); -} - -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - background-image: none; - color: #555555; - cursor: pointer; - background-color: #ffffff; - border-color: #404c5c #404c5c #404c5c; - border-bottom-color: transparent; -} - -.globalalert, -.global-error, -.global-success, -.global-info { - background-color: rgba(0, 0, 0, 0.1); - border: none; - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 1px rgba(0, 0, 0, 0.4) inset; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.3); -} - -.globalalert > h4, -.global-error > h4, -.global-success > h4, -.global-info > h4 { - font-family: 'Segoe UI', Helvetica, Arial; - font-size: 20px; - font-weight: 800; - font-style: italic; - margin-bottom: 6px; -} - -.globalalert > h4 {color: #C09853;} -.global-error > h4 {color: #B94A48;} -.global-success > h4 {color: #41b142;} -.global-info > h4 {color: #3A87AD;} - -.globalalert > p {color: #C09853;} -.global-error > p {color: #B94A48;} -.global-success > p {color: #41b142;} -.global-info > p {color: #3A87AD;} - -.globalalert > p, -.global-error > p, -.global-success > p, -.global-info > p { - font-style: italic; -} - -.globalalert > p > a, -.global-success > p > a, -.global-info > p > a { - color: #00aeef; -} - -.global-error > p > a, .global-error > p > a:hover { - color: #0088cc; -} - -.clusterbox { - margin-bottom: 20px; - border: none; - border-radius: 4px; - background-color: #ffffff; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - overflow: hidden; - height: 181px; -} - -.clusterbox:hover { - text-decoration: none; - background-color: #dfe5eb; - box-shadow: 0 1px 8px rgba(0,0,0,.85), - inset 0px 0px 0px rgba(255,255,255,.0); - cursor: pointer; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.45); - -webkit-transition: all 0.7s ease; - -moz-transition: all 0.7s ease; - -o-transition: all 0.7s ease; - -ms-transition: all 0.7s ease; - background-image: -webkit-linear-gradient(top, #f2f4f4, #c4cbcc); - background-image: -moz-linear-gradient(top, #f2f4f4, #c4cbcc); - background-image: -o-linear-gradient(top, #f2f4f4, #c4cbcc); - background-image: -ms-linear-gradient(top, #f2f4f4, #c4cbcc); - background-image: linear-gradient(to bottom, #f2f4f4, #c4cbcc); -} -.create-cluster { - background-color: rgba(0, 0, 0, 0.1); - /* border: 1px solid transparent; */ - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 1px rgba(0, 0, 0, 0.4) inset; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.3); - -webkit-transition: all 0.7s ease; - -moz-transition: all 0.7s ease; - -o-transition: all 0.7s ease; - -ms-transition: all 0.7s ease; -} - -.create-cluster:hover { - background-color: #c8cfd6; - box-shadow: 0 1px 8px rgba(0,0,0,.85), - inset 0px 0px 0px rgba(255,255,255,.0); - /* border: 1px solid #2b3139; */ - cursor: pointer; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.45); - -webkit-transition: all 0.7s ease; - -moz-transition: all 0.7s ease; - -o-transition: all 0.7s ease; - -ms-transition: all 0.7s ease; -} -.create-cluster > .add-icon { - display: block; - height: 74px; - margin-top: 36px; - margin-bottom: 12px; - text-align: center; - background: url(../img/create_cluster_icon.png) no-repeat top center; -} -.create-cluster-text { - font-size: 15px; - text-align: center; - color: #798797; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.45); - -webkit-transition: all 0.7s ease; - -moz-transition: all 0.7s ease; - -o-transition: all 0.7s ease; - -ms-transition: all 0.7s ease; -} -.create-cluster:hover > .create-cluster-text { - color: #333333; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.45); - -webkit-transition: all 0.7s ease; - -moz-transition: all 0.7s ease; - -o-transition: all 0.7s ease; - -ms-transition: all 0.7s ease; -} - -.cluster-hardware { - /* background-color: #dadada; */ - margin-top: 1px; - font-size: 13px; - font-weight: 500; - color: #666666; - height: 72px; - overflow: hidden; -} - -.cluster-hardware > .row-fluid > .span4 { - margin-left: 20px; - min-height: 14px; - line-height: 18px; -} - -.cluster-hardware > .row-fluid > .span6 { - margin-left: 20px; - min-height: 14px; - line-height: 18px; -} -.cluster-status { - margin-top: 20px; - padding-top: 5px; - height: 26px; - /* background-color: rgba(0, 0, 0, 0.09); */ - border-top: 1px solid #afafaf; - font-size: 13px; - text-align: center; - color: #666666; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.45); -} - -.summary { - margin: 2px 20px 15px 20px; -} - -.summary-inner { - min-height: 40px; - padding-right: 20px; - padding-left: 20px; - background-color: #fafafa; - background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); - background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); - background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); - background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); - background-repeat: repeat-x; - border: 1px solid #d4d4d4; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); -} - -.summary-article { - display: block; - float: left; - padding: 9px 20px 10px; - margin-left: -20px; - font-size: 18px; - font-weight: 200; - color: #999999; - text-shadow: 0 1px 0 #ffffff; -} - -.summary-settings-btn { - float: none; - text-decoration: none; - text-shadow: 0 1px 0 #FFFFFF; -} - -.summary-settings-btn b { - color: #555555; -} - -.summary-settings-btn.disabled { - color: #555555; - opacity: 1; - background-color: transparent; -} -.summary-settings-btn:hover { - text-decoration: none; -} - -.summary-settings-btn.disabled:hover { - cursor: default; -} - -.deploy-btn { - display: inline-block; - *display: inline; - padding: 4px 14px; - margin: 4px 3px 0 0; - *margin-left: .3em; - font-size: 14px; - color: #333333; - text-align: center; - vertical-align: middle; - cursor: pointer; - *border: 0; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - *zoom: 1; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - background-color: #fff; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - box-shadow: 0 1px 2px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - border: solid 1px #25282a; - /* - background-image: -webkit-linear-gradient(bottom, #205885, #4689db); - background-image: -moz-linear-gradient(bottom, #205885, #4689db); - background-image: -o-linear-gradient(bottom, #205885, #4689db); - background-image: -ms-linear-gradient(bottom, #205885, #4689db); - background-image: linear-gradient(to top, #205885, #4689db); - */ - color: #ffffff; - font-weight: 600; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - background: #4889d8; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQ4ODlkOCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMyNjVkOGIiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #4889d8 0%, #265d8b 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4889d8), color-stop(100%,#265d8b)); - background: -webkit-linear-gradient(top, #4889d8 0%,#265d8b 100%); - background: -o-linear-gradient(top, #4889d8 0%,#265d8b 100%); - background: -ms-linear-gradient(top, #4889d8 0%,#265d8b 100%); - background: linear-gradient(to bottom, #4889d8 0%,#265d8b 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4889d8', endColorstr='#265d8b',GradientType=0 ); -} - -.deploy-btn:hover { - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - box-shadow: 0 0px 0px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - border: solid 1px #25282a; - /* - background-image: -webkit-linear-gradient(bottom, #1a476d, #3e76b1); - background-image: -moz-linear-gradient(bottom, #1a476d, #3e76b1); - background-image: -o-linear-gradient(bottom, #1a476d, #3e76b1); - background-image: -ms-linear-gradient(bottom, #1a476d, #3e76b1); - background-image: linear-gradient(to top, #1a476d, #3e76b1); - */ - color: #ffffff; - font-weight: 600; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - background: #4077b0; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzQwNzdiMCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMyNjUxNzUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #4077b0 0%, #265175 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4077b0), color-stop(100%,#265175)); - background: -webkit-linear-gradient(top, #4077b0 0%,#265175 100%); - background: -o-linear-gradient(top, #4077b0 0%,#265175 100%); - background: -ms-linear-gradient(top, #4077b0 0%,#265175 100%); - background: linear-gradient(to bottom, #4077b0 0%,#265175 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4077b0', endColorstr='#265175',GradientType=0 ); -} - -.deploy-btn:active { - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - box-shadow: 0 0px 0px rgba(0,0,0,.34), inset 0 1px rgba(255,255,255,.17), inset 0 0 2px rgba(255,255,255,.13); - border: solid 1px #25282a; - /* - background-image: -webkit-linear-gradient(bottom, #3e76b1, #1a476d); - background-image: -moz-linear-gradient(bottom, #3e76b1, #1a476d); - background-image: -o-linear-gradient(bottom, #3e76b1, #1a476d); - background-image: -ms-linear-gradient(bottom, #3e76b1, #1a476d); - background-image: linear-gradient(to top, #3e76b1, #1a476d); - */ - background: #204d73; - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzIwNGQ3MyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM0NjdiYjQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #204d73 0%, #467bb4 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#204d73), color-stop(100%,#467bb4)); - background: -webkit-linear-gradient(top, #204d73 0%,#467bb4 100%); - background: -o-linear-gradient(top, #204d73 0%,#467bb4 100%); - background: -ms-linear-gradient(top, #204d73 0%,#467bb4 100%); - background: linear-gradient(to bottom, #204d73 0%,#467bb4 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#204d73', endColorstr='#467bb4',GradientType=0 ); - color: #ffffff; - font-weight: 600; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); -} - -.deploy-btn.disabled, .deploy-btn.disabled:hover, .deploy-btn[disabled], .deploy-btn[disabled]:hover { - box-shadow: inset 0 2px 6px rgba(0,0,0,.17); - text-shadow: none; - color: rgba(255,255,255,0.4); - cursor: default; - background: rgba(0,0,0,0.1); -} - -.modal-header h3 { - font-size: 26px; - margin: 0; - line-height: 40px; - height: 40px; -} - -.table-releases-box { - background-color: #ffffff; - padding: 20px 20px 10px 20px; - border-radius: 4px; -} - -.table-releases th {color: #777777;} - -.modal .help-block { - color: #777777; - font-size: 13px; -} - -.modal .wizard-footer button { - min-width: 90px; -} - -.modal .wizard-body { - min-height: 220px; - padding-top: 0; - margin-top: 10px; -} - -.modal .wizard-steps { - height: 24px; - padding-bottom: 0px; -} - -.modal .wizard-step { - /* padding-top: 5px; */ - font-size: 12px; - height: 18px; - float: left; - text-align: center; - background-color: #f0f0f0; - color: #aaaaaa; -} - -.modal .wizard-step:first-child { - border-radius: 4px 0px 0px 4px; -} - -.modal .wizard-step:last-child { - border-radius: 0px 4px 4px 0px; -} - -.modal .wizard-step.current { - background-color: #d07207; - color: #f8f8f8; -} - -.modal .wizard-step.available { - background-color: #52a652; - color: #f8f8f8; - cursor: pointer; -} - -.loading { - margin-top: 200px; - width: 100%; - height: 90px; - background: url(../img/cloud-loader.gif) no-repeat top center; -} - -.loading.layout-loaded { - margin-top: 108px; -} - -.progress-deploy { - width: 350px; - padding: 2px; - - height: 12px; - background-color: #2b3036; - background-image: none; -} - -.progress > .bar { - border-radius: 3px; -} - -.progress > .bar > p { - white-space: pre; -} - -.progress-deploy-clusters-page { - padding: 2px 10px; - background: none; - border: none; - box-shadow: none; -} - -.progress-deploy-clusters-page > .bar { - height: 12px; -} - -.progress-verify-networks { - display: inline-block; - float: right; - margin: 7px 0px 0px 0px; - width: 120px; - height: 16px; -} - -.network-tab-content .btn-group { - margin: 7px 0 5px 0; -} - -.networks-table { - width: 100%; - margin-bottom: 10px; -} - -.networks-table > div { - padding-left: 3px; -} - -.networks-table .range-row-header { - height: 23px; -} - -.networks-table .range-row-header > div { - float: left; - margin-left: 10px; - font-size: 11px; - line-height: 14px; - width: 220px; -} - -.networks-table .range-row label { - display: inline-block; - margin-bottom: 0; - float: left; -} - -.networks-table .range-row-header.mini > div { - width: 105px; -} - -.networks-table .range-row-header > div:first-child { - margin-left: 192px; -} - -.networks-table .range-row-header { - font-weight: bold; -} - -.networks-table label { - position: relative; -} - -.networks-table label.hide { - display: none; -} - -.networks-table input.mini { - width: 91px; -} - -.networks-table .ip_ranges > div { - margin-bottom: 2px; - float: left; -} - -.networks-table .ip-ranges-control { - width: 20px; - margin-top: 3px; - float: left; - margin-left: 0 !important; -} - -.networks-table .range-row { - margin-left: 189px; -} - -.networks-table .ip-ranges { - padding: 0; -} - -.networks-table div.error { - float: left; -} - -.networks-table .error .help-inline { - display: block; - padding-top: 5px; - max-width: 520px; - color: #B94A48; -} - -#networkManager { - margin-bottom: 30px; -} - -.nodes-summary-container { - cursor: default; -} - -.roles-block-row:first-child .span2 { - width: auto; -} - -.roles-block-row:first-child .span2 label { - white-space: nowrap; -} - -.roles-block-row:first-child .span8 { - width: 720px; -} - -.roles-block-row:last-child .span10 { - width: auto; -} - -.tab-pane > div > div { - overflow-y: hidden; -} - -.wrapper { - margin: 0 20px; - overflow-x: hidden; - padding-left: 3px; -} - -.wrapper h3 { - margin-top: 0; -} - -.display-changes-dialog > ul { - margin-left: 35px; -} - -.pending-deletion-flag { - display: block; - position: relative; - top: -114px; - left: 0px; - z-index: 100; - width: 16px; - height: 15px; - background: url(../img/pending-flags.png) no-repeat top left; -} - -.pending-addition-flag { - display: block; - position: relative; - top: -114px; - left: -1px; - z-index: 100; - width: 16px; - height: 15px; - background: url(../img/pending-flags.png) no-repeat 0px -16px; -} - -/* Notifications Popover */ -.notification-wrapper { - position: relative; -} - -.message-list-placeholder { - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - display: inline-block; - width: 300px; - position: absolute; - top: -8px; - left: 682px; - z-index: 200; - background-color: rgba(59, 72, 92, .95); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 2px 16px rgba(0, 0, 0, 0.65); - border-radius: 4px 4px 4px 4px; - background-clip: padding-box; - border: 1px solid rgba(41, 49, 62, 1); - padding: 10px; - overflow: hidden; - oveflow-y: auto; -} - -.message-list-popover { - list-style: none outside none; - margin: 2px 0 0; -} - -.message-list-popover:after { - clear: both; -} - -.message-list-popover > li { - margin-left: 26px; - color: #85a2c8; - text-shadow: 0 1px 0 rgba(21, 21, 21, 0.5); - font-size: 13px; - cursor: default; -} - -.message-list-popover > li > i { - display: block; - float: left; - margin-left: -22px; - font-size: 16px; -} - -.message-list-popover > li > a { - color: #0088cc; -} - -.message-list-popover > li > a:hover { - color: #009be9; -} - - -.message-list-popover .divider, .message-list-popover .divider:hover { - background-color: #303a49; - border-bottom: 1px solid rgba(200, 200, 200, .2); - height: 1px; - margin: 9px 1px; - overflow: hidden; - cursor: default; -} - -.show-more-notifications { - text-align: center; - font-weight: 600; -} - -.show-more-notifications a { - text-decoration: none; - color: #bbd8ed; -} - -.show-more-notifications a:hover { - text-decoration: none; - color: #ffffff; -} - -.message-list-popover > .discover { - cursor: pointer; - text-decoration: underline; -} - -.message-list-popover > .discover:hover { - color: #96b5df; - text-decoration: none; -} - -.message-list-popover > .new { - color: #a9cdfb; - font-weight: 600; -} - -.message-list-popover > .error { - color: #db4242; -} - -.message-list-popover > .warning { - color: #FF9300; -} - -/* Notifications Page */ -.page-wrapper { - background-color: #FFFFFF; - border-radius: 4px; - padding: 20px; -} - -.notifications-list > ul, .notifications-list > ol { - margin: 0 0 10px 0px; - padding: 0; -} - -.message-list { - display: block; - list-style: none outside none; -} - -.message-list > li { - display: block; - clear: both; -} - -.notification-box { - display: block; - margin: 0px; - padding: 0px; - font-size: 13px; - border-bottom: 1px dotted #dadada; - color: #333333; - min-height: 1px; -} - -.notification-box:after{ - clear: both; -} - -.notification-box:first-child{ - border-bottom: 0px dotted #ffffff; -} - -.notification-box:last-child{ - margin-bottom: 40px; -} - -.notification-box > .icon { - display: block; - width: 30px; - float: left; - font-size: 15px; -} - -.notification-box > .datetime { - display: block; - width: 130px; - float: left; -} - -.notification-box > .message { - display: block; - width: 770px; - float: left; -} - -.notification-box > .icon, .notification-box > .datetime, .notification-box > .message { - margin: 6px 0px 6px 0px; -} - - -.notification-box > .message:after { - clear: both; -} - -.message-list > .new { - cursor: default; -} - -.message-list > .discover > .message { - text-decoration: underline; - cursor: pointer; -} - -.message-list > .discover:hover > .message { - text-decoration: none; - color: #0088cc; - cursor: pointer; -} - -.message-list > .new > .message, .message-list > .new > .icon, .message-list > .new > .datetime { - color: #333333; - font-weight: 600; -} - -.message-list > .error > .message, .message-list > .error > .icon, .message-list > .error > .datetime { - color: #cd3500; -} - -/* Filter Bar */ -.filter-bar { - display: block; - clear: both; - width: auto; - height: 38px; - margin: 20px 0px 14px 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #e5e5e5; - box-shadow: inset 0 1px 2px rgba(0,0,0,.2); - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} -.filter-bar-name { - display: block; - float: left; - font-size: 24px; - color: #999999; - text-shadow: 0 1px 0 rgba(255,255,255,.4); - padding: 8px 20px 0px 10px; -} -.filter-bar-item { - display: block; - float: left; - margin: 0 0 0 10px; -} -.filter-bar-btn { - margin: 4px; -} -.filter-bar-dropdown { - display: inline-block; - height: 28px; - margin: 5px 3px; - color: #444444; - background-color: #efefef; -/* - padding: 0px 6px 0px 12px; - font-size: 12px; - border-radius: 3px; - border: solid 1px #aaaaab; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - text-align: center; - text-shadow: 0 1px 0 rgba(255,255,255,.4); - box-shadow: inset 0 0 0 1px rgba(255,255,255,.3); - background-image: -webkit-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -moz-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -o-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -ms-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: linear-gradient(to top, #dcdcdd, #f5f5f5); -*/ -} -/* -.filter-bar-dropdown:hover { - cursor: pointer; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #dfdfdf; - -webkit-box-shadow: inset 0 0 0 2px rgba(255,255,255,.5); - -moz-box-shadow: inset 0 0 0 2px rgba(255,255,255,.5); - box-shadow: inset 0 0 0 2px rgba(255,255,255,.5); - border: solid 1px #aaaaab; - background-image: -webkit-linear-gradient(bottom, #efefef, #fafafa); - background-image: -moz-linear-gradient(bottom, #efefef, #fafafa); - background-image: -o-linear-gradient(bottom, #efefef, #fafafa); - background-image: -ms-linear-gradient(bottom, #efefef, #fafafa); - background-image: linear-gradient(to top, #efefef, #fafafa); -} -.filter-bar-dropdown:focus { - background-image: -webkit-linear-gradient(bottom, #f5f5f5, #dcdcdd); - background-image: -moz-linear-gradient(bottom, #f5f5f5, #dcdcdd); - background-image: -o-linear-gradient(bottom, #f5f5f5, #dcdcdd); - background-image: -ms-linear-gradient(bottom, #f5f5f5, #dcdcdd); - background-image: linear-gradient(to top, #f5f5f5, #dcdcdd); - border-color: #c2c7ca; - box-shadow: inset 0 0 0 1px rgba(255,255,255,.5); -} -*/ -.filter-bar-label { - display: block; - float: left; - margin-top: 9px; - font-size: 14px; - color: #444444; - text-shadow: 0 1px 0 rgba(255,255,255,.4); -} -.filter-bar-dropdown > i { - color: #666666; - padding-left: 12px; - font-size: 15px; -} -.filter-bar-item > .dropdown-menu { - position: absolute; - left: auto; - right: 5px; -} -@-moz-document url-prefix() { - .filter-bar-label { margin-top: 8px; } -} -.logs-description { - margin: 20px 0; -} -.logs-loading { - margin-top: 20px; -} -.table-logs { - font-size: 13px; - color: #545a63; -} - -.table-logs tr td { - padding: 1px 5px; - line-height: 15px; -} -.table-logs thead th { - background-color: #ececec; - vertical-align: middle; -} -.table-logs tbody tr td { - font-size: 13px; - font-family: "Lucida Console", Menlo, Monaco, Consolas, "Courier New", monospace; -} -.table-logs .no-logs-msg, .table-logs .entries-skipped-msg { - display: none; -} -.table-logs .no-logs-msg tr td { - text-align: center; - padding: 20px; -} -.table-logs .entries-skipped-msg tr td { - text-align: center; - padding: 5px; -} -.table-logs .entries-skipped-msg .show-all-entries, .table-logs .entries-skipped-msg .show-more-entries { - color: #0088cc; -} -.table-logs .entries-skipped-msg .show-all-entries:hover, .table-logs .entries-skipped-msg .show-more-entries:hover { - color: #005580; - cursor: pointer; -} -.table-logs .entries-skipped-msg .show-more-entries { - margin-right: 10px; -} - -/* logs coloring */ - -.table-logs tbody tr.info td { - background-color: #d9edf7; -} - -.table-logs tbody tr.debug td { - background-color: #dff0d8; -} - -.table-logs tbody tr.notice td { - background-color: #bce3b8; -} - -.table-logs tbody tr.warning td { - background-color: #fcf8e3; -} - -.table-logs tbody tr.error td, .table-logs tbody tr.err td { - background-color: #eccecf; -} - - .table-logs tbody tr.critical td, .table-logs tbody tr.crit td, .table-logs tbody tr.fatal td { - background-color: #c56d6f; - color: #ffffff; -} - -.table-logs tbody tr.alert td { - background-color: #d89d9f; -} - -.table-logs tbody tr.emergency td, .table-logs tbody tr.emerg td { - background-color: #8a080b; -} - -/* -.table-logs tbody tr.fatal td { - background-color: #ed9a57; - color: #ffffff; -} -*/ - -.page-control-box { - display: block; - margin-left: 20px; - padding: 10px 0px 10px 0px; - /* min-height: 60px; */ - height: auto; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #f0f0f0; - box-shadow: inset 0 1px 2px rgba(0,0,0,.15); - margin: 10px 0px 0px 20px; - } - -.page-control-box:after { - display: table; - line-height: 0; - content: ""; - clear: both; -} - -.verification-control .page-control-box { - background-color: transparent; - box-shadow: none; -} - -.page-control-error-placeholder, .page-control-success-placeholder { - display: block; - float: left; - margin: 5px; - max-width: 640px; - color: #b60007; - font-size: 15px; - text-shadow: 0 1px 0 rgba(0,0,0,.1); -} - -.page-control-success-placeholder { - color: #17824B; -} - -.page-control-button-placeholder { - /* min-width: 120px; */ - display: inline-block; - float: right; - margin: 5px 10px 5px 10px; -} - -.back-button { - margin: 5px 10px 5px 10px; -} - -/* buttons facelift */ -.apply-btn { - font-size: 14px; - color: #555555; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #dedede; - -webkit-box-shadow: inset 0 0 0 1px rgba(255,255,255,.3); - -moz-box-shadow: inset 0 0 0 1px rgba(255,255,255,.3); - box-shadow: inset 0 0 0 1px rgba(255,255,255,.3); - border: solid 1px #aaaaab; - background-image: -webkit-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -moz-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -o-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -ms-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: linear-gradient(to top, #dcdcdd, #f5f5f5); -} - - -.btn { - font-size: 14px; - color: #333333; - background-color: #e4e4e5; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.3); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.3); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.3); - border: solid 1px #b3b3b3; - /* - background-image: -webkit-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -moz-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -o-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: -ms-linear-gradient(bottom, #dcdcdd, #f5f5f5); - background-image: linear-gradient(to top, #dcdcdd, #f5f5f5); - */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y1ZjVmNSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkY2RjZGQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #f5f5f5 0%, #dcdcdd 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#dcdcdd)); - background: -webkit-linear-gradient(top, #f5f5f5 0%,#dcdcdd 100%); - background: -o-linear-gradient(top, #f5f5f5 0%,#dcdcdd 100%); - background: -ms-linear-gradient(top, #f5f5f5 0%,#dcdcdd 100%); - background: linear-gradient(to bottom, #f5f5f5 0%,#dcdcdd 100%); -} - -.btn:hover, -.btn:focus { - color: auto; - text-decoration: none; - background-position: 0 0; - /* - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; - */ -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn-success { - font-size: 14px; - color: #ffffff; - background-color: #cc2229; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.25); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.25); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.25); - border: solid 1px #4a954a; - /* - background-image: -webkit-linear-gradient(bottom, #51a451, #61c161); - background-image: -moz-linear-gradient(bottom, #51a451, #61c161); - background-image: -o-linear-gradient(bottom, #51a451, #61c161); - background-image: -ms-linear-gradient(bottom, #51a451, #61c161); - background-image: linear-gradient(to top, #51a451, #61c161); - */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzYxYzE2MSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1MWE0NTEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #61c161 0%, #51a451 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#61c161), color-stop(100%,#51a451)); - background: -webkit-linear-gradient(top, #61c161 0%,#51a451 100%); - background: -o-linear-gradient(top, #61c161 0%,#51a451 100%); - background: -ms-linear-gradient(top, #61c161 0%,#51a451 100%); - background: linear-gradient(to bottom, #61c161 0%,#51a451 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#61c161', endColorstr='#51a451',GradientType=0 ); -} - -.btn-danger { - font-size: 14px; - color: #ffffff; - background-color: #cc2229; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - border: solid 1px #af3f3a; - /* - background-image: -webkit-linear-gradient(bottom, #be3730, #df534e); - background-image: -moz-linear-gradient(bottom, #be3730, #df534e); - background-image: -o-linear-gradient(bottom, #be3730, #df534e); - background-image: -ms-linear-gradient(bottom, #be3730, #df534e); - background-image: linear-gradient(to top, #be3730, #df534e); - */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RmNTM0ZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNiZTM3MzAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #df534e 0%, #be3730 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#df534e), color-stop(100%,#be3730)); - background: -webkit-linear-gradient(top, #df534e 0%,#be3730 100%); - background: -o-linear-gradient(top, #df534e 0%,#be3730 100%); - background: -ms-linear-gradient(top, #df534e 0%,#be3730 100%); - background: linear-gradient(to bottom, #df534e 0%,#be3730 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#df534e', endColorstr='#be3730',GradientType=0 ); -} - -.btn-warning { - font-size: 14px; - color: #ffffff; - background-color: #cc2229; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.25); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.25); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.25); - border: solid 1px #e19222; - /* - background-image: -webkit-linear-gradient(bottom, #f89507, #fbb24c); - background-image: -moz-linear-gradient(bottom, #f89507, #fbb24c); - background-image: -o-linear-gradient(bottom, #f89507, #fbb24c); - background-image: -ms-linear-gradient(bottom, #f89507, #fbb24c); - background-image: linear-gradient(to top, #f89507, #fbb24c); - */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZiYjI0YyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmODk1MDciIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #fbb24c 0%, #f89507 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fbb24c), color-stop(100%,#f89507)); - background: -webkit-linear-gradient(top, #fbb24c 0%,#f89507 100%); - background: -o-linear-gradient(top, #fbb24c 0%,#f89507 100%); - background: -ms-linear-gradient(top, #fbb24c 0%,#f89507 100%); - background: linear-gradient(to bottom, #fbb24c 0%,#f89507 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fbb24c', endColorstr='#f89507',GradientType=0 ); -} - -.btn-primary { - font-size: 14px; - color: #ffffff; - background-color: #cc2229; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - border: solid 1px #005acc; - /* - background-image: -webkit-linear-gradient(bottom, #0047cc, #0071cc); - background-image: -moz-linear-gradient(bottom, #0047cc, #0071cc); - background-image: -o-linear-gradient(bottom, #0047cc, #0071cc); - background-image: -ms-linear-gradient(bottom, #0047cc, #0071cc); - background-image: linear-gradient(to top, #0047cc, #0071cc); - */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwNzFjYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDQ3Y2MiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #0071cc 0%, #0047cc 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0071cc), color-stop(100%,#0047cc)); - background: -webkit-linear-gradient(top, #0071cc 0%,#0047cc 100%); - background: -o-linear-gradient(top, #0071cc 0%,#0047cc 100%); - background: -ms-linear-gradient(top, #0071cc 0%,#0047cc 100%); - background: linear-gradient(to bottom, #0071cc 0%,#0047cc 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0071cc', endColorstr='#0047cc',GradientType=0 ); -} - -.btn-primary { - font-size: 14px; - color: #ffffff; - background-color: #cc2229; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - border: solid 1px #005acc; - /* - background-image: -webkit-linear-gradient(bottom, #0047cc, #0071cc); - background-image: -moz-linear-gradient(bottom, #0047cc, #0071cc); - background-image: -o-linear-gradient(bottom, #0047cc, #0071cc); - background-image: -ms-linear-gradient(bottom, #0047cc, #0071cc); - background-image: linear-gradient(to top, #0047cc, #0071cc); - */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwNzFjYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMwMDQ3Y2MiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #0071cc 0%, #0047cc 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#0071cc), color-stop(100%,#0047cc)); - background: -webkit-linear-gradient(top, #0071cc 0%,#0047cc 100%); - background: -o-linear-gradient(top, #0071cc 0%,#0047cc 100%); - background: -ms-linear-gradient(top, #0071cc 0%,#0047cc 100%); - background: linear-gradient(to bottom, #0071cc 0%,#0047cc 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0071cc', endColorstr='#0047cc',GradientType=0 ); -} - -.btn-inverse { - font-size: 14px; - color: #ffffff; - background-color: #333; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #333333; - background-image: -webkit-linear-gradient(bottom, #222, #444); - background-image: -moz-linear-gradient(bottom, #222, #444); - background-image: -o-linear-gradient(bottom, #222, #444); - background-image: -ms-linear-gradient(bottom, #222, #444); - background-image: linear-gradient(to top, #222, #444); -} - -.btn-info { - font-size: 14px; - color: #ffffff; - background-color: #08c; - -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - box-shadow: 0 1px 2px rgba(0,0,0,.25), inset 0 0 0 1px rgba(255,255,255,.2); - border: solid 1px #08c; - background-image: -webkit-linear-gradient(bottom, #08c 1%, #009be9); - background-image: -moz-linear-gradient(bottom, #08c 1%, #009be9); - background-image: -o-linear-gradient(bottom, #08c 1%, #009be9); - background-image: -ms-linear-gradient(bottom, #08c 1%, #009be9); - background-image: linear-gradient(to top, #08c 1%, #009be9); - -} - - -.btn:hover { - color: #222222; - text-decoration: none; - background: none; - *background-color: #d9d9d9; - /* Buttons in IE7 don't get borders, so darken on hover */ - - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.3); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.3); - box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.3); - border: solid 1px #b3b3b3; - background-image: -webkit-linear-gradient(bottom, #cecece, #e3e3e3); - background-image: -moz-linear-gradient(bottom, #cecece, #e3e3e3); - background-image: -o-linear-gradient(bottom, #cecece, #e3e3e3); - background-image: -ms-linear-gradient(bottom, #cecece, #e3e3e3); - background-image: linear-gradient(to top, #cecece, #e3e3e3); - - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} - -.btn-success:hover { - color: #efefef; - text-decoration: none; - background: none; - - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #4a954a; - background-image: -webkit-linear-gradient(bottom, #4c9a4c, #59b259); - background-image: -moz-linear-gradient(bottom, #4c9a4c, #59b259); - background-image: -o-linear-gradient(bottom, #4c9a4c, #59b259); - background-image: -ms-linear-gradient(bottom, #4c9a4c, #59b259); - background-image: linear-gradient(to top, #4c9a4c, #59b259); -} - -.btn-danger:hover { - color: #efefef; - text-decoration: none; - background: none; - - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #a43a37; - background-image: -webkit-linear-gradient(bottom, #ac332d, #c74a45); - background-image: -moz-linear-gradient(bottom, #ac332d, #c74a45); - background-image: -o-linear-gradient(bottom, #ac332d, #c74a45); - background-image: -ms-linear-gradient(bottom, #ac332d, #c74a45); - background-image: linear-gradient(to top, #ac332d, #c74a45); -} - -.btn-primary:hover { - color: #efefef; - text-decoration: none; - background: none; - - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #0051b7; - background-image: -webkit-linear-gradient(bottom, #0042b7, #0064b7); - background-image: -moz-linear-gradient(bottom, #0042b7, #0064b7); - background-image: -o-linear-gradient(bottom, #0042b7, #0064b7); - background-image: -ms-linear-gradient(bottom, #0042b7, #0064b7); - background-image: linear-gradient(to top, #0042b7, #0064b7); -} - -.btn-info:hover { - color: #efefef; - text-decoration: none; - background: none; - - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #007ab7; - background-image: -webkit-linear-gradient(bottom, #007bb9, #008bd0); - background-image: -moz-linear-gradient(bottom, #007bb9, #008bd0); - background-image: -o-linear-gradient(bottom, #007bb9, #008bd0); - background-image: -ms-linear-gradient(bottom, #007bb9, #008bd0); - background-image: linear-gradient(to top, #007bb9, #008bd0); -} - -.btn-warning:hover { - color: #efefef; - text-decoration: none; - background: none; - - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #c6801e; - background-image: -webkit-linear-gradient(bottom, #da850a, #dc9b40); - background-image: -moz-linear-gradient(bottom, #da850a, #dc9b40); - background-image: -o-linear-gradient(bottom, #da850a, #dc9b40); - background-image: -ms-linear-gradient(bottom, #da850a, #dc9b40); - background-image: linear-gradient(to top, #da850a, #dc9b40); -} - -.btn-inverse:hover { - color: #efefef; - text-decoration: none; - background: none; - - -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - box-shadow: 0 1px 1px rgba(0,0,0,.1), inset 0 0 0 1px rgba(255,255,255,.15); - border: solid 1px #3c3c3c; - background-image: -webkit-linear-gradient(bottom, #151515, #303030); - background-image: -moz-linear-gradient(bottom, #151515, #303030); - background-image: -o-linear-gradient(bottom, #151515, #303030); - background-image: -ms-linear-gradient(bottom, #151515, #303030); - background-image: linear-gradient(to top, #151515, #303030); -} - -.btn:focus { - outline: none; -} - -.btn.active, -.btn:active { - background-color: #e6e6e6; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-primary.active, -.btn-primary:active { - background-color: #0044b7; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-info.active, -.btn-info:active { - background-color: #007cba; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-success.active, -.btn-success:active { - background-color: #52a652; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-warning.active, -.btn-warning:active { - background-color: #da860e; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-danger.active, -.btn-danger:active { - background-color: #ad342e; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-inverse.active, -.btn-inverse:active { - background-color: #161616; - background-color: #d9d9d9 \9; - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} - -.btn-link { - color: #0088cc; - cursor: pointer; - border: none; -} - -.btn-link, -.btn-link:active { - background-color: transparent; - background-image: none; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.btn-link:hover { - color: #005580; - background-color: transparent; - background-image: none; - border: none; - box-shadow: 0 0 0 rgba(0, 0, 0, 0); -} - -.btn.disabled, -.btn[disabled] { - cursor: default; - color: #777777; - background-color: #dddddd; - text-shadow: 0 1px 0px rgba(255, 255, 255, 0.65); - border-color: #aaaaaa; - background-image: none; - /* opacity: 0.65; */ - -webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.45); - -moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.45); - box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.45); - filter: alpha(opacity=65); - -} - -.btn-link.disabled, -.btn-link[disabled] { - cursor: default; - color: #777777; - background: none; - text-shadow: 0 1px 0px rgba(255, 255, 255, 0.65); - border: none; - background-image: none; - /* opacity: 0.65; */ - text-decoration: none; - -webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0); - -moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0); - box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0); - filter: alpha(opacity=65); - -} - - -.node-image-outline { - display: block; - width: 204px; - height: 62px; - overflow: hidden; - background: url(../img/node_image_outline.png) no-repeat top left; - margin-bottom: 10px; -} - -.node-popup .span5 { - width: 204px; -} - -.node-popup .span7 { - width: 290px; - margin-left: 15px; - margin-bottom: 10px; -} - -.node-popup .span7 div { - word-break: break-all; -} - -.simple-mode-title, .simple-type-title { - /* padding: 0 20px 0 15px; */ -} - -.mode-description, .type-description { - display: block; - padding: 0; - overflow: hidden; - text-align: justify; - margin-top: 0px !important; - font-size: 12px !important; - line-height: 14px !important; -} - -.controlls-without-labels { - margin: 0; - margin-left: 15px !important; - width: 30%; - float: left; - height: 90px; -} - -.mode-control-group { - height: 90px; -} - -.mode-control-group, .type-control-group { - margin: 0; -} - -.mode-control-group .span7, .type-control-group .span7{ - margin-left: 0; - margin-right: 10px; -} - -.pull-right-help { - margin: 0; - margin-left: 30%; - height: 90px; - padding: 0 10px 0 10px; - position: relative; -} - -.cluster-removing-description { - margin-bottom: 10px; -} - -.disabled-cluster { - background-color: #aaa; -} -.disabled-cluster:hover { - background-color: #acb2b9; - background-image: -webkit-linear-gradient(top, #d0d2d2, #a2a9aa); - background-image: -moz-linear-gradient(top, #d0d2d2, #a2a9aa); - background-image: -o-linear-gradient(top, #d0d2d2, #a2a9aa); - background-image: -ms-linear-gradient(top, #d0d2d2, #a2a9aa); - background-image: linear-gradient(top bottom, #d0d2d2, #a2a9aa); -} - -.rollback { - overflow: hidden; - width: 38px; - height: 34px; - border: solid 1px rgba(0,0,0,0); - background: none; - box-shadow: none; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - margin: 3px 4px 0px 4px; - padding: 3px 2px 2px 1px; -} - -.rollback > i { - color: #ffffff; - font-size: 17px; - font-weight: 600; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.3); -} - -.rollback:hover { - width: 38px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #59616b; - -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.15), inset 0 0 0 1px rgba(255,255,255,.12); - -moz-box-shadow: 0 1px 4px rgba(0,0,0,.15), inset 0 0 0 1px rgba(255,255,255,.12); - box-shadow: 0 1px 4px rgba(0,0,0,.15), inset 0 0 0 1px rgba(255,255,255,.12); - border: solid 1px #393e45; - background-image: -webkit-linear-gradient(bottom, #555c66, #5e6671); - background-image: -moz-linear-gradient(bottom, #555c66, #5e6671); - background-image: -o-linear-gradient(bottom, #555c66, #5e6671); - background-image: -ms-linear-gradient(bottom, #555c66, #5e6671); - background-image: linear-gradient(to top, #555c66, #5e6671); -} - -.rollback:active { - width: 38px; - border: transparent; - background-image: none; - background-color: #40454d; - -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.2); - -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.2); - box-shadow: inset 0 2px 4px rgba(0,0,0,.2); -} - - - -.sign-warning { - font-size: 70px; - color: #a0342f; - text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.3); -} - -.statistic > div { - float: left; - text-transform: uppercase; - font-size: 11px; - vertical-align: top; - line-height: 11px; - padding: 6px 8px; - /* color: #ccc; */ - color: #d3d8d9; - text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.3); - font-family: Segoe UI, Arial; - font-weight: 500; -} - -.statistic .stat-count { - font-size: 30.5px; - margin-top: -1px; - line-height: 26px; - padding-right: 1px; -} - -.statistic .stat-title { - margin-top: -1px; - padding-left: 2px; - font-size: 8.5px; - font-weight: 500; - padding-top: 10px; -} - -.cluster-status-deploy { - margin: 5px 40px 0px 40px; - height: 12px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #b5bbbc; - -webkit-box-shadow: 0 1px rgba(255,255,255,.25), inset 0 1px 6px rgba(0,0,0,.25); - -moz-box-shadow: 0 1px rgba(255,255,255,.25), inset 0 1px 6px rgba(0,0,0,.25); - box-shadow: 0 1px rgba(255,255,255,.25), inset 0 1px 6px rgba(0,0,0,.25); -} -.cluster-status-deploy > .bar { - height: 12px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - background-color: #41900c; - background-image: -webkit-linear-gradient(bottom, #51a451, #61c161); - background-image: -moz-linear-gradient(bottom, #51a451, #61c161); - background-image: -o-linear-gradient(bottom, #51a451, #61c161); - background-image: -ms-linear-gradient(bottom, #51a451, #61c161); - background-image: linear-gradient(to top, #51a451, #61c161); -} - -.fieldset-group { - margin: 0px; - padding-bottom: 2px; -} - -.fieldset-group > .fieldset-group { - margin-left: 20px; -} - -.fieldset-group h4 { - font-size: 16.5px; - padding: 0px; - text-transform: capitalize; - margin: 10px 0 0; -} - -.fieldset-group label { - margin-top: 10px; -} - -.label-info { - margin-bottom: 10px; -} - -.deployment-control-box { - /* background: rgba(0,0,0,.15); */ - border-radius: 4px; - margin-top: 5px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - height: 40px; - text-align: right; - padding: 0px; - width: auto; -} - -.deployment-progress-box { - background: rgba(0,0,0,.15); - border-radius: 4px; - margin-top: 5px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - height: 40px; - text-align: right; - padding: 0px; - width: auto; -} - -.deploying-progress-text-box { - display: block; - color: #ffffff; - font-size: 11px; - text-align: left; - -webkit-font-smoothing: antialiased; - text-shadow: 0 0 0 rgba(0, 0, 0, 0); - margin-left: 12px; -} - -.deploying-progress-status-box { - display: block; - color: #ffffff; - height: 34px; - font-size: 14px; - text-align: left; - -webkit-font-smoothing: antialiased; - text-shadow: 0 0 0 rgba(0, 0, 0, 0); - - line-height: 32px; - vertical-align: middle; - margin: 3px 10px 0px 10px; -} - -.installation-status { - display: inline-block; - border-radius: 3px; - font-size: 11.844px; - font-weight: bold; - line-height: 14px; - padding: 2px 4px; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - vertical-align: baseline; - white-space: nowrap; - background: rgba(0,0,0,.08); - padding: 5px 6px 5px 6px; - margin: 8px 12px 0px 8px; - color: #9EA4B6; -} - -.progressbar-wrapper { - position: absolute; - right: 0; -} - -.deployment-control-box:after, -.deployment-progress-box:after { - clear: both; -} - -.page-control-button-placeholder .deploying-progress-text-box { - color: #444; - padding-top: 4px; - font-weight: bold; - float: left; -} - -.percentage { - width: 35px; - margin: 14px 0 0 12px; - line-height: 11px; -} - -.deploying-progress-bar-box { - float: left; - margin-bottom: 8px; -} - -.deployment-control-item-box { - display: block; - float: right; -} - -.deployment-control-item-box > .progress-deploy { - width: 100px; - margin: 0px; - margin: 12px 0px 0px 12px; -} - -.deployment-control-item-box > .progress-deploy > .bar { - margin: 0px; - padding: 0px; -} - -pre { - font-size: 13px; - border: none; - background: none; - color: #545A63; - font-family: "Lucida Console", Menlo, Monaco, Consolas, "Courier New", monospace; - margin: 0; - padding: 2px; - line-height: 15px; -} - -select[name=release] option { - height: 20px; -} - -/* Header Block */ -.header-box { - display: block; - width: 100%; - cursor: default; -} - -.header-box:after { - clear: both; -} - -.header-logo { - display: block; - float: left; - width: 110px; - height: 60px; - background: url(../img/mirantis-logo-small.png) no-repeat top left; - margin: 10px 0px 10px 10px; - overflow: hidden; - /*cursor: pointer;*/ -} - -/* -.header-logo:hover { - display: block; - float: left; - width: 110px; - height: 60px; - background: url(../img/mirantis-logo-small.png) no-repeat 0px -60px; - margin: 10px 0px 10px 10px; - overflow: hidden; -} -*/ - -.header-info { - display: block; - float: right; - padding: 18px 10px 0px 0px; -} - -.header-user { - display: block; - text-align: right; - color: #d3d8d9; - font-size: 15px; - /*cursor: pointer;*/ -} - -/* -.header-user:hover { - color: #ffffff; -} -*/ - -.header-user p { - display: inline; - margin: 0px; - padding: 0px; - border-bottom: 1px dotted #7789a0; -} - -/* -.header-user:hover p { - border-bottom: 1px dotted #ffffff; -} -*/ - -.header-version { - display: block; - color: #7789a0; - font-size: 11px; - margin-top: 8px; -} - -/* Verification Block */ -.form-inline > .spacer { - display: inline-block; - width: 30px; -} - -.verification-box { - display: block; - margin: 10px 20px 10px 20px; - position: relative; - top: 0px; - left: 0px; -} - -.verification-network-placeholder { - display: block; - float: left; - width: 590px; - margin-right: 20px; -} - -.verification-text-placeholder { - display: block; - height: 160px; -} - -.verification-text-placeholder li { - list-style: none outside none; - margin: 2px 0 0; - margin-bottom: 8px; - line-height: 17px; -} - -.verification-result-table { - clear: both; - padding-top: 10px; -} - -.verification-box > .alert { - margin-bottom: 0px; - margin-top: 10px; - padding: 8px 35px 10px 14px; - width: 529px; -} - - -.verification-router { - display: block; - width: 200px; - height: 58px; - margin-left: 190px; - background: url(../img/router.png) no-repeat top left; -} - -.verification-node-1 { - display: inline-block; - width: 140px; - height: 40px; -} - -.verification-node-2 { - display: inline-block; - width: 140px; - height: 40px; - margin-left: 76px; -} - -.verification-node-3 { - display: inline-block; - width: 140px; - height: 40px; - margin-left: 76px; -} - -.verification-node-1, .verification-node-2, .verification-node-3 { - background: url(../img/node-small.png) no-repeat top left; -} - -.connect-1-stop, .connect-1-success, .connect-1-error { - display: inline-block; - width: 176px; - height: 62px; - margin-left: 62px; - overflow: hidden; -} - -.connect-1-stop { - background: url(../img/connect_1_anim.gif) no-repeat top left; -} - -.connect-1-success { - background: url(../img/connect_1_anim.gif) no-repeat 0px -62px; -} - -.connect-1-error { - background: url(../img/connect_1_anim.gif) no-repeat 0px -124px; -} - -.connect-2-stop, .connect-2-success, .connect-2-error { - display: inline-block; - width: 8px; - height: 62px; - margin-left: 45px; - overflow: hidden; -} - -.connect-2-stop { - background: url(../img/connect_2_anim.gif) no-repeat top left; -} - -.connect-2-success { - background: url(../img/connect_2_anim.gif) no-repeat 0px -62px; -} - -.connect-2-error { - background: url(../img/connect_2_anim.gif) no-repeat 0px -124px; -} - -.connect-3-stop, .connect-3-success, .connect-3-error { - display: inline-block; - width: 176px; - height: 62px; - margin-left: 46px; - overflow: hidden; -} - -.connect-3-stop { - background: url(../img/connect_3_anim.gif) no-repeat top left; -} - -.connect-3-success { - background: url(../img/connect_3_anim.gif) no-repeat 0px -62px; -} - -.connect-3-error { - background: url(../img/connect_3_anim.gif) no-repeat 0px -124px; -} - -.router-box { - display: block; - height: 58px; - overflow: hidden; -} - -.animation-box { - display: block; - height: 62px; - margin-top: -9px; - overflow: hidden; -} - -.nodex-box { - display: block; - height: 40px; - overflow: hidden; -} - -input.error, .control-group select.error { - border-color: #B94A48; - color: #B94A48; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; -} - -input.error:focus { - border-color: #B94A48; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -#nodeDetailsAccordion .accordion-toggle { - text-transform: capitalize; - font-weight: bold; - color: #333; - background-color: #ececec; -} - -#nodeDetailsAccordion .accordion-toggle[data-group=cpu] { - text-transform: uppercase; -} - -#nodeDetailsAccordion .accordion-toggle:hover { - text-decoration: none; -} - -#nodeDetailsAccordion .accordion-toggle span { - font-weight: normal; - padding-left: 5px; - text-transform: none; -} - -#nodeDetailsAccordion .accordion-inner div { - clear: both; - font-size: 12px; - line-height: 12px; - padding: 4px; -} - -#nodeDetailsAccordion .accordion-inner div label { - text-transform: uppercase; - display: inline-block; - float: left; - width: 150px; - font-size: 12px; - line-height: 12px; - padding-right: 10px; - word-break: break-all; -} - -#nodeDetailsAccordion .nested-object { - border: 1px solid #ececec; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - margin-top: 3px; -} - -#nodeDetailsAccordion .nested-object div { - padding: 0; -} - -#nodeDetailsAccordion .nested-object div, #nodeDetailsAccordion .nested-object div label { - font-weight: normal; -} - -.action-item-placeholder { - border: 1px solid #e0e0e0; - border-radius: 4px; - background-color: #f0f0f0; - height: 160px !Important; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - overflow: hidden; -} - -.action-item-placeholder > form > h4 { - display: block; - margin: 0px; - padding: 0px; - height: 24px; - overflow: hidden; - margin: 17px 20px 10px 20px; -} - -.action-item-placeholder > form > .action-item-description { - display: block; - margin: 0px; - padding: 0px; - height: 42px; - overflow: hidden; - margin: 0px 20px 0px 20px; - -} - -.action-item-placeholder > form > .important { - color: #c03832; - font-style: italic; -} - -.action-item-placeholder > form > .action-item-controls { - display: block; - margin: 0px; - padding: 0px; - overflow: hidden; - margin: 20px 20px 0px 20px; -} - -.support { - min-height: 240px; -} - -.support:after { - display: table; - line-height: 0; - content: ""; - clear: both; -} - -.support .span12 { - margin-top: 10px; -} - -.support p:nth-child(even) { - padding-bottom: 10px; -} - -.rename-cluster-form .control-group { - margin-bottom: 0; -} - -.accordion-inner, .accordion-inner label { - cursor: default; -} - -/* custom checkbox & radio */ - .custom-tumbler { - margin-top: 4px; - width:24px; - height:24px; - /* overflow:hidden; */ - position:relative; - } - - .custom-tumbler input[type=checkbox]{width:24px;height:24px;margin:0;overflow:hidden;position:absolute;filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0; cursor: pointer;} - .custom-tumbler input[type=checkbox] + span{display:block;width:24px;height:24px;overflow:hidden;font-size:1px;line-height:0;background:transparent url(../img/radio_checkbox.png) no-repeat scroll -24px 0px;} - .custom-tumbler input[type=checkbox]:checked + span{background-position:0 0px;} - .custom-tumbler input[disabled] + span{filter:alpha(opacity=50);-moz-opacity:0.5;-khtml-opacity:0.5;opacity:0.5;cursor: not-allowed;} - .custom-tumbler input[type=checkbox] + span.checked{background-position:0 0px;} - - - .custom-tumbler input[type=radio]{width:24px;height:24px;overflow:hidden;position:absolute;filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0; cursor: pointer;} - .custom-tumbler input[type=radio] + span{display:block;width:24px;height:24px;overflow:hidden;font-size:1px;line-height:0;background:transparent url(../img/radio_checkbox.png) no-repeat scroll -24px -24px;} - .custom-tumbler input[type=radio]:checked + span{background-position:0px -24px;} - .custom-tumbler input[disabled] + span{filter:alpha(opacity=50);-moz-opacity:0.5;-khtml-opacity:0.5;opacity:0.5;cursor: not-allowed;} - .custom-tumbler input[type=radio] + span.checked{background-position:0px -24px;} - -.parameter-box { - display: block; - /* - margin-left: 12px; - */ -} - -.fieldset-group > div > .parameter-box, -.fieldset-group > div > div > .parameter-box { - margin-left: 12px; -} - -.parameter-name { - display: block; - float: left; - min-width: 120px; - max-height: 30px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - font-weight: 600; - margin-top: 4px; - margin-right: 14px; - overflow: hidden; - cursor: default; -} - -.show-password .parameter-name { - font-weight: normal; -} - -.modal .parameter-name { - cursor: pointer; -} - -.parameter-name.hide { - display: none; -} - -.parameter-control { - display: block; - float: left; - padding: 0px; - margin-right: 10px; - max-height: 40px; -} - -.parameter-description { - display: block; - float: left; - color: #999999; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - width: 560px; - margin-top: 4px; -} - -.parameter-spacer { - height: 8px; -} - -.modal-parameter-description { - color: #999999; - margin: 0 0 8px 35px; -} - -.global-description { - display: block; - color: #999999; - margin: -6px 20px 8px 46px; -} - -legend.openstack-settings, legend.networks { - display: block; - padding: 0; - margin-bottom: 15px; - font-size: 18px; - line-height: 18px; - color: #333333; - border: 0; - background-color: #ececec; - border: 1px solid #e5e5e5; - border-radius: 4px; - padding: 10px 12px 12px 12px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - height: 42px; - margin-top: 20px; - text-transform: capitalize; -} - -legend.openstack-sub-title { - font-size: 17px; - margin: 25px 0px 6px 14px; - line-height: 30px; -} - -.networks-sub-title { - width: 175px; -} - -.deploy-task-name { - font-size: 13px; - padding: 8px 10px 1px 10px; -} -.deploy-task-name.header { - font-weight: bold; -} - -.deploy-task-item { - padding: 4px 10px; -} - -/* -.deploy-task-item:hover { - background-color: #eeeeee; - border-radius: 3px; -} -*/ - -.deploy-task-notice { - margin: 0px; - padding: 0px 10px; - color: #C03832; - font-style: italic; - text-align: center; -} - -hr.slim { - margin: 10px; -} - -.display-changes-dialog .alert-error { - margin-top: 10px; -} - -.radio-checkbox-group { - margin: 0; - padding: 0; - margin-top: 10px; -} - -.radio-checkbox-group:before, .radio-checkbox-group:after { - display: table; - line-height: 0; - content: ""; -} - -.radio-checkbox-group:after { - clear: both; -} - -.radio-checkbox-group > .item-box { - width: auto; - float: left; - margin-left: 0px; - padding:0px; - min-height: 1px; -} - -.radio-checkbox-group > .item-box > .parameter-box { - margin: 0px; - margin-right: 20px; -} - -/* Network Unterfaces Settings */ -.physical-network-box { - display: block; -} - -.network-box-name { - margin-left: 20px; - font-size: 16px; -} - -.network-box-item { - display: block; - background-color: #f0f0f0; - min-height: 80px; - border: 1px solid #999999; - margin-left: 20px; - margin-bottom: 30px; - margin-top: 10px; -} - -.network-box-item:after{ - clear: both; - display: table; - line-height: 0; - content: ""; -} - -.network-info-box { - display: block; - width: 305px; - min-height: 44px; - float: left; - margin: 17px 0px 0px 20px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - padding-left: 74px; -} - -.online { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAAsCAYAAAAuCEsgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA75JREFUeNrsmj9uFDEUxv05dBRoSzgA0HCECAlEAQWpEHR7CCSElDoSQuIQiYQEokpA0EWgPUIa4ABQrrjAPNb2G/vZ82Z2N+OgZZWJJjvjcbz+zff+2QpOT0+vGmP2F+cdsx3H2eI8sFsGZZhl324ZVISzZkuPS7D/7biyrMNkMrm2iROfz+d/RoG54+Hhk10DGINw//vNz/jsxotb/vPX6x+p7SW3vZJtt7nt+3A/Zbzrz2+GC3InmS/TD7PRigWDZSKYCDdozBadJuys1k8fj6H8QKhjihII2qBCydQE5QUosK6NlH6kj0cLtTr9x4DFiSqKQXvrijpYUR39pQTFYFAveETFLF9Y5Us12HIOO5p5KortGF3Fxv0Bhc9VpryoFT8ui4qP3j31wcNbIhIcNN9DalvmDkQCgkgECL5s+KIJz4mDx+dn72dVoqKHssmfoiJQQMR99tmh4keU7ktQb5berdyvxRwcXFMxeHSgbAKQzyRIx1eQACQcRaWQQFsAMODiJ6jnXjDV9DEFqlRONU0MKuZ+gZCbHhgSJsIYm8NVDR4SKlOpAyjaYXrskdjaIHxKmB77VkgHrF4GVzsqSigrzE1ETBRw/QOGINdCeUiOfN4oWzNtgvm1cPXzmBHBAgWUjJjoSeiKj8WE2/qXZUAbwrpXCGx+CH1RtfLIJi9OG3JMCZUFjjJKalFPAhLDGc5ZSMMQGLoaWKmW9DcowcTokTJeUztTzbe8ThEi+hWSalWjIjo+g8yfMigrUoFRFOO4Tg0DcjR0Y3gIHxWFciJP0oqmuPZCM6klg0pR/kBAyT5Z/zYQFQWy0l+tM6uBqQkXeTJuoWTphZ6z9FuLIuAo3wdcAFjhcOipEVEm5qwj1GfQAk3shnPNsM6eB3ruxcTl2YUbGGtzNnMwuFhd62/+CRjRqh3PMQ2qPId1FaN0QXLtRD1fSsW6i0Q36pm47JsNUnn7zR2fHr/t3RXa+zrdLeeW176i4O3UVAWsOI7vHc7GmOJSsKGVqt9z5IrB5xqXXK2vG5T9CereynKqoVR90Gp7hxcbPIhSQduZMNd7xeIyLfUp3wogWtuXxteKA1xowisKyvFEnXLULkPKql7c8/oqKtVU4RoPdnL/KPOFvW/TXbT1Hydd0qxSKOyUOr47zqeqgpU+4H3OvXGQKI96KvJsuTLep6or1jniEoMB+3cGhlPFpoFRu7wf2tBpk2C55bbJYCcPjmZmA46qYDV9ZAOL4EuwS7Dzgp1tIdeZAzvYMjj/L0d/BRgA1K6dRaOB79cAAAAASUVORK5CYII=) no-repeat top left; -} - -.offline { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAAsCAYAAAAuCEsgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABMpJREFUeNrsWlluFDEQdXn44wPlIBwhfyhAOA6CAGERQmEVp0EsQSg/OUIOEnEAXNjl2uzxkAndQWGUVjKdcbt76vlVvaryBI6Ojq6HEPbz782wGcdJ/j2IGwYqMJb9uGGgFFwMG3pcAfvfjmtnTdja2rpxGQ0/PT39OQlYOe4/2NsG+gvo58f3b3pt5/YujX3/9kXHbt+9R+fDr59t7E6dd/jVz9ulZ/p5O2Ue5ucd2rxbO3dorLyU08cP744nM8Zw8gvwubsWISDi8j3QToxxMZgTl+6l+2BgAxRY2YbBZ/09MPowUIAtaCBwLYi4ZFs/h+blZ2H/vIpg6XnC2Gwx5leRoPWGDA2OQxAjxnpjK9MrxnB5YScBMyOWXQxGHwSDeXHgdrG4Fgy9ox+je9cERffkWvHTWaq493h/m1wOzEj5QC8qwOeAXazoSmPQCeVVgRY2gKSBxngapkT3lbNMLXPevTk4nkUVxWCNNQIEDTP9exsTKwtaYa3en4ocEE4MMopgoCELDl0pMZvfpzKGM8ZYsSuqgDAwAQTCpIFlSGRUdeEiMMGxVK8uiKVA4AF5fnAqK+znU+JqAucUDwn82ElxdC4p7lOACGmxmAIGSBaByMvXiDG6MVZmk6UTiqtUUfGMytis4pEfRtLMigfeHYU1UUeUYOfcB607l1gS9iB5AHl8ARpj1RVN+lHyXsB5VVHAmQua/Jsu5DmLagydObZESNRYXv3Foi4ALLAuBLLfxZqIRUyUpVhYhXldkc1UtwNynwoKesAQLdYAgkhDTbSEgHMd1vhpXIzFg6uMKIJCaSFWmucChppfYmUpggNlMdW4qKqlCQj7qRJTDM1aR7GIKhaRYzLR5xWWKnspDGu6aYxFVkNsghu6GAINnl4pwVedJUG5IoLZLcYn1GQctQZlvkk9xnXpBPFAa98o+BkoO6gIi5Q+4OpKEzHnapHvZeo0jthVfVWFKvJAbjgq4aY1msIaPxg5wfjYktLLErkAApV8RIk9tGTv3NYKAS1oJOLOlcnWVEUzpBGIYK2MxJq5UmzqPA/AEnWresROdlNQWZGkHVhAcO0YO8fWAPhGhRUyWI0o1TclbmgMblTV9VfNuUkhMo5cHAAv7gXseWjQjoK3Y0Nk3jepAaR8Al156tsgts/vas22qof5gS270TJo33G0QLEZU9dz91kM4p/bIpybsYSrey3XkozlGIaLYQB9+oAVmRTPE2LnKKmCqS7aHxxdqVYGgM0+hu981eCUdHF6hmTxyhm5lbEeDebfGnj18sXKXaGDN++3NQmrq6ExpamQjR4oo85znfLTJ3vHYcJxJrA/daqlu0aSZ6m6Y7urxIyQSq6ISURmLiUnTrjW3uF8rrjiKEVs1HxlxgqJKRvt8xk5b/IFsLBVS62UcLJNk7e4xYh6rgFuq+/2KhDb6gOts0oUU3XuurXghTP2/OnjJhZev60xV1e/7mx4KVNWQ10AqS+ePHp4HGY8JgHrY6DGHDa1CjJI4MTs+0kpqRJOj6kLibE23zFTkWs/2ULT+Kugfrn3AcPsx/zAkNucVNuMdmtatgWYrcR5KuHlB/asi7lL+/3YnN9Z/cvj6qvaK2CXCNjJBuI6KcAONgwc/cvRbwEGAPmeakddReAwAAAAAElFTkSuQmCC) no-repeat top left; -} - -.logical-network-box { - display: block; - float: left; - width: 600px; - min-height: 68px; - margin-bottom: 10px; - text-align: center; - position: relative; -} - -.logical-network-box:after { - clear: both; - display: table; - line-height: 0; - content: ""; -} - -.logical-network-group { - display: block; - float: left; -} - -.logical-network-item { - display: block; - float: left; - width: 110px; - height: 58px; - margin-top: 10px; - margin-left: 10px; - text-align: center; - text-shadow: 0 1px 0 rgba(255,255,255,.4); - -webkit-box-shadow: inset 0 0 0 1px #fff; - -moz-box-shadow: inset 0 0 0 1px #fff; - box-shadow: inset 0 0 0 1px #fff; - border: solid 1px #999; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - background: #d9d9d9; /* Old browsers */ - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNiNGI0YjQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); - background: -moz-linear-gradient(top, #d9d9d9 0%, #b4b4b4 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d9d9d9), color-stop(100%,#b4b4b4)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #d9d9d9 0%,#b4b4b4 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #d9d9d9 0%,#b4b4b4 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #d9d9d9 0%,#b4b4b4 100%); /* IE10+ */ - background: linear-gradient(to bottom, #d9d9d9 0%,#b4b4b4 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d9d9d9', endColorstr='#b4b4b4',GradientType=0 ); /* IE6-8 */ -} -.logical-network-item:hover { - border: 1px solid #777777; - background-image: -webkit-linear-gradient(bottom, #a7a6a6, #cdcccc); - background-image: -moz-linear-gradient(bottom, #a7a6a6, #cdcccc); - background-image: -o-linear-gradient(bottom, #a7a6a6, #cdcccc); - background-image: -ms-linear-gradient(bottom, #a7a6a6, #cdcccc); - background-image: linear-gradient(to top, #a7a6a6, #cdcccc); - cursor: move; -} - -.logical-network-item > .name { - margin-top: 10px; - font-size: 15px; -} - -.logical-network-item > .id { - color: #444444; - font-size: 10px; -} - -.changes-locked .logical-network-item { - cursor: not-allowed; -} - -.network-help-message { - font-size: 16px; - color: #555555; - margin-top: 26px; - position: absolute; - margin-left: 10px; -} -.network-offline-message { - font-size: 16px; - color: #999999; - margin-top: 26px; -} - -.radio-checkbox-group > .item-box > .parameter-box > .parameter-control { - margin-right: 5px; -} - -.radio-checkbox-group > .item-box > .parameter-box > .parameter-name { - min-width: 10px; -} - -.changes-locked label { - cursor: default !important; -} - -/* Disk Utility Start*/ -.disk-box { - display: block; - margin-left: 20px; - margin-bottom: 30px; - margin-top: 10px; -} - -.disk-box-name { - font-size: 18px; - color: #333333; - margin-bottom: 8px; - height: 20px; -} - -.disk-box-size { - font-size: 14px; - color: #555555; - margin-bottom: 8px; -} - -.disk-map-short { - clear: both; - display: block; - height: 60px; - background-color: #ffffff; - border: 1px solid #999999; - /* padding: 1px; */ - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} -.disk-map-short:hover { - -webkit-box-shadow: 0 0 8px rgba(0,0,0,.3); - -moz-box-shadow: 0 0 8px rgba(0,0,0,.3); - box-shadow: 0 0 8px rgba(0,0,0,.3); - cursor: pointer; - border-color: #777777; -} -.changes-locked .disk-map-short { - cursor: not-allowed; -} - -.disk-map-full { - clear: both; - display: block; - height: 60px; - background-color: #ffffff; - border: 1px solid #999999; - /* padding: 1px; */ - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - overflow: hidden; -} - -.disk-map-full > .disk-map-image > .volume-group > .close-btn { - width: 16px; - height: 16px; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAH1JREFUeNrEU8ENwCAI1E7iCI7EZozICBQbml6QV2nSSwhEvANRu6q2CnpVoC0BFLF4mLGZ6APxtbHxUMD8DMSIlZupgFcW2JiRbz8yAcYqZgRkCt1xJoBVydukEGM3m0AEwcAoyV+8o1Xx5RHKQ6xdY/khvX3K/fffeAowAHqsOyt5zY/NAAAAAElFTkSuQmCC); - position: relative; - top: -60px; - left: 100%; - margin-left: -18px; - margin-top: 2px; - cursor: pointer; -} - -.disk-map-full > .disk-map-image > .volume-group > .close-btn:hover { - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAARdJREFUeNqsUzsOgkAUBNEQiTFWSmNCrLWwteICmlhTWFFwDCrjGUi8ggWlrZfgDLZqAD/4xswmSGK1vmTC27czs2+XXdP4jpbAEnQEbY4RL8FDcBc8Of6EWfuCbAt6hEMjg8Kb4EIUNKmUkUXROIqiVZZlx6IorhUDOWqYA4dcq942VhvHcbwpy/JS/QjMgUMTR20RbQ7hrsR5nt+aYlUDh50M1RbhNEGLihgEwTZJkr0SI0dNmYALDbRtnrbjed4CbrZtd33fH4VheHBd94ya5CcxWWMOY3Idao2BYN5sOU3TndRnAPLmPDTQtow/RF8wrf827FlqS6zMTpb1MwEXGmr1DvEvv1H7ImldZe3HZOo+57cAAwDQB4f/K86qKgAAAABJRU5ErkJggg==); -} - - -.disk-map-image { - display: block; - width: 100%; - border: thin solid white; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} -.disk-map-image:after { - clear: both; -} - -.disk-info-box { - width: 45%; - float: left; - padding: 14px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -.disk-utility-box { - width: 55%; - float: left; - padding: 14px; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -.disk-box-title { - font-size: 16px; - color: #555555; - text-shadow: 1px 0 0 rgba(255,255,255,1); - margin-bottom: 10px; -} - -.disk-map-details { - border-left: 1px solid #999999; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - background-color: #f0f0f0; -} - -.disk-map-details.collapse { - visibility: hidden; -} - -.disk-map-details.collapse.in { - visibility: visible; -} - - -.disk-map-details-item { - display: block; - clear: both; - min-height: 12px; - margin-bottom: 18px; -} - -.disk-map-details-name { - font-size: 14px; - color: #555555; - width: 60px; - float:left; - text-transform: capitalize; -} - -.disk-map-details-parameter { - font-size: 16px; - color: #333333; - float: left; -} - -.disk-box .use-all-allowed { - color: #0088CC; -} - -.disk-box .use-all-allowed:hover { - color: #005580; - text-decoration: underline; - cursor: pointer; -} - -.disk-visual { - overflow: hidden; - height: 60px; -} - -.disk-visual > .volume-group { - display: inline-block; - float: left; - height: 56px; - text-align: center; - color: #ffffff; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - overflow: hidden; -} - -.volume-group-box-flag { - width: 6px; - height: 59px; - margin: 2px 12px 2px 2px; - float: left; -} - -.disk-visual .unallocated .node-content { - background: #afafaf; /* Old browsers */ - background: -moz-linear-gradient(top, #afafaf 0%, #d5d5d5 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#afafaf), color-stop(100%,#d5d5d5)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #afafaf 0%,#d5d5d5 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #afafaf 0%,#d5d5d5 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #afafaf 0%,#d5d5d5 100%); /* IE10+ */ - background: linear-gradient(to bottom, #afafaf 0%,#d5d5d5 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afafaf', endColorstr='#d5d5d5',GradientType=0 ); /* IE6-8 */ - color: #555555; -} - -.disk-visual.invalid > div { - outline: 1px solid #fff; - background: #afafaf !important; /* Old browsers */ - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ - background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2FmYWZhZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkNWQ1ZDUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+) !important; - background: -moz-linear-gradient(top, #b0b0b0 0%, #a0a0a0 100%) !important; /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b0b0b0), color-stop(100%,#a0a0a0)) !important; /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #b0b0b0 0%,#a0a0a0 100%) !important; /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #b0b0b0 0%,#a0a0a0 100%) !important; /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #b0b0b0 0%,#a0a0a0 100%) !important; /* IE10+ */ - background: linear-gradient(to bottom, #b0b0b0 0%,#a0a0a0 100%) !important; /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b0b0b0', endColorstr='#a0a0a0',GradientType=0 ) !important; /* IE6-8 */ -} - -.unallocated .node-content .toggle-volume { - color: #555555; - text-shadow: 1px 0 0 rgba(255,255,255,.3); - -} - -.volume-group-name { - font-size: 16px; - margin-top: 4px; - text-shadow: 0 0 2px rgba(0,0,0,.5); - text-overflow: ellipsis; - overflow: hidden; - padding: 3px; - white-space: nowrap; -} -.volume-group-size { - font-size: 11px; - text-shadow: 0 0 2px rgba(0,0,0,.5); - white-space: nowrap; -} -.unallocated .node-content .volume-group-name, .unallocated .node-content .volume-group-size { - text-shadow: 1px 0 0 rgba(255,255,255,.3); - /*margin-top: 16px;*/ -} -.volume-group-box { - display: block; - height: 48px; - border: 1px solid #d0d0d0; - background-color: #e5e5e5; - margin-bottom: 5px; - overflow: hidden; - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} -.volume-group-box:hover { - border: 1px solid #c0c0c0; - background-color: #e0e0e0; -} - -.volume-group-box:after { - clear: both; -} - -.volume-group-box-name { - display: inline-block; - float: left; - font-size: 16px; - color: #555555; - margin-top: 10px; - max-width: 170px; -} - -.volume-group-box-edit { - display: inline-block; - float: left; - font-size: 9px; - text-transform: uppercase; - margin: 14px 6px 0px 0px; -} - -.volume-group-box-input { - display: inline-block; - float: left; - margin: 9px 3px 0px 0px; -} - -.volume-group-box-input > input { - width: 120px; -} - -.volume-group-box-input > input { - text-align: right; - margin-bottom: 0; -} - -.volume-group-box-sizetype { - display: inline-block; - float: left; - margin: 13px 8px 0px 0px; - color: #777777; -} - -.volume-group-box-input .error { - color: #B94A48; - border-color: #B94A48; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; -} - -.volume-group-box-input .error:focus { - border-color: #953b39; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -.volume-group-error-message { - display: block; - overflow: hidden; - text-align: right; - font-size: 12px; - margin-top: -5px; - margin-bottom: 3px; - color: #B94A48; -} - -.toggle-volume { - height: 57px; - position: relative; - top: -4px; - padding-top: 4px; -} - -.hidden-titles .toggle-volume > div, .hidden-titles .close-btn { - display: none !important; -} - -.bootable-marker { - margin-left: 14px; - font-size: 14px; - font-weight: 800; - color: #cc3f14; -} -/* Disk Utility End */ - -.toggle-volume { - height: 56px; - position: relative; - top: -4px; - padding-top: 4px; -} - -.network-interfaces-modal-info { - margin-left: 34px; -} -.network-interfaces-modal-info > p { - margin: 0px; - font-weight: 600; - color: #666666; -} -.network-interfaces-modal-info > ul > li { - margin: 0px; - font-weight: 600; - color: #666666; -} - -form.rhel-license { - padding-left: 10px; - margin-bottom: 0; -} - -form.rhel-license fieldset { - margin-top: 20px; -} - -form.create-cluster-form .input-large { - width: 330px; -} - -form.create-cluster-form select { - width: 340px; -} - - -form.create-cluster-form .control-label { - width: 140px; -} - -form.create-cluster-form .controls { - margin-left: 160px; -} - -div.create-cluster-form { - max-height: 545px; -} - -div.create-cluster-form .control-group, form.create-cluster-form { - margin-bottom: 10px; -} - -div.create-cluster-form .radio-checkbox-group label { - margin-right: 20px; -} - -.releases-table .error { - color: #ee0000; -} - -.rhel-license-dialog { - max-height: 520px; -} - -.rhel-license label { - text-align: left; -} - -.rhel-license span.help-inline { - padding-left: 30px; - position: relative; - left: -26px; -} - -.rhel-license label.control-label { - width: 170px; -} - -.download_progress .progress { - background-image: linear-gradient(to bottom, #435267, #aaaaaa); - background-image: -webkit-linear-gradient(top, #435267, #aaaaaa); - background-image: -moz-linear-gradient(top, #435267, #aaaaaa); - background-image: -o-linear-gradient(top, #435267, #aaaaaa); - background-image: -ms-linear-gradient(top, #435267, #aaaaaa); -} - -.credentials .radio-checkbox-group { - margin-left: 180px; -} - -.release-description { - font-size: 12px !important; - line-height: 15px; - margin-left: 160px; - text-align: justify; - width: 335px; -} - -.releases-table td { - height: 30px; -} - -.releases-table .release-name { - min-width: 200px; -} - -.releases-table .release-version { - width: 100px; -} - -.releases-table .release-status { - min-width: 200px; -} - -.releases-table .release-actions { - min-width: 120px; -} - -.summary-settings-btn { - font-size: 13px; -} - -.releases-table { - cursor: default; -} - -.bar-title { - display: block; - width: 100%; - margin-top: -40px; - font-size: 11px; - text-align: center; - color: white; -} - -.progress-bar-container { - position: relative; -} - -.progress-bar-description { - position: absolute; - color: #fff; - font-size: 10px; - top: 9px; - left: 29px; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.35); -} - -.releases-table th.name { - width: 60%; -} - -.releases-table th.version, .releases-table th.status { - width: 12%; -} - -.releases-table th.actions { - width: 12%; -} - -.releases-table td { - vertical-align: middle; -} - -label.show-password { - clear: both; - margin-left: 120px; - margin-bottom: 30px; -} - -input.input-append { - width: 175px; -} - -/* OpenStack Health Check */ -.healthcheck-table {margin: 0px 0px 30px 0px; } -.healthcheck-table th {font-weight: normal;} -.healthcheck-table th label {margin: 0;} -.healthcheck-name {font-size: 15px; margin: 5px 0px 5px 0px;} -.healthcheck-duration {font-size: 15px; margin: 5px 0px 5px 0px; text-align: center; color: #777777} -.healthcheck-status {font-size: 20px; margin-top: 3px; text-align: center;} -.healthcheck-msg {font-size: 13px; line-height: 15px;} -.healthcheck-msg .well {color: #555555; margin: 0;} -.healthcheck-msg .well b {color: #890000;} -.healthcheck-progress {height: 12px; margin-bottom: 0px; margin-top: 8px;} -.healthcheck-status-stopped, .healthcheck-status-unknown, .healthcheck-status-wait_running {color: #999999;} -.healthcheck-status-success {color: #2e8701;} -.healthcheck-status-failure, .healthcheck-status-error {color: #890000;} -.healthcheck-table .healthcheck-col-status {width: 50px; text-align: center;} -.healthcheck-table .healthcheck-col-duration {width: 120px; text-align: center;} -.healthcheck-table th.healthcheck-col-duration, .healthcheck-table th.healthcheck-col-status {padding: 12px 0 12px 0;} - -/* Cluster toolbar */ -.cluster-toolbar { - display: block; - width: 100%; - height: 65px; - padding: 19px 0px 19px 0px; - margin-bottom: 20px; - border-bottom: 2px solid #a0a0a0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.cluster-toolbar > .pull-right { - float: right; -} - -.cluster-toolbar select { - margin-bottom: 0; -} - -.cluster-toolbar-item { - display: block; - float: left; - margin-left: 20px; -} - -.cluster-toolbar-item:first-child { - margin-left: 0px; -} - -.cluster-toolbar-item > label { - display: block; - height: 30px; - float: left; - margin: 0px; - padding: 0px; - line-height: 29px; - margin-right: 10px; -} -.node-groups { - display: block; - /* background-color: #f0f0f0; */ - border: solid 1px #cccccc; - border-radius: 4px; - padding: 10px 20px 20px 20px; - margin-bottom: 20px; -} - -.node-groups:hover { - background-color: #f5f5f5; -} - -.btn-cluster-actions { - padding: 3px; -} - -.actions-menu { - max-width: 260px; -} - -.actions-item { - display: block; - color: #333333; - font-size: 13px; - margin: 11px 20px 20px 20px; -} -.actions-item > h4 { - margin: 0px; - padding: 0px; - font-size: 13px; -} -.actions-item > .parameter-box > .parameter-name { - font-size: 13px; - font-weight: 100; -} - -.actions-btn { - display: block; - height: 22px; - width: 22px; - overflow: hidden; - float: right; - background: url(/static/img/icons.png) 0px -44px no-repeat; - cursor: pointer; -} - -.animate-spin { - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; - display: inline-block; -} -@-moz-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - -o-transform: rotate(0deg); - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -moz-transform: rotate(359deg); - -o-transform: rotate(359deg); - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -@-webkit-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - -o-transform: rotate(0deg); - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -moz-transform: rotate(359deg); - -o-transform: rotate(359deg); - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -@-o-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - -o-transform: rotate(0deg); - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -moz-transform: rotate(359deg); - -o-transform: rotate(359deg); - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -@-ms-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - -o-transform: rotate(0deg); - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -moz-transform: rotate(359deg); - -o-transform: rotate(359deg); - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -@keyframes spin { - 0% { - -moz-transform: rotate(0deg); - -o-transform: rotate(0deg); - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - - 100% { - -moz-transform: rotate(359deg); - -o-transform: rotate(359deg); - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -.roles-panel label { - display: block; - float: left; - max-width: 200px; - padding-right: 20px; -} - -.roles-panel input[type=checkbox] { - position: relative; - top: -3px; -} - -.roles-panel > hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #a0a0a0; - border-bottom: 1px solid #ffffff; -} - -.role-container { - display: block; - margin: 0px; - padding: 0px; - margin-bottom: 10px; -} - -.role-container > label { - margin: 0px; - padding: 0px; -} - -.role-description { - display: block; - float: none; - clear: both; - font-size: 12px; - font-style: italic; - margin-left: 17px; - margin-top: -8px; - color: #666666; -} - -.btn-edit-nodes { - position: relative; - top: 2px; -} - -.role-conflict { - display: inline-block; - color: #B94A48; - font-size: 12px; - font-style: italic; - margin-left: 20px; -} - -.environment-status { - font-size: 12px; - color: #888888; -} - -.environment-status > p { - margin: 0px; - padding: 0px; - margin-top: -4px; - font-weight: 100; -} - -.environment-status > p > strong { - font-weight: 200; - color: #666666; -} - -.img-register-fuel { - display: block; - width: 118px; - height: 118px; - overflow: hidden; - background: url(../img/support_icons.png) no-repeat 0px 0px; - margin: 10px 0px 0px 20px; -} - -.img-contact-support { - display: block; - width: 118px; - height: 118px; - overflow: hidden; - background: url(../img/support_icons.png) no-repeat 0px -118px; - margin: 10px 0px 0px 20px; -} - -.img-download-logs { - display: block; - width: 118px; - height: 118px; - overflow: hidden; - background: url(../img/support_icons.png) no-repeat 0px -236px; - margin: 10px 0px 0px 20px; -} - -.compute-step { - margin:0; -} - -.compute-step .parameter-name { - text-transform: uppercase; -} diff --git a/nailgun/static/favicon.ico b/nailgun/static/favicon.ico deleted file mode 100755 index 426926d0d4a81e5a7f919674bfe5ef062d98604c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmc&xI}XAy40R=tU~45r7Y0xVJ_8arpd({PMm89G0M5XD7`OuB1RNnp2=7I>3ZbZ| z5+c>B9osK^;S@MZu*V<2*Wku`GRverhw0QwYweWGaUfw~+hfdp6q zS3vpn8Dp*la{oN+3qWhXwbe}EPFnCM!3=kvk&ce@>GGD>fw^a&d%&&c?{w1*xCXER z40GO`Zhq`tUoUR5`I%?D@Uz8biyGtAQKyj0nCcsT&-l=r zoRT`gzUec3N-+6F#n*y$U>PXOMB`kv_5@R?_hHS`nZ L|I>k+3kn96;&Tg!jJtXHOVVwlG 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 diff --git a/nailgun/static/font/fontello.svg b/nailgun/static/font/fontello.svg deleted file mode 100644 index bbd467b8e..000000000 --- a/nailgun/static/font/fontello.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - -Copyright (C) 2012 by original authors @ fontello.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nailgun/static/font/fontello.ttf b/nailgun/static/font/fontello.ttf deleted file mode 100644 index 64bc6c7caabc5702999f676e6c60728402d1ef35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12144 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 N)DRzAlt?!r{~LDKPDcO$ diff --git a/nailgun/static/font/fontello.woff b/nailgun/static/font/fontello.woff deleted file mode 100644 index 1231556beb76eca3b1f92e3737f181e15b74fb45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7664 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 J03-l_{{i@|LC^pI diff --git a/nailgun/static/img/._icons.png b/nailgun/static/img/._icons.png deleted file mode 100755 index a413c29e5cd7a2f478730db87559c18027e42ee2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 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 Y)P6hoO{t_R+x(*u2_*a?-!+^520*{4rT_o{ diff --git a/nailgun/static/img/cogwheel_icon.png b/nailgun/static/img/cogwheel_icon.png deleted file mode 100755 index 69f1e607eeaff729a0f06928be57e5aeeac59f8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bE8P)sFw0aqkhF=oUTIz^T z{SATx@^@la2{Io`;PdnIr*^;+GVwFlI$k;m|UwKI@@6ol#<0-{ru?$(N zbjK=6YisK^cO0iPZFU!+4sEQC#HvKNI>w{@Vb?b|H~7Z)0O%V$cZm8q$Xl>EWU=gB z!5yu^p{I^(>7}KmJ+_-}Gq6iXMn*bliLzCp4Gav-paboF6nrTn201C-7`qjtk78>;PD&haBqx*FCPC3$X^*XHGz29f48BgfLVtsb&~0{ zuvYJdOdpJ;$HvAur&KD{7)t|C-7Ib8%k3DP?!?k?5+h3^=v`TQZf?%V(k(45cV=le zEnG{luC6Ywudf?ey1l)9zpbsU)`5qIhrxq`0|OoP_V#WJ4i1{Lbg@|ESla9LmWPLj zHzSb<$I^vDp>KJ4xd%E_zgI}C-YDF)St^w{rX3m@N&{$8=&W7PWv{NTP8JpxCWP2e zTq?vmrN^I~oRqS3GMU^mOAFSyCFemJY+0K4+>T6v`)pZS=3@yApG>waE%V`6dTMGa zc6@xyu{7i>FKK0+%KUzRDUnE+vvfEd=2+V0a;44g0@R_6)sa|pmWJJOOnZHOU1Mng zGO#q*9I{yUuDBPLrm1r>wO7VYYZMV<5yPx1G*wk+C^+^$3ceH(1a;I-K`~a!((nO2 z0pGk~Xj`47Ax*PFXXz{r_r^H*HpbF6)bxK@`kw#;09VlLmZtA5a{vGU07*qoM6N<$ Ef@r(O5&!@I diff --git a/nailgun/static/img/connect_1.png b/nailgun/static/img/connect_1.png deleted file mode 100644 index 5b11bbc9e748ee0db0705a3eff0e8a9230b89e54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1071 zcmaJ=&rj4q7%hq$L@?+He;g*|X4rPx-7U1CVBIdV(Gs$(Vbu$z9oPoisqNsF^@5O? z5WV;pXhKYkF+?w3Jcx;jA;H9W@L;?eFGLR{dUaZM7Z0vY+WF?2_ultr=Ih4PWh|avty%RBvPn=i--v#cgYKtNM#dUg~oB3XF&oXiz<6ys$xumJPr`ZaWHK` zNdQuo6S7dw%7Z|J0^|jeheK%rD!CyA3ZU_@v|3=#DA@CUza{I1jbow* z#z&^l3mlBM)C3yF|DmqiLWiV;4*mX9I4rODh%ccKF9#OAxcPy&l&|CiWD*>dF<@a*Ow=mzMhNP zyWjge&p++l`0;A%!xgLa{`|4i*S~+Z diff --git a/nailgun/static/img/connect_1_anim.gif b/nailgun/static/img/connect_1_anim.gif deleted file mode 100644 index ecec91992e622ab4034c2a3630641542cee6f2fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15596 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 diff --git a/nailgun/static/img/connect_2_anim.gif b/nailgun/static/img/connect_2_anim.gif deleted file mode 100644 index d07da807243dbc5def4b54b709f8d0ec04f6dc20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10529 zcmeHNX;@Qd7S7cK5p8wsVAa+(#%eoNv!H;aQl%``X=xp$)mlM95|WVR#v~9x_5fku z_kAa9f+#x*SqOwhP(&~);Lc8T5D+c&g4#aMjMM4!*q`_Q$-VbG=ljmNIrq)`x*o9kim z%K>N*x^>+0FxreHAVHrC`<=NYGLtGm+fiu@jxlDkt^tE)P>eCh^eyq0TvIBY@wF?D zderqhE3zw-Y(&BA{}R2=ndr>svIQixGn>WX6P=AQBnoIpB|_(Hs(^&UpqDHJOk<46 z;sAPaNmGzVMeAenyU2J00@`2?maqqJw8v;CS`Saa;|O{u07`i~fCE{>Gp%5#?f;<|IU}R*3!|UPn^mai8yZ9~~0m*q6hrbmA z1-m$b8I@1wF}MN-$U*b$i6lGFQDBV0pch^xz~=roD~FF=N(M^?**Iqs7e~P27ZZA! zDVu9)`NyVg_L4R9DENXS)Ze3h0+cN?02 zwb#IeU_v06>wRUeZ(?q0pl?AiGBDROF@sze7V{yRfn-NEl_PlVO!?i}=#9>h?_w3a zbf)qcPE?8o4`id4GA1(K5X;L@4Bj}~QYbH7DgPD8>nsfarz;K$1@|9c^6Ohr;VhoM ztXHTqp^M)tp30#ZFJO33K?C!@ym&tMY<6b)>D0fUJl0H3jE{|u3=che_~8D%yLSc$ z`fuO5slL(Id%fpc_th(1otHb>+gepE&B`W)TqbR7xOB0;uC}JSs1nAc$w`R`@o}*+(NU2R;bEa6!9jrmVt+qhk&m~Rr-!@S8CMr) zp_8M4&pXWpIcyfwfkCI)Qz>LSlIytm9`04nuAAhhqdgNb+zyHqi+i(7P=<9

      vrSZNmh(>!24fOZy)`MOq?5>?VKL5vOpKjmw$yUr3^v54<{_ulM8#lba zUia_st^3>BHSfN&dX>&f?G;*DDCF{G5G?FmgpEZ|K`b9RzHMh=$Hmzniv%_u8vpd3 z)9dyo&Z*aN-gBr(0E?G#4L%ud^TPjEB2d2+f-%iVUC%ZGuAG zlHwd=qGDYgf|CsjjK2N1KS#|-)k9^KDss3bGdioL0{S9(y7L$_n%BY)6C6`zd+2a zoHFc8Gja1=2Z7=5I0=Iy42m!)qG3>cBPfo&4Ji7=9o~XK+!DWk>lc6Bdwg&F21(T< z`xw?BUgfw?jpZ~~@V)E=XIz+E>a;_a)o#@WZ-&5Q3I+P$HnH-6ys3BHe`uh4_( zCT0gQy+q!TE+GM|XzOslsHAxJnDhj0M0QGAYH)s7RxZ_vc{VPuTwAQ*iFW zrJ7_a0I=mv3TtJiv@u84V%rLFcXnk*abJ(>8uRMSilVCax^4%#e9h3%$k_O>&Zq{Z zKmwQ5&mP>HeLh!)a72A#SawRvnqT+PeKB`SB@$+g@HQIWM#J0a|G$lX`u5P+k40#H zSgU*>OWbKMS|Ji_s2{&B9je?HE=<0|6WaSY_%hFUIJnsdJ9s&ri13bd4~TQM4j06T zQvA}y39(t8r=#+dtyx-z-ww&TDK(DUX-V+ zuC}$>w%15I)egOip8oE>`YUUcKLeXI|$6 zcP|GInv)AfEDZ4EKq?f-@jnwxb90D~JRKSlc8V038IzKeoJWq1i%lqEhU9zaN;0yu z3L$kXJnBMKWpT9w0MrL58<28Nt4%xkvfstVmc%ZZqNA@wEVqIRtW{99pe7A*c9zZwLG~0r82Yf zm4Xc`Gq5rPD>JY%^Jckv>TO{XlB=Z|&(R60pxw0@)12N@vp3(t2H&B9m+HUoZ1ePR z^x+C!?ZwUkULuxvSmjr<&E*E|d@352F+` zptWCTVsyNHaCmA~I#4;^uuuy`H{<#nMZk05Kq}4k8|+?2Mq6vHx}%S*cqF}u0#rSN*T%R~8FP4Ye0FB;?(?Mi ZoQ1px_YUH1_lhQTmYw`eW4#RV#jh^%9!UTI diff --git a/nailgun/static/img/connect_3.png b/nailgun/static/img/connect_3.png deleted file mode 100644 index 2349cd5a3a4e653e7933065991cffadaf101a42d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 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 X-c@giBxfOQ`S$4L?n@H7MrHj4^%tE5 diff --git a/nailgun/static/img/icons.png b/nailgun/static/img/icons.png deleted file mode 100755 index 83053fd50146ed4b7a4bf77850e50a49dd69f839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1911 zcmaJ?2~-nj5Dp^9120rSv6MBS!C^Y3m64+|P+ z?`n_3;l_mo3nDP-j6KnIw%B{XJcfXYX=q?H8i}k%H4+tsMh?kA&7Bh$khFs7j z4*p|O(ZXglf|OW0caE|4WwW9qmeKVk~&R+O0*<}+GChO0I8)a zSc$@j0=}gU2|?Ff3yWn0!8qPoY!j%s?tNknT&T3j{O@#fKJ1=ka(8 zhOq)fnj(i3=rC6H1aZ>AWeeekyFj1wFJ;@_;i6}y^XH16FN?_KruCnM7NHq~r;Y0m%VN?&Z$+R9_2FSoSx zcXr;qNht2kvztC3Zv02AXt;(s0NV`*ej@WZ0ZuW_W6T4P8I@uBJ z&a=;W1$$17J$9`*pxEJMMxaO}7Temj?F3t9!ZXUA5_UCJiim&i4tw_Yy~+POFt;a} z731Bk@^G7Mzfrtr&z{bj@WY0HO@};hGrM#;UGl<(&55zG9X{Gc-j7Wg85wR{1P30y zcyUdCkyuGH630)N;Mdq^Hk-Y&&*k17b!$_+Lw}v`O2vBn(_z;iX;M@DXGHNf&mocO zmz|6&$zR}Zo$#vGiWIKD5RFVclU;3X4DG6)I?CPMolCJc*B|L+t>^w2J!fBYZ{n8M zZ)>7-zh2t=hq0ljX+z!J;%8oE-i2+6iHSE*lViQtgE{lvTX*=+jEY#a?sV;qtX)@J zTwGq&`&jim+`j4b(&I!FrLVg;u_Oq&Y%X0wm{d_zA7;$YtIVq{x34r9k|JyxI)m!A z2juQwToT2j79Gu4zw>Ymfk4O&3JS7HFm2a8nbF1wOt}$r>iv1@zUkHz^GzQ{|J7i3 z3OC+7^Ns>9%o1<5cdkcs(hFNAZAe;re{e9X!=%^iAC)n1%f#@(Xg8;cqQcO+Fx^sD z-f=;xp}hQ(7~bhz5(<*Ztt1e1DMR`Ey41|f%m6x5|=}m7Y?P}`Z{j*+Au;1@kZe-OI&Gqy1 zD=sNtRTEsoY?o_w@867mOc0id~Re)v@HpvTXl-9+{!!m{LgvyOhJ_ zf=3uQr!q!MrM7Z;-_;nSp`Dn5Uy`xxA)_jt?eS$)@@dK75esB?I>Tg9F4u2!q0B#T-SK;w}FC_@xfn1+rV6%W9|U=&A{VM z_+680(YSZruZ>I6lP^{+C3bJ67HI}(#2TVgA+ctw#T@_)Y)- diff --git a/nailgun/static/img/mirantis-logo-small.png b/nailgun/static/img/mirantis-logo-small.png deleted file mode 100644 index 7529814e20e14a4a0c4b14197379f89cbd81b67b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9228 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 XOd?#BE^_Pd|2Y~ey2=%bb}#=2xrtV~ diff --git a/nailgun/static/img/mirantis-logo-small2.png b/nailgun/static/img/mirantis-logo-small2.png deleted file mode 100755 index a2d6a9f63cde78e231c2c1830bd0cf942f155a91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5321 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 diff --git a/nailgun/static/img/node-settings-icon.png b/nailgun/static/img/node-settings-icon.png deleted file mode 100755 index f6c0d79b3657c0da7fe9a890e4f9e8e51229f13b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 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 diff --git a/nailgun/static/img/support_icons.png b/nailgun/static/img/support_icons.png deleted file mode 100755 index c746c8e1e476783d9044e4519fc4c753d23ff97a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18878 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 aA9O(Zni4X#7Y6|HAO~BQ^F(;S-G2l8rC#9x diff --git a/nailgun/static/img/tab_icons.png b/nailgun/static/img/tab_icons.png deleted file mode 100644 index 3242770b1792dbfd3d17e09d8632556b17a5eeaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11285 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

      IY+$+XPrs+&oqH&h3$NmQk2Z4>f7Qj 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 diff --git a/nailgun/static/img/texture.png b/nailgun/static/img/texture.png deleted file mode 100755 index fb51d59c0a569abb99160ed02978915eddaa4999..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4867 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 - - - - Fuel Dashboard - - - - - - - - - - - - -

      - - - diff --git a/nailgun/static/js/app.js b/nailgun/static/js/app.js deleted file mode 100644 index ec4821476..000000000 --- a/nailgun/static/js/app.js +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright 2013 Mirantis, Inc. - * - * 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. -**/ -define( -[ - 'models', - 'views/common', - 'views/cluster_page', - 'views/cluster_page_tabs/nodes_tab', - 'views/clusters_page', - 'views/releases_page', - 'views/notifications_page', - 'views/support_page' -], -function(models, commonViews, ClusterPage, NodesTab, ClustersPage, ReleasesPage, NotificationsPage, SupportPage) { - 'use strict'; - - var AppRouter = Backbone.Router.extend({ - routes: { - 'clusters': 'listClusters', - 'cluster/:id': 'showCluster', - 'cluster/:id/:tab(/:opt1)(/:opt2)': 'showClusterTab', - 'releases': 'listReleases', - 'notifications': 'showNotifications', - 'support': 'showSupportPage', - '*default': 'listClusters' - }, - initialize: function() { - this.content = $('#content'); - this.navbar = new commonViews.Navbar({elements: [ - ['Environments', '#clusters'], - ['Releases', '#releases'], - ['Support', '#support'] - ]}); - this.content.before(this.navbar.render().el); - this.breadcrumbs = new commonViews.Breadcrumbs(); - this.content.before(this.breadcrumbs.render().el); - this.footer = new commonViews.Footer(); - $('#footer').html(this.footer.render().el); - this.content.find('.loading').addClass('layout-loaded'); - }, - setPage: function(NewPage, options) { - if (this.page) { - this.page.tearDown(); - } - this.page = new NewPage(options); - this.page.updateNavbar(); - this.page.updateBreadcrumbs(); - this.page.updateTitle(); - this.content.html(this.page.render().el); - }, - showCluster: function(id) { - this.navigate('#cluster/' + id + '/nodes', {trigger: true, replace: true}); - }, - showClusterTab: function(id, activeTab) { - if (!_.contains(_.pluck(_.result(ClusterPage.prototype, 'tabs'), 'url'), activeTab)) { - this.showCluster(id); - return; - } - - var tabOptions = _.toArray(arguments).slice(2); - - if (activeTab == 'nodes') { - // special case for nodes tab screen change - try { - if (app.page.constructor == ClusterPage && app.page.model.id == id && app.page.tab.constructor == NodesTab) { - app.page.tab.routeScreen(tabOptions); - return; - } - } catch(e) {} - } - - var cluster, tasks; - var render = function() { - this.setPage(ClusterPage, { - model: cluster, - activeTab: activeTab, - tabOptions: tabOptions, - tasks: tasks - }); - }; - - if (app.page && app.page.constructor == ClusterPage && app.page.model.id == id) { - // just another tab has been chosen, do not load cluster again - cluster = app.page.model; - tasks = app.page.tasks; - render.call(this); - } else { - cluster = new models.Cluster({id: id}); - tasks = new models.Tasks(); - tasks.fetch = function(options) { - return this.constructor.__super__.fetch.call(this, _.extend({data: {cluster_id: ''}}, options)); - }; - $.when(cluster.fetch(), cluster.fetchRelated('nodes'), cluster.fetchRelated('tasks'), tasks.fetch()) - .done(_.bind(render, this)) - .fail(_.bind(this.listClusters, this)); - } - }, - listClusters: function() { - this.navigate('#clusters', {replace: true}); - var clusters = new models.Clusters(); - var nodes = new models.Nodes(); - var tasks = new models.Tasks(); - $.when(clusters.fetch(), nodes.deferred = nodes.fetch(), tasks.fetch()).always(_.bind(function() { - clusters.each(function(cluster) { - cluster.set('nodes', new models.Nodes(nodes.where({cluster: cluster.id}))); - cluster.get('nodes').deferred = nodes.deferred; - cluster.set('tasks', new models.Tasks(tasks.where({cluster: cluster.id}))); - }, this); - this.setPage(ClustersPage, {collection: clusters}); - }, this)); - }, - listReleases: function() { - var releases = new models.Releases(); - var tasks = new models.Tasks(); - tasks.fetch = function(options) { - return this.constructor.__super__.fetch.call(this, _.extend({data: {cluster_id: ''}}, options)); - }; - $.when(releases.fetch(), tasks.fetch()).done(_.bind(function() { - this.setPage(ReleasesPage, { - collection: releases, - tasks: tasks - }); - }, this)); - }, - showNotifications: function() { - this.setPage(NotificationsPage, {notifications: app.navbar.notifications}); - }, - showSupportPage: function() { - this.setPage(SupportPage); - } - }); - - return { - initialize: function() { - // our server doesn't support PATCH, so use PUT instead - var originalSync = Backbone.sync; - Backbone.sync = function() { - var args = arguments; - if (args[0] == 'patch') { - args[0] = 'update'; - } - return originalSync.apply(this, args); - }; - - window.isWebkit = navigator.userAgent.indexOf('AppleWebKit/') !== -1; - - var app = new AppRouter(); - window.app = app; - - Backbone.history.start(); - } - }; -}); diff --git a/nailgun/static/js/libs/autoNumeric.js b/nailgun/static/js/libs/autoNumeric.js deleted file mode 100644 index 4a300d92d..000000000 --- a/nailgun/static/js/libs/autoNumeric.js +++ /dev/null @@ -1,1242 +0,0 @@ -/** -* autoNumeric.js -* @author: Bob Knothe -* @author: Sokolov Yura aka funny_falcon -* @version: 1.9.12 - 2013-07-09 GMT 2:30 PM -* -* Created by Robert J. Knothe on 2010-10-25. Please report any bugs to https://github.com/BobKnothe/autoNumeric -* Created by Sokolov Yura on 2010-11-07 -* -* Copyright (c) 2011 Robert J. Knothe http://www.decorplanit.com/plugin/ -* -* The MIT License (http://www.opensource.org/licenses/mit-license.php) -* -* Permission is hereby granted, free of charge, to any person -* obtaining a copy of this software and associated documentation -* files (the "Software"), to deal in the Software without -* restriction, including without limitation the rights to use, -* copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following -* conditions: -* -* The above copyright notice and this permission notice shall be -* included in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ -(function($) { - "use strict"; - /**jslint browser: true*/ - /**global jQuery*/ - /** - * Cross browser routine for getting selected range/cursor position - */ - function getElementSelection(that) { - var position = {}; - if (that.selectionStart === undefined) { - that.focus(); - var select = document.selection.createRange(); - position.length = select.text.length; - select.moveStart('character', -that.value.length); - position.end = select.text.length; - position.start = position.end - position.length; - } else { - position.start = that.selectionStart; - position.end = that.selectionEnd; - position.length = position.end - position.start; - } - return position; - } - /** - * Cross browser routine for setting selected range/cursor position - */ - function setElementSelection(that, start, end) { - if (that.selectionStart === undefined) { - that.focus(); - var r = that.createTextRange(); - r.collapse(true); - r.moveEnd('character', end); - r.moveStart('character', start); - r.select(); - } else { - that.selectionStart = start; - that.selectionEnd = end; - } - } - /** - * run callbacks in parameters if any - * any parameter could be a callback: - * - a function, which invoked with jQuery element, parameters and this parameter name and returns parameter value - * - a name of function, attached to $(selector).autoNumeric.functionName(){} - which was called previously - */ - function runCallbacks($this, settings) { - /** - * loops through the settings object (option array) to find the following - * k = option name example k=aNum - * val = option value example val=0123456789 - */ - $.each(settings, function(k, val) { - if (typeof val === 'function') { - settings[k] = val($this, settings, k); - } else if (typeof $this.autoNumeric[val] === 'function') { - /** - * calls the attached function from the html5 data example: data-a-sign="functionName" - */ - settings[k] = $this.autoNumeric[val]($this, settings, k); - } - }); - } - - function convertKeyToNumber(settings, key) { - if (typeof (settings[key]) === 'string') { - settings[key] *= 1; - } - } - /** - * Preparing user defined options for further usage - * merge them with defaults appropriatly - */ - function autoCode($this, settings) { - runCallbacks($this, settings); - settings.oEvent = null; - settings.tagList = ['DD', 'DT', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'LABEL', 'P', 'SPAN', 'TD', 'TH']; - var vmax = settings.vMax.toString().split('.'), vmin = (!settings.vMin && settings.vMin !== 0) ? [] : settings.vMin.toString().split('.'); - convertKeyToNumber(settings, 'vMax'); - convertKeyToNumber(settings, 'vMin'); - convertKeyToNumber(settings, 'mDec'); /** set mDec if not defained by user */ - settings.allowLeading = true; - settings.aNeg = settings.vMin < 0 ? '-' : ''; - vmax[0] = vmax[0].replace('-', ''); - vmin[0] = vmin[0].replace('-', ''); - settings.mInt = Math.max(vmax[0].length, vmin[0].length, 1); - if (settings.mDec === null) { - var vmaxLength = 0, - vminLength = 0; - if (vmax[1]) { - vmaxLength = vmax[1].length; - } - if (vmin[1]) { - vminLength = vmin[1].length; - } - settings.mDec = Math.max(vmaxLength, vminLength); - } /** set alternative decimal separator key */ - if (settings.altDec === null && settings.mDec > 0) { - if (settings.aDec === '.' && settings.aSep !== ',') { - settings.altDec = ','; - } else if (settings.aDec === ',' && settings.aSep !== '.') { - settings.altDec = '.'; - } - } - /** cache regexps for autoStrip */ - var aNegReg = settings.aNeg ? '([-\\' + settings.aNeg + ']?)' : '(-?)'; - settings.aNegRegAutoStrip = aNegReg; - settings.skipFirstAutoStrip = new RegExp(aNegReg + '[^-' + (settings.aNeg ? '\\' + settings.aNeg : '') + '\\' + settings.aDec + '\\d]' + '.*?(\\d|\\' + settings.aDec + '\\d)'); - settings.skipLastAutoStrip = new RegExp('(\\d\\' + settings.aDec + '?)[^\\' + settings.aDec + '\\d]\\D*$'); - var allowed = '-' + settings.aNum + '\\' + settings.aDec; - settings.allowedAutoStrip = new RegExp('[^' + allowed + ']', 'gi'); - settings.numRegAutoStrip = new RegExp(aNegReg + '(?:\\' + settings.aDec + '?(\\d+\\' + settings.aDec + '\\d+)|(\\d*(?:\\' + settings.aDec + '\\d*)?))'); - return settings; - } - /** - * strip all unwanted characters and leave only a number alert - */ - function autoStrip(s, settings, strip_zero) { - if (settings.aSign) { /** remove currency sign */ - while (s.indexOf(settings.aSign) > -1) { - s = s.replace(settings.aSign, ''); - } - } - s = s.replace(settings.skipFirstAutoStrip, '$1$2'); /** first replace anything before digits */ - s = s.replace(settings.skipLastAutoStrip, '$1'); /** then replace anything after digits */ - s = s.replace(settings.allowedAutoStrip, ''); /** then remove any uninterested characters */ - if (settings.altDec) { - s = s.replace(settings.altDec, settings.aDec); - } /** get only number string */ - var m = s.match(settings.numRegAutoStrip); - s = m ? [m[1], m[2], m[3]].join('') : ''; - if ((settings.lZero === 'allow' || settings.lZero === 'keep') && strip_zero !== 'strip') { - var parts = [], - nSign = ''; - parts = s.split(settings.aDec); - if (parts[0].indexOf('-') !== -1) { - nSign = '-'; - parts[0] = parts[0].replace('-', ''); - } - if (parts[0].length > settings.mInt && parts[0].charAt(0) === '0') { /** strip leading zero if need */ - parts[0] = parts[0].slice(1); - } - s = nSign + parts.join(settings.aDec); - } - if ((strip_zero && settings.lZero === 'deny') || (strip_zero && settings.lZero === 'allow' && settings.allowLeading === false)) { - var strip_reg = '^' + settings.aNegRegAutoStrip + '0*(\\d' + (strip_zero === 'leading' ? ')' : '|$)'); - strip_reg = new RegExp(strip_reg); - s = s.replace(strip_reg, '$1$2'); - } - return s; - } - /** - * places or removes brackets on negative values - */ - function negativeBracket(s, nBracket, oEvent) { /** oEvent = settings.oEvent */ - nBracket = nBracket.split(','); - if (oEvent === 'set' || oEvent === 'focusout') { - s = s.replace('-', ''); - s = nBracket[0] + s + nBracket[1]; - } else if ((oEvent === 'get' || oEvent === 'focusin' || oEvent === 'pageLoad') && s.charAt(0) === nBracket[0]) { - s = s.replace(nBracket[0], '-'); - s = s.replace(nBracket[1], ''); - } - return s; - } - /** - * truncate decimal part of a number - */ - function truncateDecimal(s, aDec, mDec) { - if (aDec && mDec) { - var parts = s.split(aDec); - /** truncate decimal part to satisfying length - * cause we would round it anyway */ - if (parts[1] && parts[1].length > mDec) { - if (mDec > 0) { - parts[1] = parts[1].substring(0, mDec); - s = parts.join(aDec); - } else { - s = parts[0]; - } - } - } - return s; - } - /** - * prepare number string to be converted to real number - */ - function fixNumber(s, aDec, aNeg) { - if (aDec && aDec !== '.') { - s = s.replace(aDec, '.'); - } - if (aNeg && aNeg !== '-') { - s = s.replace(aNeg, '-'); - } - if (!s.match(/\d/)) { - s += '0'; - } - return s; - } - /** - * function to handle numbers less than 0 that are stored in Exponential notaion ex: .0000001 stored as 1e-7 - */ - function checkValue(value) { - var decimal = value.indexOf('.'); - if (decimal !== -1) { - if (decimal === 1 && value.charAt(0) === '0') { - value = +value; - if (value < 0.000001 && value > 0) { - value = (value + 1).toString(); - value = value.substring(1); - } - if (value < 0 && value > -1) { - value = (value - 1).toString(); - value = '-' + value.substring(2); - } - value = value.toString(); - } else { - var parts = value.split('.'); - if (parts[1] !== undefined) { - if (+parts[1] === 0) { - value = parts[0]; - } else { - parts[1] = parts[1].replace(/0*$/, ''); - value = parts.join('.'); - } - } - } - } - return value.replace(/^0*(\d)/, '$1'); - } - /** - * prepare real number to be converted to our format - */ - function presentNumber(s, aDec, aNeg) { - if (aNeg && aNeg !== '-') { - s = s.replace('-', aNeg); - } - if (aDec && aDec !== '.') { - s = s.replace('.', aDec); - } - return s; - } - /** - * checking that number satisfy format conditions - * and lays between settings.vMin and settings.vMax - * and the string length does not exceed the digits in settings.vMin and settings.vMax - */ - function autoCheck(s, settings) { - s = autoStrip(s, settings); - s = truncateDecimal(s, settings.aDec, settings.mDec); - s = fixNumber(s, settings.aDec, settings.aNeg); - var value = +s; - if (settings.oEvent === 'set' && (value < settings.vMin || value > settings.vMax)) { - $.error("The value (" + value + ") from the 'set' method falls outside of the vMin / vMax range"); - } - return value >= settings.vMin && value <= settings.vMax; - } - /** - * private function to check for empty value - */ - function checkEmpty(iv, settings, signOnEmpty) { - if (iv === '' || iv === settings.aNeg) { - if (settings.wEmpty === 'zero') { - return iv + '0'; - } - if (settings.wEmpty === 'sign' || signOnEmpty) { - return iv + settings.aSign; - } - return iv; - } - return null; - } - /** - * private function that formats our number - */ - function autoGroup(iv, settings) { - iv = autoStrip(iv, settings); - var testNeg = iv.replace(',', '.'), - empty = checkEmpty(iv, settings, true); - if (empty !== null) { - return empty; - } - var digitalGroup = ''; - if (settings.dGroup === 2) { - digitalGroup = /(\d)((\d)(\d{2}?)+)$/; - } else if (settings.dGroup === 4) { - digitalGroup = /(\d)((\d{4}?)+)$/; - } else { - digitalGroup = /(\d)((\d{3}?)+)$/; - } /** splits the string at the decimal string */ - var ivSplit = iv.split(settings.aDec); - if (settings.altDec && ivSplit.length === 1) { - ivSplit = iv.split(settings.altDec); - } /** assigns the whole number to the a varibale (s) */ - var s = ivSplit[0]; - if (settings.aSep) { - while (digitalGroup.test(s)) { /** re-inserts the thousand sepparator via a regualer expression */ - s = s.replace(digitalGroup, '$1' + settings.aSep + '$2'); - } - } - if (settings.mDec !== 0 && ivSplit.length > 1) { - if (ivSplit[1].length > settings.mDec) { - ivSplit[1] = ivSplit[1].substring(0, settings.mDec); - } /** joins the whole number with the deciaml value */ - iv = s + settings.aDec + ivSplit[1]; - } else { /** if whole numers only */ - iv = s; - } - if (settings.aSign) { - var has_aNeg = iv.indexOf(settings.aNeg) !== -1; - iv = iv.replace(settings.aNeg, ''); - iv = settings.pSign === 'p' ? settings.aSign + iv : iv + settings.aSign; - if (has_aNeg) { - iv = settings.aNeg + iv; - } - } - if (settings.oEvent === 'set' && testNeg < 0 && settings.nBracket !== null) { /** removes the negative sign and places brackets */ - iv = negativeBracket(iv, settings.nBracket, settings.oEvent); - } - return iv; - } - /** - * round number after setting by pasting or $().autoNumericSet() - * private function for round the number - * please note this handled as text - Javascript math function can return inaccurate values - * also this offers multiple rounding metods that are not easily accomplished in javascript - */ - function autoRound(iv, settings) { /** value to string */ - iv = (iv === '') ? '0' : iv.toString(); - convertKeyToNumber(settings, 'mDec'); /** set mDec to number needed when mDec set by 'update method */ - var ivRounded = '', - i = 0, - nSign = '', - rDec = (typeof (settings.aPad) === 'boolean' || settings.aPad === null) ? (settings.aPad ? settings.mDec : 0) : +settings.aPad; - var truncateZeros = function(ivRounded) { /** truncate not needed zeros */ - var regex = rDec === 0 ? (/(\.[1-9]*)0*$/) : rDec === 1 ? (/(\.\d[1-9]*)0*$/) : new RegExp('(\\.\\d{' + rDec + '}[1-9]*)0*$'); - ivRounded = ivRounded.replace(regex, '$1'); /** If there are no decimal places, we don't need a decimal point at the end */ - if (rDec === 0) { - ivRounded = ivRounded.replace(/\.$/, ''); - } - return ivRounded; - }; - if (iv.charAt(0) === '-') { /** Checks if the iv (input Value)is a negative value */ - nSign = '-'; /** removes the negative sign will be added back later if required */ - iv = iv.replace('-', ''); - } /** prepend a zero if first character is not a digit (then it is likely to be a dot)*/ - if (!iv.match(/^\d/)) { - iv = '0' + iv; - } /** determines if the value is zero - if zero no negative sign */ - if (nSign === '-' && +iv === 0) { - nSign = ''; - } - if ((+iv > 0 && settings.lZero !== 'keep') || (iv.length > 0 && settings.lZero === 'allow')) { /** trims leading zero's if needed */ - iv = iv.replace(/^0*(\d)/, '$1'); - } - var dPos = iv.lastIndexOf('.'); /** virtual decimal position */ - var vdPos = dPos === -1 ? iv.length - 1 : dPos; /** checks decimal places to determine if rounding is required */ - var cDec = (iv.length - 1) - vdPos; /** check if no rounding is required */ - if (cDec <= settings.mDec) { - ivRounded = iv; /** check if we need to pad with zeros */ - if (cDec < rDec) { - if (dPos === -1) { - ivRounded += '.'; - } - while (cDec < rDec) { - var zeros = '000000'.substring(0, rDec - cDec); - ivRounded += zeros; - cDec += zeros.length; - } - } else if (cDec > rDec) { - ivRounded = truncateZeros(ivRounded); - } else if (cDec === 0 && rDec === 0) { - ivRounded = ivRounded.replace(/\.$/, ''); - } - return nSign + ivRounded; - } /** rounded length of the string after rounding */ - var rLength = dPos + settings.mDec; /** test round */ - var tRound = +iv.charAt(rLength + 1); - var ivArray = iv.substring(0, rLength + 1).split(''); - var odd = (iv.charAt(rLength) === '.') ? (iv.charAt(rLength - 1) % 2) : (iv.charAt(rLength) % 2); - if ((tRound > 4 && settings.mRound === 'S') || (tRound > 4 && settings.mRound === 'A' && nSign === '') || (tRound > 5 && settings.mRound === 'A' && nSign === '-') || (tRound > 5 && settings.mRound === 's') || (tRound > 5 && settings.mRound === 'a' && nSign === '') || (tRound > 4 && settings.mRound === 'a' && nSign === '-') || (tRound > 5 && settings.mRound === 'B') || (tRound === 5 && settings.mRound === 'B' && odd === 1) || (tRound > 0 && settings.mRound === 'C' && nSign === '') || (tRound > 0 && settings.mRound === 'F' && nSign === '-') || (tRound > 0 && settings.mRound === 'U')) { - /** Round up the last digit if required, and continue until no more 9's are found */ - for (i = (ivArray.length - 1); i >= 0; i -= 1) { - if (ivArray[i] !== '.') { - ivArray[i] = +ivArray[i] + 1; - if (ivArray[i] < 10) { - break; - } - if (i > 0) { - ivArray[i] = '0'; - } - } - } - } /** Reconstruct the string, converting any 10's to 0's */ - ivArray = ivArray.slice(0, rLength + 1); - ivRounded = truncateZeros(ivArray.join('')); /** return rounded value */ - return nSign + ivRounded; - } - /** - * Holder object for field properties - */ - function AutoNumericHolder(that, settings) { - this.settings = settings; - this.that = that; - this.$that = $(that); - this.formatted = false; - this.settingsClone = autoCode(this.$that, this.settings); - this.value = that.value; - } - AutoNumericHolder.prototype = { - init: function(e) { - this.value = this.that.value; - this.settingsClone = autoCode(this.$that, this.settings); - this.ctrlKey = e.ctrlKey; - this.cmdKey = e.metaKey; - this.shiftKey = e.shiftKey; - this.selection = getElementSelection(this.that); /** keypress event overwrites meaningfull value of e.keyCode */ - if (e.type === 'keydown' || e.type === 'keyup') { - this.kdCode = e.keyCode; - } - this.which = e.which; - this.processed = false; - this.formatted = false; - }, - setSelection: function(start, end, setReal) { - start = Math.max(start, 0); - end = Math.min(end, this.that.value.length); - this.selection = { - start: start, - end: end, - length: end - start - }; - if (setReal === undefined || setReal) { - setElementSelection(this.that, start, end); - } - }, - setPosition: function(pos, setReal) { - this.setSelection(pos, pos, setReal); - }, - getBeforeAfter: function() { - var value = this.value; - var left = value.substring(0, this.selection.start); - var right = value.substring(this.selection.end, value.length); - return [left, right]; - }, - getBeforeAfterStriped: function() { - var parts = this.getBeforeAfter(); - parts[0] = autoStrip(parts[0], this.settingsClone); - parts[1] = autoStrip(parts[1], this.settingsClone); - return parts; - }, - /** - * strip parts from excess characters and leading zeroes - */ - normalizeParts: function(left, right) { - var settingsClone = this.settingsClone; - right = autoStrip(right, settingsClone); /** if right is not empty and first character is not aDec, */ - /** we could strip all zeros, otherwise only leading */ - var strip = right.match(/^\d/) ? true : 'leading'; - left = autoStrip(left, settingsClone, strip); /** prevents multiple leading zeros from being entered */ - if ((left === '' || left === settingsClone.aNeg) && settingsClone.lZero === 'deny') { - if (right > '') { - right = right.replace(/^0*(\d)/, '$1'); - } - } - var new_value = left + right; /** insert zero if has leading dot */ - if (settingsClone.aDec) { - var m = new_value.match(new RegExp('^' + settingsClone.aNegRegAutoStrip + '\\' + settingsClone.aDec)); - if (m) { - left = left.replace(m[1], m[1] + '0'); - new_value = left + right; - } - } /** insert zero if number is empty and io.wEmpty == 'zero' */ - if (settingsClone.wEmpty === 'zero' && (new_value === settingsClone.aNeg || new_value === '')) { - left += '0'; - } - return [left, right]; - }, - /** - * set part of number to value keeping position of cursor - */ - setValueParts: function(left, right) { - var settingsClone = this.settingsClone; - var parts = this.normalizeParts(left, right); - var new_value = parts.join(''); - var position = parts[0].length; - if (autoCheck(new_value, settingsClone)) { - new_value = truncateDecimal(new_value, settingsClone.aDec, settingsClone.mDec); - if (position > new_value.length) { - position = new_value.length; - } - this.value = new_value; - this.setPosition(position, false); - return true; - } - return false; - }, - /** - * helper function for expandSelectionOnSign - * returns sign position of a formatted value - */ - signPosition: function() { - var settingsClone = this.settingsClone, - aSign = settingsClone.aSign, - that = this.that; - if (aSign) { - var aSignLen = aSign.length; - if (settingsClone.pSign === 'p') { - var hasNeg = settingsClone.aNeg && that.value && that.value.charAt(0) === settingsClone.aNeg; - return hasNeg ? [1, aSignLen + 1] : [0, aSignLen]; - } - var valueLen = that.value.length; - return [valueLen - aSignLen, valueLen]; - } - return [1000, -1]; - }, - /** - * expands selection to cover whole sign - * prevents partial deletion/copying/overwritting of a sign - */ - expandSelectionOnSign: function(setReal) { - var sign_position = this.signPosition(); - var selection = this.selection; - if (selection.start < sign_position[1] && selection.end > sign_position[0]) { /** if selection catches something except sign and catches only space from sign */ - if ((selection.start < sign_position[0] || selection.end > sign_position[1]) && this.value.substring(Math.max(selection.start, sign_position[0]), Math.min(selection.end, sign_position[1])).match(/^\s*$/)) { /** then select without empty space */ - if (selection.start < sign_position[0]) { - this.setSelection(selection.start, sign_position[0], setReal); - } else { - this.setSelection(sign_position[1], selection.end, setReal); - } - } else { /** else select with whole sign */ - this.setSelection(Math.min(selection.start, sign_position[0]), Math.max(selection.end, sign_position[1]), setReal); - } - } - }, - /** - * try to strip pasted value to digits - */ - checkPaste: function() { - if (this.valuePartsBeforePaste !== undefined) { - var parts = this.getBeforeAfter(); - var oldParts = this.valuePartsBeforePaste; - delete this.valuePartsBeforePaste; /** try to strip pasted value first */ - parts[0] = parts[0].substr(0, oldParts[0].length) + autoStrip(parts[0].substr(oldParts[0].length), this.settingsClone); - if (!this.setValueParts(parts[0], parts[1])) { - this.value = oldParts.join(''); - this.setPosition(oldParts[0].length, false); - } - } - }, - /** - * process pasting, cursor moving and skipping of not interesting keys - * if returns true, futher processing is not performed - */ - skipAllways: function(e) { - var kdCode = this.kdCode, which = this.which, ctrlKey = this.ctrlKey, cmdKey = this.cmdKey, shiftKey = this.shiftKey; /** catch the ctrl up on ctrl-v */ - if (((ctrlKey || cmdKey) && e.type === 'keyup' && this.valuePartsBeforePaste !== undefined) || (shiftKey && kdCode === 45)) { - this.checkPaste(); - return false; - } - /** codes are taken from http://www.cambiaresearch.com/c4/702b8cd1-e5b0-42e6-83ac-25f0306e3e25/Javascript-Char-Codes-Key-Codes.aspx - * skip Fx keys, windows keys, other special keys - */ - if ((kdCode >= 112 && kdCode <= 123) || (kdCode >= 91 && kdCode <= 93) || (kdCode >= 9 && kdCode <= 31) || (kdCode < 8 && (which === 0 || which === kdCode)) || kdCode === 144 || kdCode === 145 || kdCode === 45) { - return true; - } - if ((ctrlKey || cmdKey) && kdCode === 65) { /** if select all (a=65)*/ - return true; - } - if ((ctrlKey || cmdKey) && (kdCode === 67 || kdCode === 86 || kdCode === 88)) { /** if copy (c=67) paste (v=86) or cut (x=88) */ - if (e.type === 'keydown') { - this.expandSelectionOnSign(); - } - if (kdCode === 86 || kdCode === 45) { /** try to prevent wrong paste */ - if (e.type === 'keydown' || e.type === 'keypress') { - if (this.valuePartsBeforePaste === undefined) { - this.valuePartsBeforePaste = this.getBeforeAfter(); - } - } else { - this.checkPaste(); - } - } - return e.type === 'keydown' || e.type === 'keypress' || kdCode === 67; - } - if (ctrlKey || cmdKey) { - return true; - } - if (kdCode === 37 || kdCode === 39) { /** jump over thousand separator */ - var aSep = this.settingsClone.aSep, - start = this.selection.start, - value = this.that.value; - if (e.type === 'keydown' && aSep && !this.shiftKey) { - if (kdCode === 37 && value.charAt(start - 2) === aSep) { - this.setPosition(start - 1); - } else if (kdCode === 39 && value.charAt(start + 1) === aSep) { - this.setPosition(start + 1); - } - } - return true; - } - if (kdCode >= 34 && kdCode <= 40) { - return true; - } - return false; - }, - /** - * process deletion of characters - * returns true if processing performed - */ - processAllways: function() { - var parts; /** process backspace or delete */ - if (this.kdCode === 8 || this.kdCode === 46) { - if (!this.selection.length) { - parts = this.getBeforeAfterStriped(); - if (this.kdCode === 8) { - parts[0] = parts[0].substring(0, parts[0].length - 1); - } else { - parts[1] = parts[1].substring(1, parts[1].length); - } - this.setValueParts(parts[0], parts[1]); - } else { - this.expandSelectionOnSign(false); - parts = this.getBeforeAfterStriped(); - this.setValueParts(parts[0], parts[1]); - } - return true; - } - return false; - }, - /** - * process insertion of characters - * returns true if processing performed - */ - processKeypress: function() { - var settingsClone = this.settingsClone; - var cCode = String.fromCharCode(this.which); - var parts = this.getBeforeAfterStriped(); - var left = parts[0], right = parts[1]; /** start rules when the decimal charactor key is pressed */ - /** always use numeric pad dot to insert decimal separator */ - if (cCode === settingsClone.aDec || (settingsClone.altDec && cCode === settingsClone.altDec) || ((cCode === '.' || cCode === ',') && this.kdCode === 110)) { /** do not allow decimal character if no decimal part allowed */ - if (!settingsClone.mDec || !settingsClone.aDec) { - return true; - } /** do not allow decimal character before aNeg character */ - if (settingsClone.aNeg && right.indexOf(settingsClone.aNeg) > -1) { - return true; - } /** do not allow decimal character if other decimal character present */ - if (left.indexOf(settingsClone.aDec) > -1) { - return true; - } - if (right.indexOf(settingsClone.aDec) > 0) { - return true; - } - if (right.indexOf(settingsClone.aDec) === 0) { - right = right.substr(1); - } - this.setValueParts(left + settingsClone.aDec, right); - return true; - } /** start rule on negative sign */ - - if (cCode === '-' || cCode === '+') { /** prevent minus if not allowed */ - if (!settingsClone.aNeg) { - return true; - } /** carret is always after minus */ - if (left === '' && right.indexOf(settingsClone.aNeg) > -1) { - left = settingsClone.aNeg; - right = right.substring(1, right.length); - } /** change sign of number, remove part if should */ - if (left.charAt(0) === settingsClone.aNeg) { - left = left.substring(1, left.length); - } else { - left = (cCode === '-') ? settingsClone.aNeg + left : left; - } - this.setValueParts(left, right); - return true; - } /** digits */ - if (cCode >= '0' && cCode <= '9') { /** if try to insert digit before minus */ - if (settingsClone.aNeg && left === '' && right.indexOf(settingsClone.aNeg) > -1) { - left = settingsClone.aNeg; - right = right.substring(1, right.length); - } - if (settingsClone.vMax <= 0 && settingsClone.vMin < settingsClone.vMax && this.value.indexOf(settingsClone.aNeg) === -1 && cCode !== '0') { - left = settingsClone.aNeg + left; - } - this.setValueParts(left + cCode, right); - return true; - } /** prevent any other character */ - return true; - }, - /** - * formatting of just processed value with keeping of cursor position - */ - formatQuick: function() { - var settingsClone = this.settingsClone; - var parts = this.getBeforeAfterStriped(); - var leftLength = this.value; - if ((settingsClone.aSep === '' || (settingsClone.aSep !== '' && leftLength.indexOf(settingsClone.aSep) === -1)) && (settingsClone.aSign === '' || (settingsClone.aSign !== '' && leftLength.indexOf(settingsClone.aSign) === -1))) { - var subParts = [], - nSign = ''; - subParts = leftLength.split(settingsClone.aDec); - if (subParts[0].indexOf('-') > -1) { - nSign = '-'; - subParts[0] = subParts[0].replace('-', ''); - parts[0] = parts[0].replace('-', ''); - } - if (subParts[0].length > settingsClone.mInt && parts[0].charAt(0) === '0') { /** strip leading zero if need */ - parts[0] = parts[0].slice(1); - } - parts[0] = nSign + parts[0]; - } - var value = autoGroup(this.value, this.settingsClone); - var position = value.length; - if (value) { - /** prepare regexp which searches for cursor position from unformatted left part */ - var left_ar = parts[0].split(''); - var i = 0; - for (i; i < left_ar.length; i += 1) { /** thanks Peter Kovari */ - if (!left_ar[i].match('\\d')) { - left_ar[i] = '\\' + left_ar[i]; - } - } - var leftReg = new RegExp('^.*?' + left_ar.join('.*?')); - /** search cursor position in formatted value */ - var newLeft = value.match(leftReg); - if (newLeft) { - position = newLeft[0].length; - /** if we are just before sign which is in prefix position */ - if (((position === 0 && value.charAt(0) !== settingsClone.aNeg) || (position === 1 && value.charAt(0) === settingsClone.aNeg)) && settingsClone.aSign && settingsClone.pSign === 'p') { - /** place carret after prefix sign */ - position = this.settingsClone.aSign.length + (value.charAt(0) === '-' ? 1 : 0); - } - } else if (settingsClone.aSign && settingsClone.pSign === 's') { - /** if we could not find a place for cursor and have a sign as a suffix */ - /** place carret before suffix currency sign */ - position -= settingsClone.aSign.length; - } - } - this.that.value = value; - this.setPosition(position); - this.formatted = true; - } - }; - /** thanks to Anthony & Evan C */ - function autoGet(obj) { - if (typeof obj === 'string') { - obj = obj.replace(/\[/g, "\\[").replace(/\]/g, "\\]"); - obj = '#' + obj.replace(/(:|\.)/g, '\\$1'); - /** obj = '#' + obj.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1'); */ - /** possible modification to replace the above 2 lines */ - } - return $(obj); - } - - function getHolder($that, settings, update) { - var data = $that.data('autoNumeric'); - if (!data) { - data = {}; - $that.data('autoNumeric', data); - } - var holder = data.holder; - if ((holder === undefined && settings) || update) { - holder = new AutoNumericHolder($that.get(0), settings); - data.holder = holder; - } - return holder; - } - var methods = { - init: function(options) { - return this.each(function() { - var $this = $(this); - var settings = $this.data('autoNumeric'); /** attempt to grab 'autoNumeric' settings, if they don't exist returns "undefined". */ - var tagData = $this.data(); /** attempt to grab HTML5 data, if they don't exist we'll get "undefined".*/ - if (typeof settings !== 'object') { /** If we could't grab settings, create them from defaults and passed options. */ - var defaults = { - /** allowed numeric values - * please do not modify - */ - aNum: '0123456789', - /** allowed thousand separator characters - * comma = ',' - * period "full stop" = '.' - * apostrophe is escaped = '\'' - * space = ' ' - * none = '' - * NOTE: do not use numeric characters - */ - aSep: ',', - /** digital grouping for the thousand separator used in Format - * dGroup: '2', results in 99,99,99,999 common in India for values less than 1 billion and greater than -1 billion - * dGroup: '3', results in 999,999,999 default - * dGroup: '4', results in 9999,9999,9999 used in some Asian countries - */ - dGroup: '3', - /** allowed decimal separator characters - * period "full stop" = '.' - * comma = ',' - */ - aDec: '.', - /** allow to declare alternative decimal separator which is automatically replaced by aDec - * developed for countries the use a comma ',' as the decimal character - * and have keyboards\numeric pads that have a period 'full stop' as the decimal characters (Spain is an example) - */ - altDec: null, - /** allowed currency symbol - * Must be in quotes aSign: '$', a space is allowed aSign: '$ ' - */ - aSign: '', - /** placement of currency sign - * for prefix pSign: 'p', - * for suffix pSign: 's', - */ - pSign: 'p', - /** maximum possible value - * value must be enclosed in quotes and use the period for the decimal point - * value must be larger than vMin - */ - vMax: '999999999.99', - /** minimum possible value - * value must be enclosed in quotes and use the period for the decimal point - * value must be smaller than vMax - */ - vMin: '0.00', - /** max number of decimal places = used to overide deciaml places set by the vMin & vMax values - * value must be enclosed in quotes example mDec: '3', - * This can also set the value via a call back function mDec: 'css:# - */ - mDec: null, - /** method used for rounding - * mRound: 'S', Round-Half-Up Symmetric (default) - * mRound: 'A', Round-Half-Up Asymmetric - * mRound: 's', Round-Half-Down Symmetric (lower case s) - * mRound: 'a', Round-Half-Down Asymmetric (lower case a) - * mRound: 'B', Round-Half-Even "Bankers Rounding" - * mRound: 'U', Round Up "Round-Away-From-Zero" - * mRound: 'D', Round Down "Round-Toward-Zero" - same as trancate - * mRound: 'C', Round to Ceiling "Toward Positive Infinity" - * mRound: 'F', Round to Floor "Toward Negative Infinity" - */ - mRound: 'S', - /** controls decimal padding - * aPad: true - always Pad decimals with zeros - * aPad: false - does not pad with zeros. - * aPad: `some number` - pad decimals with zero to number different from mDec - * thanks to Jonas Johansson for the suggestion - */ - aPad: true, - /** places brackets on negative value -$ 999.99 to (999.99) - * visible only when the field does NOT have focus the left and right symbols should be enclosed in quotes and seperated by a comma - * nBracket: null, nBracket: '(,)', nBracket: '[,]', nBracket: '<,>' or nBracket: '{,}' - */ - nBracket: null, - /** Displayed on empty string - * wEmpty: 'empty', - input can be blank - * wEmpty: 'zero', - displays zero - * wEmpty: 'sign', - displays the currency sign - */ - wEmpty: 'empty', - /** controls leading zero behavior - * lZero: 'allow', - allows leading zeros to be entered. Zeros will be truncated when entering additional digits. On focusout zeros will be deleted. - * lZero: 'deny', - allows only one leading zero on values less than one - * lZero: 'keep', - allows leading zeros to be entered. on fousout zeros will be retained. - */ - lZero: 'allow', - /** determine if the default value will be formatted on page ready. - * true = atomatically formats the default value on page ready - * false = will not format the default value - */ - aForm: true, - /** future use */ - onSomeEvent: function() {} - }; - settings = $.extend({}, defaults, tagData, options); /** Merge defaults, tagData and options */ - if (settings.aDec === settings.aSep) { - $.error("autoNumeric will not function properly when the decimal character aDec: '" + settings.aDec + "' and thousand seperater aSep: '" + settings.aSep + "' are the same character"); - return this; - } - if ($.inArray($this.prop('tagName'), settings.tagList) !== -1) { - $.error("The <" + $this.prop('tagName') + "> is not supported by autoNumeric()"); - return this; - } - $this.data('autoNumeric', settings); /** Save our new settings */ - } else { - return this; - } - settings.lastSetValue = ''; - settings.runOnce = false; - var holder = getHolder($this, settings); - if (settings.runOnce === false && settings.aForm) {/** routine to format default value on page load */ - if ($this.is('input[type=text], input[type=hidden], input:not([type])')) { - var setValue = true; - if ($this[0].value === '' && settings.wEmpty === 'empty') { - $this[0].value = ''; - setValue = false; - } - if ($this[0].value === '' && settings.wEmpty === 'sign') { - $this[0].value = settings.aSign; - setValue = false; - } - if (setValue) { - $this.autoNumeric('set', $this.val()); - } - } - if ($.inArray($this.prop('tagName'), settings.tagList) !== -1 && $this.text() !== '') { - $this.autoNumeric('set', $this.text()); - } - } - settings.runOnce = true; - if ($this.is('input[type=text], input[type=hidden], input:not([type])')) { /**added hidden type */ - $this.on('keydown.autoNumeric', function(e) { - holder = getHolder($this); - if (holder.settings.aDec === holder.settings.aSep) { - $.error("autoNumeric will not function properly when the decimal character aDec: '" + holder.settings.aDec + "' and thousand seperater aSep: '" + holder.settings.aSep + "' are the same character"); - return this; - } - if (holder.that.readOnly) { - holder.processed = true; - return true; - } - /** The below streamed code / comment allows the "enter" keydown to throw a change() event */ - /** if (e.keyCode === 13 && holder.inVal !== $this.val()){ - $this.change(); - holder.inVal = $this.val(); - }*/ - holder.init(e); - holder.settings.oEvent = 'keydown'; - if (holder.skipAllways(e)) { - holder.processed = true; - return true; - } - if (holder.processAllways()) { - holder.processed = true; - holder.formatQuick(); - e.preventDefault(); - return false; - } - holder.formatted = false; - return true; - }); - $this.on('keypress.autoNumeric', function(e) { - var holder = getHolder($this), processed = holder.processed; - holder.init(e); - holder.settings.oEvent = 'keypress'; - if (holder.skipAllways(e)) { - return true; - } - if (processed) { - e.preventDefault(); - return false; - } - if (holder.processAllways() || holder.processKeypress()) { - holder.formatQuick(); - e.preventDefault(); - return false; - } - holder.formatted = false; - - }); - $this.on('keyup.autoNumeric', function(e) { - var holder = getHolder($this); - holder.init(e); - holder.settings.oEvent = 'keyup'; - var skip = holder.skipAllways(e); - holder.kdCode = 0; - delete holder.valuePartsBeforePaste; - if ($this[0].value === holder.settings.aSign) { /** added to properly place the caret when only the currency is present */ - if (holder.settings.pSign === 's') { - setElementSelection(this, 0, 0); - } else { - setElementSelection(this, holder.settings.aSign.length, holder.settings.aSign.length); - } - } - if (skip) { - return true; - } - if (this.value === '') { - return true; - } - if (!holder.formatted) { - holder.formatQuick(); - } - }); - $this.on('focusin.autoNumeric', function() { - var holder = getHolder($this); - holder.settingsClone.oEvent = 'focusin'; - if (holder.settingsClone.nBracket !== null) { - var checkVal = $this.val(); - $this.val(negativeBracket(checkVal, holder.settingsClone.nBracket, holder.settingsClone.oEvent)); - } - holder.inVal = $this.val(); - var onempty = checkEmpty(holder.inVal, holder.settingsClone, true); - if (onempty !== null) { - $this.val(onempty); - if (holder.settings.pSign === 's') { - setElementSelection(this, 0, 0); - } else { - setElementSelection(this, holder.settings.aSign.length, holder.settings.aSign.length); - } - } - }); - $this.on('focusout.autoNumeric', function() { - var holder = getHolder($this), - settingsClone = holder.settingsClone, - value = $this.val(), - origValue = value; - holder.settingsClone.oEvent = 'focusout'; - var strip_zero = ''; /** added to control leading zero */ - if (settingsClone.lZero === 'allow') { /** added to control leading zero */ - settingsClone.allowLeading = false; - strip_zero = 'leading'; - } - if (value !== '') { - value = autoStrip(value, settingsClone, strip_zero); - if (checkEmpty(value, settingsClone) === null && autoCheck(value, settingsClone, $this[0])) { - value = fixNumber(value, settingsClone.aDec, settingsClone.aNeg); - value = autoRound(value, settingsClone); - value = presentNumber(value, settingsClone.aDec, settingsClone.aNeg); - } else { - value = ''; - } - } - var groupedValue = checkEmpty(value, settingsClone, false); - if (groupedValue === null) { - groupedValue = autoGroup(value, settingsClone); - } - if (groupedValue !== origValue) { - $this.val(groupedValue); - } - if (groupedValue !== holder.inVal) { - $this.change(); - delete holder.inVal; - } - if (settingsClone.nBracket !== null && $this.autoNumeric('get') < 0) { - holder.settingsClone.oEvent = 'focusout'; - $this.val(negativeBracket($this.val(), settingsClone.nBracket, settingsClone.oEvent)); - } - }); - } - }); - }, - /** method to remove settings and stop autoNumeric() */ - destroy: function() { - return $(this).each(function() { - var $this = $(this); - $this.off('.autoNumeric'); - $this.removeData('autoNumeric'); - }); - }, - /** method to update settings - can call as many times */ - update: function(options) { - return $(this).each(function() { - var $this = autoGet($(this)), - settings = $this.data('autoNumeric'); - if (typeof settings !== 'object') { - $.error("You must initialize autoNumeric('init', {options}) prior to calling the 'update' method"); - return this; - } - var strip = $this.autoNumeric('get'); - settings = $.extend(settings, options); - getHolder($this, settings, true); - if (settings.aDec === settings.aSep) { - $.error("autoNumeric will not function properly when the decimal character aDec: '" + settings.aDec + "' and thousand seperater aSep: '" + settings.aSep + "' are the same character"); - return this; - } - $this.data('autoNumeric', settings); - if ($this.val() !== '' || $this.text() !== '') { - return $this.autoNumeric('set', strip); - } - return; - }); - }, - /** returns a formated strings for "input:text" fields Uses jQuery's .val() method*/ - set: function(valueIn) { - return $(this).each(function() { - var $this = autoGet($(this)), settings = $this.data('autoNumeric'), value = valueIn.toString(), testValue = valueIn.toString(); - if (typeof settings !== 'object') { - $.error("You must initialize autoNumeric('init', {options}) prior to calling the 'set' method"); - return this; - } - /** allows locale decimal seperator to be a comma */ - if (testValue === $this.attr('value')) { - value = value.replace(',', '.'); - } - /** routine to handle page re-load from back button */ - if (testValue !== $this.attr('value') && settings.runOnce === false) { - value = autoStrip(value, settings); - } - /** returns a empty string if the value being 'set' contains non-numeric characters and or more than decimal point (full stop) and will not be formatted */ - if (!$.isNumeric(+value)) { - return ''; - } - value = checkValue(value); - settings.oEvent = 'set'; - settings.lastSetValue = value; /** saves the unrounded value from the set method - $('selector').data('autoNumeric').lastSetValue; - helpful when you need to change the rounding accuracy*/ - value.toString(); - if (value !== '') { - value = autoRound(value, settings); - } - value = presentNumber(value, settings.aDec, settings.aNeg); - if (!autoCheck(value, settings)) { - value = autoRound('', settings); - } - value = autoGroup(value, settings); - if ($this.is('input[type=text], input[type=hidden], input:not([type])')) { /**added hidden type */ - return $this.val(value); - } - if ($.inArray($this.prop('tagName'), settings.tagList) !== -1) { - return $this.text(value); - } - $.error("The <" + $this.prop('tagName') + "> is not supported by autoNumeric()"); - return false; - }); - }, - /** method to get the unformated value from a specific input field, returns a numeric value */ - get: function() { - var $this = autoGet($(this)), - settings = $this.data('autoNumeric'); - if (typeof settings !== 'object') { - $.error("You must initialize autoNumeric('init', {options}) prior to calling the 'get' method"); - return this; - } - settings.oEvent = 'get'; - var getValue = ''; - /** determine the element type then use .eq(0) selector to grab the value of the first element in selector */ - if ($this.is('input[type=text], input[type=hidden], input:not([type])')) { /**added hidden type */ - getValue = $this.eq(0).val(); - } else if ($.inArray($this.prop('tagName'), settings.tagList) !== -1) { - getValue = $this.eq(0).text(); - } else { - $.error("The <" + $this.prop('tagName') + "> is not supported by autoNumeric()"); - return false; - } - if ((getValue === '' && settings.wEmpty === 'empty') || (getValue === settings.aSign && settings.wEmpty === 'sign')) { - return ''; - } - if (settings.nBracket !== null && getValue !== '') { - getValue = negativeBracket(getValue, settings.nBracket, settings.oEvent); - } - if (settings.runOnce || settings.aForm === false) { - getValue = autoStrip(getValue, settings); - } - getValue = fixNumber(getValue, settings.aDec, settings.aNeg); - if (+getValue === 0 && settings.lZero !== 'keep') { - getValue = '0'; - } - if (settings.lZero === 'keep') { - return getValue; - } - getValue = checkValue(getValue); - return getValue; /** returned Numeric String */ - }, - /** method to get the unformated value from multiple fields */ - getString: function() { - var isAutoNumeric = false, - $this = autoGet($(this)), - str = $this.serialize(), - parts = str.split('&'), - i = 0; - for (i; i < parts.length; i += 1) { - var miniParts = parts[i].split('='); - var settings = $('*[name="' + decodeURIComponent(miniParts[0]) + '"]').data('autoNumeric'); - if (typeof settings === 'object') { - if (miniParts[1] !== null && $('*[name="' + decodeURIComponent(miniParts[0]) + '"]').data('autoNumeric') !== undefined) { - miniParts[1] = $('input[name="' + decodeURIComponent(miniParts[0]) + '"]').autoNumeric('get'); - parts[i] = miniParts.join('='); - isAutoNumeric = true; - } - } - } - if (isAutoNumeric === true) { - return parts.join('&'); - } - $.error("You must initialize autoNumeric('init', {options}) prior to calling the 'getString' method"); - return this; - }, - /** method to get the unformated value from multiple fields */ - getArray: function() { - var isAutoNumeric = false, - $this = autoGet($(this)), - formFields = $this.serializeArray(); - $.each(formFields, function(i, field) { - var settings = $('*[name="' + decodeURIComponent(field.name) + '"]').data('autoNumeric'); - if (typeof settings === 'object') { - if (field.value !== '' && $('*[name="' + decodeURIComponent(field.name) + '"]').data('autoNumeric') !== undefined) { - field.value = $('input[name="' + decodeURIComponent(field.name) + '"]').autoNumeric('get').toString(); - } - isAutoNumeric = true; - } - }); - if (isAutoNumeric === true) { - return formFields; - } - $.error("You must initialize autoNumeric('init', {options}) prior to calling the 'getArray' method"); - return this; - }, - /** returns the settings object for those who need to look under the hood */ - getSettings: function() { - var $this = autoGet($(this)); - return $this.eq(0).data('autoNumeric'); - } - }; - $.fn.autoNumeric = function(method) { - if (methods[method]) { - return methods[method].apply(this, Array.prototype.slice.call(arguments, 1)); - } - if (typeof method === 'object' || !method) { - return methods.init.apply(this, arguments); - } - $.error('Method "' + method + '" is not supported by autoNumeric()'); - }; -}(jQuery)); diff --git a/nailgun/static/js/libs/backbone.js b/nailgun/static/js/libs/backbone.js deleted file mode 100644 index c95952bad..000000000 --- a/nailgun/static/js/libs/backbone.js +++ /dev/null @@ -1,1573 +0,0 @@ -// Backbone.js 1.0.0 - -// (c) 2010-2013 Jeremy Ashkenas, DocumentCloud Inc. -// Backbone may be freely distributed under the MIT license. -// For all details and documentation: -// http://backbonejs.org - -(function(){ - - // Initial Setup - // ------------- - - // Save a reference to the global object (`window` in the browser, `exports` - // on the server). - var root = this; - - // Save the previous value of the `Backbone` variable, so that it can be - // restored later on, if `noConflict` is used. - var previousBackbone = root.Backbone; - - // Create local references to array methods we'll want to use later. - var array = []; - var push = array.push; - var slice = array.slice; - var splice = array.splice; - - // The top-level namespace. All public Backbone classes and modules will - // be attached to this. Exported for both the browser and the server. - var Backbone; - if (typeof exports !== 'undefined') { - Backbone = exports; - } else { - Backbone = root.Backbone = {}; - } - - // Current version of the library. Keep in sync with `package.json`. - Backbone.VERSION = '1.0.0'; - - // Require Underscore, if we're on the server, and it's not already present. - var _ = root._; - if (!_ && (typeof require !== 'undefined')) _ = require('underscore'); - - // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns - // the `$` variable. - Backbone.$ = root.jQuery || root.Zepto || root.ender || root.$; - - // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable - // to its previous owner. Returns a reference to this Backbone object. - Backbone.noConflict = function() { - root.Backbone = previousBackbone; - return this; - }; - - // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option - // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and - // set a `X-Http-Method-Override` header. - Backbone.emulateHTTP = false; - - // Turn on `emulateJSON` to support legacy servers that can't deal with direct - // `application/json` requests ... will encode the body as - // `application/x-www-form-urlencoded` instead and will send the model in a - // form param named `model`. - Backbone.emulateJSON = false; - - // Backbone.Events - // --------------- - - // A module that can be mixed in to *any object* in order to provide it with - // custom events. You may bind with `on` or remove with `off` callback - // functions to an event; `trigger`-ing an event fires all callbacks in - // succession. - // - // var object = {}; - // _.extend(object, Backbone.Events); - // object.on('expand', function(){ alert('expanded'); }); - // object.trigger('expand'); - // - var Events = Backbone.Events = { - - // Bind an event to a `callback` function. Passing `"all"` will bind - // the callback to all events fired. - on: function(name, callback, context) { - if (!eventsApi(this, 'on', name, [callback, context]) || !callback) return this; - this._events || (this._events = {}); - var events = this._events[name] || (this._events[name] = []); - events.push({callback: callback, context: context, ctx: context || this}); - return this; - }, - - // Bind an event to only be triggered a single time. After the first time - // the callback is invoked, it will be removed. - once: function(name, callback, context) { - if (!eventsApi(this, 'once', name, [callback, context]) || !callback) return this; - var self = this; - var once = _.once(function() { - self.off(name, once); - callback.apply(this, arguments); - }); - once._callback = callback; - return this.on(name, once, context); - }, - - // Remove one or many callbacks. If `context` is null, removes all - // callbacks with that function. If `callback` is null, removes all - // callbacks for the event. If `name` is null, removes all bound - // callbacks for all events. - off: function(name, callback, context) { - var retain, ev, events, names, i, l, j, k; - if (!this._events || !eventsApi(this, 'off', name, [callback, context])) return this; - if (!name && !callback && !context) { - this._events = {}; - return this; - } - - names = name ? [name] : _.keys(this._events); - for (i = 0, l = names.length; i < l; i++) { - name = names[i]; - if (events = this._events[name]) { - this._events[name] = retain = []; - if (callback || context) { - for (j = 0, k = events.length; j < k; j++) { - ev = events[j]; - if ((callback && callback !== ev.callback && callback !== ev.callback._callback) || - (context && context !== ev.context)) { - retain.push(ev); - } - } - } - if (!retain.length) delete this._events[name]; - } - } - - return this; - }, - - // Trigger one or many events, firing all bound callbacks. Callbacks are - // passed the same arguments as `trigger` is, apart from the event name - // (unless you're listening on `"all"`, which will cause your callback to - // receive the true name of the event as the first argument). - trigger: function(name) { - if (!this._events) return this; - var args = slice.call(arguments, 1); - if (!eventsApi(this, 'trigger', name, args)) return this; - var events = this._events[name]; - var allEvents = this._events.all; - if (events) triggerEvents(events, args); - if (allEvents) triggerEvents(allEvents, arguments); - return this; - }, - - // Tell this object to stop listening to either specific events ... or - // to every object it's currently listening to. - stopListening: function(obj, name, callback) { - var listeners = this._listeners; - if (!listeners) return this; - var deleteListener = !name && !callback; - if (typeof name === 'object') callback = this; - if (obj) (listeners = {})[obj._listenerId] = obj; - for (var id in listeners) { - listeners[id].off(name, callback, this); - if (deleteListener) delete this._listeners[id]; - } - return this; - } - - }; - - // Regular expression used to split event strings. - var eventSplitter = /\s+/; - - // Implement fancy features of the Events API such as multiple event - // names `"change blur"` and jQuery-style event maps `{change: action}` - // in terms of the existing API. - var eventsApi = function(obj, action, name, rest) { - if (!name) return true; - - // Handle event maps. - if (typeof name === 'object') { - for (var key in name) { - obj[action].apply(obj, [key, name[key]].concat(rest)); - } - return false; - } - - // Handle space separated event names. - if (eventSplitter.test(name)) { - var names = name.split(eventSplitter); - for (var i = 0, l = names.length; i < l; i++) { - obj[action].apply(obj, [names[i]].concat(rest)); - } - return false; - } - - return true; - }; - - // A difficult-to-believe, but optimized internal dispatch function for - // triggering events. Tries to keep the usual cases speedy (most internal - // Backbone events have 3 arguments). - var triggerEvents = function(events, args) { - var ev, i = -1, l = events.length, a1 = args[0], a2 = args[1], a3 = args[2]; - switch (args.length) { - case 0: while (++i < l) (ev = events[i]).callback.call(ev.ctx); return; - case 1: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1); return; - case 2: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2); return; - case 3: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2, a3); return; - default: while (++i < l) (ev = events[i]).callback.apply(ev.ctx, args); - } - }; - - var listenMethods = {listenTo: 'on', listenToOnce: 'once'}; - - // Inversion-of-control versions of `on` and `once`. Tell *this* object to - // listen to an event in another object ... keeping track of what it's - // listening to. - _.each(listenMethods, function(implementation, method) { - Events[method] = function(obj, name, callback) { - var listeners = this._listeners || (this._listeners = {}); - var id = obj._listenerId || (obj._listenerId = _.uniqueId('l')); - listeners[id] = obj; - if (typeof name === 'object') callback = this; - obj[implementation](name, callback, this); - return this; - }; - }); - - // Aliases for backwards compatibility. - Events.bind = Events.on; - Events.unbind = Events.off; - - // Allow the `Backbone` object to serve as a global event bus, for folks who - // want global "pubsub" in a convenient place. - _.extend(Backbone, Events); - - // Backbone.Model - // -------------- - - // Backbone **Models** are the basic data object in the framework -- - // frequently representing a row in a table in a database on your server. - // A discrete chunk of data and a bunch of useful, related methods for - // performing computations and transformations on that data. - - // Create a new model with the specified attributes. A client id (`cid`) - // is automatically generated and assigned for you. - var Model = Backbone.Model = function(attributes, options) { - var defaults; - var attrs = attributes || {}; - options || (options = {}); - this.cid = _.uniqueId('c'); - this.attributes = {}; - _.extend(this, _.pick(options, modelOptions)); - if (options.parse) attrs = this.parse(attrs, options) || {}; - if (defaults = _.result(this, 'defaults')) { - attrs = _.defaults({}, attrs, defaults); - } - this.set(attrs, options); - this.changed = {}; - this.initialize.apply(this, arguments); - }; - - // A list of options to be attached directly to the model, if provided. - var modelOptions = ['url', 'urlRoot', 'collection']; - - // Attach all inheritable methods to the Model prototype. - _.extend(Model.prototype, Events, { - - // A hash of attributes whose current and previous value differ. - changed: null, - - // The value returned during the last failed validation. - validationError: null, - - // The default name for the JSON `id` attribute is `"id"`. MongoDB and - // CouchDB users may want to set this to `"_id"`. - idAttribute: 'id', - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // Return a copy of the model's `attributes` object. - toJSON: function(options) { - return _.clone(this.attributes); - }, - - // Proxy `Backbone.sync` by default -- but override this if you need - // custom syncing semantics for *this* particular model. - sync: function() { - return Backbone.sync.apply(this, arguments); - }, - - // Get the value of an attribute. - get: function(attr) { - return this.attributes[attr]; - }, - - // Get the HTML-escaped value of an attribute. - escape: function(attr) { - return _.escape(this.get(attr)); - }, - - // Returns `true` if the attribute contains a value that is not null - // or undefined. - has: function(attr) { - return this.get(attr) != null; - }, - - // Set a hash of model attributes on the object, firing `"change"`. This is - // the core primitive operation of a model, updating the data and notifying - // anyone who needs to know about the change in state. The heart of the beast. - set: function(key, val, options) { - var attr, attrs, unset, changes, silent, changing, prev, current; - if (key == null) return this; - - // Handle both `"key", value` and `{key: value}` -style arguments. - if (typeof key === 'object') { - attrs = key; - options = val; - } else { - (attrs = {})[key] = val; - } - - options || (options = {}); - - // Run validation. - if (!this._validate(attrs, options)) return false; - - // Extract attributes and options. - unset = options.unset; - silent = options.silent; - changes = []; - changing = this._changing; - this._changing = true; - - if (!changing) { - this._previousAttributes = _.clone(this.attributes); - this.changed = {}; - } - current = this.attributes, prev = this._previousAttributes; - - // Check for changes of `id`. - if (this.idAttribute in attrs) this.id = attrs[this.idAttribute]; - - // For each `set` attribute, update or delete the current value. - for (attr in attrs) { - val = attrs[attr]; - if (!_.isEqual(current[attr], val)) changes.push(attr); - if (!_.isEqual(prev[attr], val)) { - this.changed[attr] = val; - } else { - delete this.changed[attr]; - } - unset ? delete current[attr] : current[attr] = val; - } - - // Trigger all relevant attribute changes. - if (!silent) { - if (changes.length) this._pending = true; - for (var i = 0, l = changes.length; i < l; i++) { - this.trigger('change:' + changes[i], this, current[changes[i]], options); - } - } - - // You might be wondering why there's a `while` loop here. Changes can - // be recursively nested within `"change"` events. - if (changing) return this; - if (!silent) { - while (this._pending) { - this._pending = false; - this.trigger('change', this, options); - } - } - this._pending = false; - this._changing = false; - return this; - }, - - // Remove an attribute from the model, firing `"change"`. `unset` is a noop - // if the attribute doesn't exist. - unset: function(attr, options) { - return this.set(attr, void 0, _.extend({}, options, {unset: true})); - }, - - // Clear all attributes on the model, firing `"change"`. - clear: function(options) { - var attrs = {}; - for (var key in this.attributes) attrs[key] = void 0; - return this.set(attrs, _.extend({}, options, {unset: true})); - }, - - // Determine if the model has changed since the last `"change"` event. - // If you specify an attribute name, determine if that attribute has changed. - hasChanged: function(attr) { - if (attr == null) return !_.isEmpty(this.changed); - return _.has(this.changed, attr); - }, - - // Return an object containing all the attributes that have changed, or - // false if there are no changed attributes. Useful for determining what - // parts of a view need to be updated and/or what attributes need to be - // persisted to the server. Unset attributes will be set to undefined. - // You can also pass an attributes object to diff against the model, - // determining if there *would be* a change. - changedAttributes: function(diff) { - if (!diff) return this.hasChanged() ? _.clone(this.changed) : false; - var val, changed = false; - var old = this._changing ? this._previousAttributes : this.attributes; - for (var attr in diff) { - if (_.isEqual(old[attr], (val = diff[attr]))) continue; - (changed || (changed = {}))[attr] = val; - } - return changed; - }, - - // Get the previous value of an attribute, recorded at the time the last - // `"change"` event was fired. - previous: function(attr) { - if (attr == null || !this._previousAttributes) return null; - return this._previousAttributes[attr]; - }, - - // Get all of the attributes of the model at the time of the previous - // `"change"` event. - previousAttributes: function() { - return _.clone(this._previousAttributes); - }, - - // Fetch the model from the server. If the server's representation of the - // model differs from its current attributes, they will be overridden, - // triggering a `"change"` event. - fetch: function(options) { - options = options ? _.clone(options) : {}; - if (options.parse === void 0) options.parse = true; - var model = this; - var success = options.success; - options.success = function(resp) { - if (!model.set(model.parse(resp, options), options)) return false; - if (success) success(model, resp, options); - model.trigger('sync', model, resp, options); - }; - wrapError(this, options); - return this.sync('read', this, options); - }, - - // Set a hash of model attributes, and sync the model to the server. - // If the server returns an attributes hash that differs, the model's - // state will be `set` again. - save: function(key, val, options) { - var attrs, method, xhr, attributes = this.attributes; - - // Handle both `"key", value` and `{key: value}` -style arguments. - if (key == null || typeof key === 'object') { - attrs = key; - options = val; - } else { - (attrs = {})[key] = val; - } - - // If we're not waiting and attributes exist, save acts as `set(attr).save(null, opts)`. - if (attrs && (!options || !options.wait) && !this.set(attrs, options)) return false; - - options = _.extend({validate: true}, options); - - // Do not persist invalid models. - if (!this._validate(attrs, options)) return false; - - // Set temporary attributes if `{wait: true}`. - if (attrs && options.wait) { - this.attributes = _.extend({}, attributes, attrs); - } - - // After a successful server-side save, the client is (optionally) - // updated with the server-side state. - if (options.parse === void 0) options.parse = true; - var model = this; - var success = options.success; - options.success = function(resp) { - // Ensure attributes are restored during synchronous saves. - model.attributes = attributes; - var serverAttrs = model.parse(resp, options); - if (options.wait) serverAttrs = _.extend(attrs || {}, serverAttrs); - if (_.isObject(serverAttrs) && !model.set(serverAttrs, options)) { - return false; - } - if (success) success(model, resp, options); - model.trigger('sync', model, resp, options); - }; - wrapError(this, options); - - method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update'); - if (method === 'patch') options.attrs = attrs; - xhr = this.sync(method, this, options); - - // Restore attributes. - if (attrs && options.wait) this.attributes = attributes; - - return xhr; - }, - - // Destroy this model on the server if it was already persisted. - // Optimistically removes the model from its collection, if it has one. - // If `wait: true` is passed, waits for the server to respond before removal. - destroy: function(options) { - options = options ? _.clone(options) : {}; - var model = this; - var success = options.success; - - var destroy = function() { - model.trigger('destroy', model, model.collection, options); - }; - - options.success = function(resp) { - if (options.wait || model.isNew()) destroy(); - if (success) success(model, resp, options); - if (!model.isNew()) model.trigger('sync', model, resp, options); - }; - - if (this.isNew()) { - options.success(); - return false; - } - wrapError(this, options); - - var xhr = this.sync('delete', this, options); - if (!options.wait) destroy(); - return xhr; - }, - - // Default URL for the model's representation on the server -- if you're - // using Backbone's restful methods, override this to change the endpoint - // that will be called. - url: function() { - var base = _.result(this, 'urlRoot') || _.result(this.collection, 'url') || urlError(); - if (this.isNew()) return base; - return base + (base.charAt(base.length - 1) === '/' ? '' : '/') + encodeURIComponent(this.id); - }, - - // **parse** converts a response into the hash of attributes to be `set` on - // the model. The default implementation is just to pass the response along. - parse: function(resp, options) { - return resp; - }, - - // Create a new model with identical attributes to this one. - clone: function() { - return new this.constructor(this.attributes); - }, - - // A model is new if it has never been saved to the server, and lacks an id. - isNew: function() { - return this.id == null; - }, - - // Check if the model is currently in a valid state. - isValid: function(options) { - return this._validate({}, _.extend(options || {}, { validate: true })); - }, - - // Run validation against the next complete set of model attributes, - // returning `true` if all is well. Otherwise, fire an `"invalid"` event. - _validate: function(attrs, options) { - if (!options.validate || !this.validate) return true; - attrs = _.extend({}, this.attributes, attrs); - var error = this.validationError = this.validate(attrs, options) || null; - if (!error) return true; - this.trigger('invalid', this, error, _.extend(options || {}, {validationError: error})); - return false; - } - - }); - - // Underscore methods that we want to implement on the Model. - var modelMethods = ['keys', 'values', 'pairs', 'invert', 'pick', 'omit']; - - // Mix in each Underscore method as a proxy to `Model#attributes`. - _.each(modelMethods, function(method) { - Model.prototype[method] = function() { - var args = slice.call(arguments); - args.unshift(this.attributes); - return _[method].apply(_, args); - }; - }); - - // Backbone.Collection - // ------------------- - - // If models tend to represent a single row of data, a Backbone Collection is - // more analagous to a table full of data ... or a small slice or page of that - // table, or a collection of rows that belong together for a particular reason - // -- all of the messages in this particular folder, all of the documents - // belonging to this particular author, and so on. Collections maintain - // indexes of their models, both in order, and for lookup by `id`. - - // Create a new **Collection**, perhaps to contain a specific type of `model`. - // If a `comparator` is specified, the Collection will maintain - // its models in sort order, as they're added and removed. - var Collection = Backbone.Collection = function(models, options) { - options || (options = {}); - if (options.url) this.url = options.url; - if (options.model) this.model = options.model; - if (options.comparator !== void 0) this.comparator = options.comparator; - this._reset(); - this.initialize.apply(this, arguments); - if (models) this.reset(models, _.extend({silent: true}, options)); - }; - - // Default options for `Collection#set`. - var setOptions = {add: true, remove: true, merge: true}; - var addOptions = {add: true, merge: false, remove: false}; - - // Define the Collection's inheritable methods. - _.extend(Collection.prototype, Events, { - - // The default model for a collection is just a **Backbone.Model**. - // This should be overridden in most cases. - model: Model, - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // The JSON representation of a Collection is an array of the - // models' attributes. - toJSON: function(options) { - return this.map(function(model){ return model.toJSON(options); }); - }, - - // Proxy `Backbone.sync` by default. - sync: function() { - return Backbone.sync.apply(this, arguments); - }, - - // Add a model, or list of models to the set. - add: function(models, options) { - return this.set(models, _.defaults(options || {}, addOptions)); - }, - - // Remove a model, or a list of models from the set. - remove: function(models, options) { - models = _.isArray(models) ? models.slice() : [models]; - options || (options = {}); - var i, l, index, model; - for (i = 0, l = models.length; i < l; i++) { - model = this.get(models[i]); - if (!model) continue; - delete this._byId[model.id]; - delete this._byId[model.cid]; - index = this.indexOf(model); - this.models.splice(index, 1); - this.length--; - if (!options.silent) { - options.index = index; - model.trigger('remove', model, this, options); - } - this._removeReference(model); - } - return this; - }, - - // Update a collection by `set`-ing a new list of models, adding new ones, - // removing models that are no longer present, and merging models that - // already exist in the collection, as necessary. Similar to **Model#set**, - // the core operation for updating the data contained by the collection. - set: function(models, options) { - options = _.defaults(options || {}, setOptions); - if (options.parse) models = this.parse(models, options); - if (!_.isArray(models)) models = models ? [models] : []; - var i, l, model, attrs, existing, sort; - var at = options.at; - var sortable = this.comparator && (at == null) && options.sort !== false; - var sortAttr = _.isString(this.comparator) ? this.comparator : null; - var toAdd = [], toRemove = [], modelMap = {}; - - // Turn bare objects into model references, and prevent invalid models - // from being added. - for (i = 0, l = models.length; i < l; i++) { - if (!(model = this._prepareModel(models[i], options))) continue; - - // If a duplicate is found, prevent it from being added and - // optionally merge it into the existing model. - if (existing = this.get(model)) { - if (options.remove) modelMap[existing.cid] = true; - if (options.merge) { - existing.set(model.attributes, options); - if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true; - } - - // This is a new model, push it to the `toAdd` list. - } else if (options.add) { - toAdd.push(model); - - // Listen to added models' events, and index models for lookup by - // `id` and by `cid`. - model.on('all', this._onModelEvent, this); - this._byId[model.cid] = model; - if (model.id != null) this._byId[model.id] = model; - } - } - - // Remove nonexistent models if appropriate. - if (options.remove) { - for (i = 0, l = this.length; i < l; ++i) { - if (!modelMap[(model = this.models[i]).cid]) toRemove.push(model); - } - if (toRemove.length) this.remove(toRemove, options); - } - - // See if sorting is needed, update `length` and splice in new models. - if (toAdd.length) { - if (sortable) sort = true; - this.length += toAdd.length; - if (at != null) { - splice.apply(this.models, [at, 0].concat(toAdd)); - } else { - push.apply(this.models, toAdd); - } - } - - // Silently sort the collection if appropriate. - if (sort) this.sort({silent: true}); - - if (options.silent) return this; - - // Trigger `add` events. - for (i = 0, l = toAdd.length; i < l; i++) { - (model = toAdd[i]).trigger('add', model, this, options); - } - - if (toRemove.length || toAdd.length) this.trigger('resize', this, options); - - // Trigger `sort` if the collection was sorted. - if (sort) this.trigger('sort', this, options); - return this; - }, - - // When you have more items than you want to add or remove individually, - // you can reset the entire set with a new list of models, without firing - // any granular `add` or `remove` events. Fires `reset` when finished. - // Useful for bulk operations and optimizations. - reset: function(models, options) { - options || (options = {}); - for (var i = 0, l = this.models.length; i < l; i++) { - this._removeReference(this.models[i]); - } - options.previousModels = this.models; - this._reset(); - this.add(models, _.extend({silent: true}, options)); - if (!options.silent) this.trigger('reset', this, options); - return this; - }, - - // Add a model to the end of the collection. - push: function(model, options) { - model = this._prepareModel(model, options); - this.add(model, _.extend({at: this.length}, options)); - return model; - }, - - // Remove a model from the end of the collection. - pop: function(options) { - var model = this.at(this.length - 1); - this.remove(model, options); - return model; - }, - - // Add a model to the beginning of the collection. - unshift: function(model, options) { - model = this._prepareModel(model, options); - this.add(model, _.extend({at: 0}, options)); - return model; - }, - - // Remove a model from the beginning of the collection. - shift: function(options) { - var model = this.at(0); - this.remove(model, options); - return model; - }, - - // Slice out a sub-array of models from the collection. - slice: function(begin, end) { - return this.models.slice(begin, end); - }, - - // Get a model from the set by id. - get: function(obj) { - if (obj == null) return void 0; - return this._byId[obj.id != null ? obj.id : obj.cid || obj]; - }, - - // Get the model at the given index. - at: function(index) { - return this.models[index]; - }, - - // Return models with matching attributes. Useful for simple cases of - // `filter`. - where: function(attrs, first) { - if (_.isEmpty(attrs)) return first ? void 0 : []; - return this[first ? 'find' : 'filter'](function(model) { - for (var key in attrs) { - if (attrs[key] !== model.get(key)) return false; - } - return true; - }); - }, - - // Return the first model with matching attributes. Useful for simple cases - // of `find`. - findWhere: function(attrs) { - return this.where(attrs, true); - }, - - // Force the collection to re-sort itself. You don't need to call this under - // normal circumstances, as the set will maintain sort order as each item - // is added. - sort: function(options) { - if (!this.comparator) throw new Error('Cannot sort a set without a comparator'); - options || (options = {}); - - // Run sort based on type of `comparator`. - if (_.isString(this.comparator) || this.comparator.length === 1) { - this.models = this.sortBy(this.comparator, this); - } else { - this.models.sort(_.bind(this.comparator, this)); - } - - if (!options.silent) this.trigger('sort', this, options); - return this; - }, - - // Figure out the smallest index at which a model should be inserted so as - // to maintain order. - sortedIndex: function(model, value, context) { - value || (value = this.comparator); - var iterator = _.isFunction(value) ? value : function(model) { - return model.get(value); - }; - return _.sortedIndex(this.models, model, iterator, context); - }, - - // Pluck an attribute from each model in the collection. - pluck: function(attr) { - return _.invoke(this.models, 'get', attr); - }, - - // Fetch the default set of models for this collection, resetting the - // collection when they arrive. If `reset: true` is passed, the response - // data will be passed through the `reset` method instead of `set`. - fetch: function(options) { - options = options ? _.clone(options) : {}; - if (options.parse === void 0) options.parse = true; - var success = options.success; - var collection = this; - options.success = function(resp) { - var method = options.reset ? 'reset' : 'set'; - collection[method](resp, options); - if (success) success(collection, resp, options); - collection.trigger('sync', collection, resp, options); - }; - wrapError(this, options); - return this.sync('read', this, options); - }, - - // Create a new instance of a model in this collection. Add the model to the - // collection immediately, unless `wait: true` is passed, in which case we - // wait for the server to agree. - create: function(model, options) { - options = options ? _.clone(options) : {}; - if (!(model = this._prepareModel(model, options))) return false; - if (!options.wait) this.add(model, options); - var collection = this; - var success = options.success; - options.success = function(resp) { - if (options.wait) collection.add(model, options); - if (success) success(model, resp, options); - }; - model.save(null, options); - return model; - }, - - // **parse** converts a response into a list of models to be added to the - // collection. The default implementation is just to pass it through. - parse: function(resp, options) { - return resp; - }, - - // Create a new collection with an identical list of models as this one. - clone: function() { - return new this.constructor(this.models); - }, - - // Private method to reset all internal state. Called when the collection - // is first initialized or reset. - _reset: function() { - this.length = 0; - this.models = []; - this._byId = {}; - }, - - // Prepare a hash of attributes (or other model) to be added to this - // collection. - _prepareModel: function(attrs, options) { - if (attrs instanceof Model) { - if (!attrs.collection) attrs.collection = this; - return attrs; - } - options || (options = {}); - options.collection = this; - var model = new this.model(attrs, options); - if (!model._validate(attrs, options)) { - this.trigger('invalid', this, attrs, options); - return false; - } - return model; - }, - - // Internal method to sever a model's ties to a collection. - _removeReference: function(model) { - if (this === model.collection) delete model.collection; - model.off('all', this._onModelEvent, this); - }, - - // Internal method called every time a model in the set fires an event. - // Sets need to update their indexes when models change ids. All other - // events simply proxy through. "add" and "remove" events that originate - // in other collections are ignored. - _onModelEvent: function(event, model, collection, options) { - if ((event === 'add' || event === 'remove') && collection !== this) return; - if (event === 'destroy') this.remove(model, options); - if (model && event === 'change:' + model.idAttribute) { - delete this._byId[model.previous(model.idAttribute)]; - if (model.id != null) this._byId[model.id] = model; - } - this.trigger.apply(this, arguments); - } - - }); - - // Underscore methods that we want to implement on the Collection. - // 90% of the core usefulness of Backbone Collections is actually implemented - // right here: - var methods = ['forEach', 'each', 'map', 'collect', 'reduce', 'foldl', - 'inject', 'reduceRight', 'foldr', 'find', 'detect', 'filter', 'select', - 'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke', - 'max', 'min', 'toArray', 'size', 'first', 'head', 'take', 'initial', 'rest', - 'tail', 'drop', 'last', 'without', 'indexOf', 'shuffle', 'lastIndexOf', - 'isEmpty', 'chain']; - - // Mix in each Underscore method as a proxy to `Collection#models`. - _.each(methods, function(method) { - Collection.prototype[method] = function() { - var args = slice.call(arguments); - args.unshift(this.models); - return _[method].apply(_, args); - }; - }); - - // Underscore methods that take a property name as an argument. - var attributeMethods = ['groupBy', 'countBy', 'sortBy']; - - // Use attributes instead of properties. - _.each(attributeMethods, function(method) { - Collection.prototype[method] = function(value, context) { - var iterator = _.isFunction(value) ? value : function(model) { - return model.get(value); - }; - return _[method](this.models, iterator, context); - }; - }); - - // Backbone.View - // ------------- - - // Backbone Views are almost more convention than they are actual code. A View - // is simply a JavaScript object that represents a logical chunk of UI in the - // DOM. This might be a single item, an entire list, a sidebar or panel, or - // even the surrounding frame which wraps your whole app. Defining a chunk of - // UI as a **View** allows you to define your DOM events declaratively, without - // having to worry about render order ... and makes it easy for the view to - // react to specific changes in the state of your models. - - // Creating a Backbone.View creates its initial element outside of the DOM, - // if an existing element is not provided... - var View = Backbone.View = function(options) { - this.cid = _.uniqueId('view'); - this._configure(options || {}); - this._ensureElement(); - this.initialize.apply(this, arguments); - this.delegateEvents(); - }; - - // Cached regex to split keys for `delegate`. - var delegateEventSplitter = /^(\S+)\s*(.*)$/; - - // List of view options to be merged as properties. - var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName', 'events']; - - // Set up all inheritable **Backbone.View** properties and methods. - _.extend(View.prototype, Events, { - - // The default `tagName` of a View's element is `"div"`. - tagName: 'div', - - // jQuery delegate for element lookup, scoped to DOM elements within the - // current view. This should be prefered to global lookups where possible. - $: function(selector) { - return this.$el.find(selector); - }, - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // **render** is the core function that your view should override, in order - // to populate its element (`this.el`), with the appropriate HTML. The - // convention is for **render** to always return `this`. - render: function() { - return this; - }, - - // Remove this view by taking the element out of the DOM, and removing any - // applicable Backbone.Events listeners. - remove: function() { - this.$el.remove(); - this.stopListening(); - return this; - }, - - // Change the view's element (`this.el` property), including event - // re-delegation. - setElement: function(element, delegate) { - if (this.$el) this.undelegateEvents(); - this.$el = element instanceof Backbone.$ ? element : Backbone.$(element); - this.el = this.$el[0]; - if (delegate !== false) this.delegateEvents(); - return this; - }, - - // Set callbacks, where `this.events` is a hash of - // - // *{"event selector": "callback"}* - // - // { - // 'mousedown .title': 'edit', - // 'click .button': 'save' - // 'click .open': function(e) { ... } - // } - // - // pairs. Callbacks will be bound to the view, with `this` set properly. - // Uses event delegation for efficiency. - // Omitting the selector binds the event to `this.el`. - // This only works for delegate-able events: not `focus`, `blur`, and - // not `change`, `submit`, and `reset` in Internet Explorer. - delegateEvents: function(events) { - if (!(events || (events = _.result(this, 'events')))) return this; - this.undelegateEvents(); - for (var key in events) { - var method = events[key]; - if (!_.isFunction(method)) method = this[events[key]]; - if (!method) continue; - - var match = key.match(delegateEventSplitter); - var eventName = match[1], selector = match[2]; - method = _.bind(method, this); - eventName += '.delegateEvents' + this.cid; - if (selector === '') { - this.$el.on(eventName, method); - } else { - this.$el.on(eventName, selector, method); - } - } - return this; - }, - - // Clears all callbacks previously bound to the view with `delegateEvents`. - // You usually don't need to use this, but may wish to if you have multiple - // Backbone views attached to the same DOM element. - undelegateEvents: function() { - this.$el.off('.delegateEvents' + this.cid); - return this; - }, - - // Performs the initial configuration of a View with a set of options. - // Keys with special meaning *(e.g. model, collection, id, className)* are - // attached directly to the view. See `viewOptions` for an exhaustive - // list. - _configure: function(options) { - if (this.options) options = _.extend({}, _.result(this, 'options'), options); - _.extend(this, _.pick(options, viewOptions)); - this.options = options; - }, - - // Ensure that the View has a DOM element to render into. - // If `this.el` is a string, pass it through `$()`, take the first - // matching element, and re-assign it to `el`. Otherwise, create - // an element from the `id`, `className` and `tagName` properties. - _ensureElement: function() { - if (!this.el) { - var attrs = _.extend({}, _.result(this, 'attributes')); - if (this.id) attrs.id = _.result(this, 'id'); - if (this.className) attrs['class'] = _.result(this, 'className'); - var $el = Backbone.$('<' + _.result(this, 'tagName') + '>').attr(attrs); - this.setElement($el, false); - } else { - this.setElement(_.result(this, 'el'), false); - } - } - - }); - - // Backbone.sync - // ------------- - - // Override this function to change the manner in which Backbone persists - // models to the server. You will be passed the type of request, and the - // model in question. By default, makes a RESTful Ajax request - // to the model's `url()`. Some possible customizations could be: - // - // * Use `setTimeout` to batch rapid-fire updates into a single request. - // * Send up the models as XML instead of JSON. - // * Persist models via WebSockets instead of Ajax. - // - // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests - // as `POST`, with a `_method` parameter containing the true HTTP method, - // as well as all requests with the body as `application/x-www-form-urlencoded` - // instead of `application/json` with the model in a param named `model`. - // Useful when interfacing with server-side languages like **PHP** that make - // it difficult to read the body of `PUT` requests. - Backbone.sync = function(method, model, options) { - var type = methodMap[method]; - - // Default options, unless specified. - _.defaults(options || (options = {}), { - emulateHTTP: Backbone.emulateHTTP, - emulateJSON: Backbone.emulateJSON - }); - - // Default JSON-request options. - var params = {type: type, dataType: 'json'}; - - // Ensure that we have a URL. - if (!options.url) { - params.url = _.result(model, 'url') || urlError(); - } - - // Ensure that we have the appropriate request data. - if (options.data == null && model && (method === 'create' || method === 'update' || method === 'patch')) { - params.contentType = 'application/json'; - params.data = JSON.stringify(options.attrs || model.toJSON(options)); - } - - // For older servers, emulate JSON by encoding the request into an HTML-form. - if (options.emulateJSON) { - params.contentType = 'application/x-www-form-urlencoded'; - params.data = params.data ? {model: params.data} : {}; - } - - // For older servers, emulate HTTP by mimicking the HTTP method with `_method` - // And an `X-HTTP-Method-Override` header. - if (options.emulateHTTP && (type === 'PUT' || type === 'DELETE' || type === 'PATCH')) { - params.type = 'POST'; - if (options.emulateJSON) params.data._method = type; - var beforeSend = options.beforeSend; - options.beforeSend = function(xhr) { - xhr.setRequestHeader('X-HTTP-Method-Override', type); - if (beforeSend) return beforeSend.apply(this, arguments); - }; - } - - // Don't process data on a non-GET request. - if (params.type !== 'GET' && !options.emulateJSON) { - params.processData = false; - } - - // If we're sending a `PATCH` request, and we're in an old Internet Explorer - // that still has ActiveX enabled by default, override jQuery to use that - // for XHR instead. Remove this line when jQuery supports `PATCH` on IE8. - if (params.type === 'PATCH' && window.ActiveXObject && - !(window.external && window.external.msActiveXFilteringEnabled)) { - params.xhr = function() { - return new ActiveXObject("Microsoft.XMLHTTP"); - }; - } - - // Make the request, allowing the user to override any Ajax options. - var xhr = options.xhr = Backbone.ajax(_.extend(params, options)); - model.trigger('request', model, xhr, options); - return xhr; - }; - - // Map from CRUD to HTTP for our default `Backbone.sync` implementation. - var methodMap = { - 'create': 'POST', - 'update': 'PUT', - 'patch': 'PATCH', - 'delete': 'DELETE', - 'read': 'GET' - }; - - // Set the default implementation of `Backbone.ajax` to proxy through to `$`. - // Override this if you'd like to use a different library. - Backbone.ajax = function() { - return Backbone.$.ajax.apply(Backbone.$, arguments); - }; - - // Backbone.Router - // --------------- - - // Routers map faux-URLs to actions, and fire events when routes are - // matched. Creating a new one sets its `routes` hash, if not set statically. - var Router = Backbone.Router = function(options) { - options || (options = {}); - if (options.routes) this.routes = options.routes; - this._bindRoutes(); - this.initialize.apply(this, arguments); - }; - - // Cached regular expressions for matching named param parts and splatted - // parts of route strings. - var optionalParam = /\((.*?)\)/g; - var namedParam = /(\(\?)?:\w+/g; - var splatParam = /\*\w+/g; - var escapeRegExp = /[\-{}\[\]+?.,\\\^$|#\s]/g; - - // Set up all inheritable **Backbone.Router** properties and methods. - _.extend(Router.prototype, Events, { - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // Manually bind a single named route to a callback. For example: - // - // this.route('search/:query/p:num', 'search', function(query, num) { - // ... - // }); - // - route: function(route, name, callback) { - if (!_.isRegExp(route)) route = this._routeToRegExp(route); - if (_.isFunction(name)) { - callback = name; - name = ''; - } - if (!callback) callback = this[name]; - var router = this; - Backbone.history.route(route, function(fragment) { - var args = router._extractParameters(route, fragment); - callback && callback.apply(router, args); - router.trigger.apply(router, ['route:' + name].concat(args)); - router.trigger('route', name, args); - Backbone.history.trigger('route', router, name, args); - }); - return this; - }, - - // Simple proxy to `Backbone.history` to save a fragment into the history. - navigate: function(fragment, options) { - Backbone.history.navigate(fragment, options); - return this; - }, - - // Bind all defined routes to `Backbone.history`. We have to reverse the - // order of the routes here to support behavior where the most general - // routes can be defined at the bottom of the route map. - _bindRoutes: function() { - if (!this.routes) return; - this.routes = _.result(this, 'routes'); - var route, routes = _.keys(this.routes); - while ((route = routes.pop()) != null) { - this.route(route, this.routes[route]); - } - }, - - // Convert a route string into a regular expression, suitable for matching - // against the current location hash. - _routeToRegExp: function(route) { - route = route.replace(escapeRegExp, '\\$&') - .replace(optionalParam, '(?:$1)?') - .replace(namedParam, function(match, optional){ - return optional ? match : '([^\/]+)'; - }) - .replace(splatParam, '(.*?)'); - return new RegExp('^' + route + '$'); - }, - - // Given a route, and a URL fragment that it matches, return the array of - // extracted decoded parameters. Empty or unmatched parameters will be - // treated as `null` to normalize cross-browser behavior. - _extractParameters: function(route, fragment) { - var params = route.exec(fragment).slice(1); - return _.map(params, function(param) { - return param ? decodeURIComponent(param) : null; - }); - } - - }); - - // Backbone.History - // ---------------- - - // Handles cross-browser history management, based on either - // [pushState](http://diveintohtml5.info/history.html) and real URLs, or - // [onhashchange](https://developer.mozilla.org/en-US/docs/DOM/window.onhashchange) - // and URL fragments. If the browser supports neither (old IE, natch), - // falls back to polling. - var History = Backbone.History = function() { - this.handlers = []; - _.bindAll(this, 'checkUrl'); - - // Ensure that `History` can be used outside of the browser. - if (typeof window !== 'undefined') { - this.location = window.location; - this.history = window.history; - } - }; - - // Cached regex for stripping a leading hash/slash and trailing space. - var routeStripper = /^[#\/]|\s+$/g; - - // Cached regex for stripping leading and trailing slashes. - var rootStripper = /^\/+|\/+$/g; - - // Cached regex for detecting MSIE. - var isExplorer = /msie [\w.]+/; - - // Cached regex for removing a trailing slash. - var trailingSlash = /\/$/; - - // Has the history handling already been started? - History.started = false; - - // Set up all inheritable **Backbone.History** properties and methods. - _.extend(History.prototype, Events, { - - // The default interval to poll for hash changes, if necessary, is - // twenty times a second. - interval: 50, - - // Gets the true hash value. Cannot use location.hash directly due to bug - // in Firefox where location.hash will always be decoded. - getHash: function(window) { - var match = (window || this).location.href.match(/#(.*)$/); - return match ? match[1] : ''; - }, - - // Get the cross-browser normalized URL fragment, either from the URL, - // the hash, or the override. - getFragment: function(fragment, forcePushState) { - if (fragment == null) { - if (this._hasPushState || !this._wantsHashChange || forcePushState) { - fragment = this.location.pathname; - var root = this.root.replace(trailingSlash, ''); - if (!fragment.indexOf(root)) fragment = fragment.substr(root.length); - } else { - fragment = this.getHash(); - } - } - return fragment.replace(routeStripper, ''); - }, - - // Start the hash change handling, returning `true` if the current URL matches - // an existing route, and `false` otherwise. - start: function(options) { - if (History.started) throw new Error("Backbone.history has already been started"); - History.started = true; - - // Figure out the initial configuration. Do we need an iframe? - // Is pushState desired ... is it available? - this.options = _.extend({}, {root: '/'}, this.options, options); - this.root = this.options.root; - this._wantsHashChange = this.options.hashChange !== false; - this._wantsPushState = !!this.options.pushState; - this._hasPushState = !!(this.options.pushState && this.history && this.history.pushState); - var fragment = this.getFragment(); - var docMode = document.documentMode; - var oldIE = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7)); - - // Normalize root to always include a leading and trailing slash. - this.root = ('/' + this.root + '/').replace(rootStripper, '/'); - - if (oldIE && this._wantsHashChange) { - this.iframe = Backbone.$('