As mother always said, late is better than never. Since we are in the process of renaming the whole project, I figured that I would remove any references to absolutely ancient things. This series does that.
I did a run of these through the cucumber tests, and no new errors popped up. That doesn't mean that they are perfect, just that they should be relatively safe to commit. Please review and ACK.
There are some references to ancient stuff in the source tree that no longer apply. With guidance from jayg, remove them here.
Signed-off-by: Chris Lalancette clalance@redhat.com --- src/.project | 2 +- src/app/models/instance_task.rb | 14 - src/app/views/layouts/aggregator.haml | 1 - src/app/views/layouts/newui.haml | 1 - src/config/selenium.yml | 8 - src/public/401.html | 40 --- src/public/javascripts/facebox.js | 320 -------------------- .../javascripts/test/smart_nav_sample_data.js | 151 --------- .../javascripts/test/storage_tree_sample_data.js | 68 ---- src/test/fixtures/tasks.yml | 9 - src/test/functional/interface_test.rb | 184 ----------- 11 files changed, 1 insertions(+), 797 deletions(-) delete mode 100644 src/config/selenium.yml delete mode 100644 src/public/401.html delete mode 100644 src/public/javascripts/facebox.js delete mode 100644 src/public/javascripts/test/smart_nav_sample_data.js delete mode 100644 src/public/javascripts/test/storage_tree_sample_data.js delete mode 100644 src/test/fixtures/tasks.yml delete mode 100644 src/test/functional/interface_test.rb
diff --git a/src/.project b/src/.project index 244f341..52f7855 100644 --- a/src/.project +++ b/src/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>oVirt Server</name> + <name>Aeolus Conductor</name> <comment></comment> <projects> </projects> diff --git a/src/app/models/instance_task.rb b/src/app/models/instance_task.rb index 6c78c0f..be76a6e 100644 --- a/src/app/models/instance_task.rb +++ b/src/app/models/instance_task.rb @@ -82,18 +82,4 @@ class InstanceTask < Task ["Reboot", InstanceTask::ACTION_REBOOT_VM], ["Destroy", InstanceTask::ACTION_DESTROY]] end - - # FIXME: most of these go away when ovirt model leaves - def vm - nil - end - def host - nil - end - def storage_volume - nil - end - def storage_pool - nil - end end diff --git a/src/app/views/layouts/aggregator.haml b/src/app/views/layouts/aggregator.haml index 4336e70..3e407e3 100644 --- a/src/app/views/layouts/aggregator.haml +++ b/src/app/views/layouts/aggregator.haml @@ -15,7 +15,6 @@ = javascript_include_tag "http://html5shiv.googlecode.com/svn/trunk/html5.js" = javascript_include_tag "jquery-1.4.2.min.js" = javascript_include_tag "application.js" - = javascript_include_tag "facebox.js" = javascript_include_tag "jquery.ui-1.8.1/jquery-ui-1.8.1.custom.min.js" = javascript_include_tag "jquery.loadmask.min" = javascript_include_tag "modernizr-1.5" diff --git a/src/app/views/layouts/newui.haml b/src/app/views/layouts/newui.haml index 5be5886..b5870a2 100644 --- a/src/app/views/layouts/newui.haml +++ b/src/app/views/layouts/newui.haml @@ -15,7 +15,6 @@ = javascript_include_tag "http://html5shiv.googlecode.com/svn/trunk/html5.js" = javascript_include_tag "jquery-1.4.2.min.js" = javascript_include_tag "application.js" - = javascript_include_tag "facebox.js" = javascript_include_tag "jquery.ui-1.8.1/jquery-ui-1.8.1.custom.min.js" = javascript_include_tag "jquery.loadmask.min" = javascript_include_tag "modernizr-1.5" diff --git a/src/config/selenium.yml b/src/config/selenium.yml deleted file mode 100644 index ea83c68..0000000 --- a/src/config/selenium.yml +++ /dev/null @@ -1,8 +0,0 @@ -# oVirt selenium configuration - -selenium_server: - address: "192.168.50.1" - port: 4444 - browser: "*firefox /usr/lib64/firefox-3.0.4/firefox" -ovirt_server: - address: 192.168.50.2 diff --git a/src/public/401.html b/src/public/401.html deleted file mode 100644 index ffcfc9b..0000000 --- a/src/public/401.html +++ /dev/null @@ -1,40 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> - <meta http-equiv="content-type" content="text/html;charset=UTF-8" /> - <title>Authorization Required</title> - <link href="/ovirt/stylesheets/default.css" media="screen" rel="Stylesheet" type="text/css" /> - <script src="/ovirt/javascripts/prototype.js" type="text/javascript"></script> -</head> -<body> - -<div id="top_bar"></div> -<div id="content"> - <div id="header"> -<a href="/"><img alt="Ovirt" class="logo" src="/ovirt/images/ovirt-red-logo133x56.png" /></a> -</div> - - <div class = "alertbox"></div> - <div id="main"> - <div id="left"> - <!-- fill in main page content --> - <h1 class="page-title">Authorization Required</h1> -<p> -This server could not verify that you are authorized to access the -document requested. Either you supplied the wrong credentials (e.g., -bad password), or your browser doesn't understand how to supply the -credentials required. -</p> - </div> - <div id="right"> - </div> - </div> - <br clear="both" /> - <div id="footer"> -ET Group. Copyright Red Hat, Inc. 2007 -</div> -</div> -</body> -</html> diff --git a/src/public/javascripts/facebox.js b/src/public/javascripts/facebox.js deleted file mode 100644 index e0d4749..0000000 --- a/src/public/javascripts/facebox.js +++ /dev/null @@ -1,320 +0,0 @@ -/* - * Facebox (for jQuery) - * version: 1.2 (05/05/2008) - * @requires jQuery v1.2 or later - * - * Examples at http://famspam.com/facebox/ - * - * Licensed under the MIT: - * http://www.opensource.org/licenses/mit-license.php - * - * Copyright 2007, 2008 Chris Wanstrath [ chris@ozmm.org ] - * - * Usage: - * - * jQuery(document).ready(function() { - * jQuery('a[rel*=facebox]').facebox() - * }) - * - * <a href="#terms" rel="facebox">Terms</a> - * Loads the #terms div in the box - * - * <a href="terms.html" rel="facebox">Terms</a> - * Loads the terms.html page in the box - * - * <a href="terms.png" rel="facebox">Terms</a> - * Loads the terms.png image in the box - * - * - * You can also use it programmatically: - * - * jQuery.facebox('some html') - * - * The above will open a facebox with "some html" as the content. - * - * jQuery.facebox(function($) { - * $.get('blah.html', function(data) { $.facebox(data) }) - * }) - * - * The above will show a loading screen before the passed function is called, - * allowing for a better ajaxy experience. - * - * The facebox function can also display an ajax page or image: - * - * jQuery.facebox({ ajax: 'remote.html' }) - * jQuery.facebox({ image: 'dude.jpg' }) - * - * Want to close the facebox? Trigger the 'close.facebox' document event: - * - * jQuery(document).trigger('close.facebox') - * - * Facebox also has a bunch of other hooks: - * - * loading.facebox - * beforeReveal.facebox - * reveal.facebox (aliased as 'afterReveal.facebox') - * init.facebox - * - * Simply bind a function to any of these hooks: - * - * $(document).bind('reveal.facebox', function() { ...stuff to do after the facebox and contents are revealed... }) - * - */ -(function($) { - $.facebox = function(data, klass) { - $.facebox.loading() - - if (data.ajax) fillFaceboxFromAjax(data.ajax) - else if (data.image) fillFaceboxFromImage(data.image) - else if (data.div) fillFaceboxFromHref(data.div) - else if ($.isFunction(data)) data.call($) - else $.facebox.reveal(data, klass) - } - - /* - * Public, $.facebox methods - */ - - $.extend($.facebox, { - settings: { - opacity : .4, - overlay : true, - loadingImage : '/ovirt/images/loading.gif', - closeImage : '/ovirt/images/closelabel.gif', - imageTypes : [ 'png', 'jpg', 'jpeg', 'gif' ], - faceboxHtml : '\ - <div id="facebox" style="display:none;"> \ - <div class="popup"> \ - <table> \ - <tbody> \ - <tr> \ - <td class="tl"/><td class="b"/><td class="tr"/> \ - </tr> \ - <tr> \ - <td class="b"/> \ - <td class="body"> \ - <div class="content"> \ - </div> \ - <div class="footer"> \ - <a href="#" class="close"> \ - <img src="/ovirt/images/closelabel.gif" title="close" class="close_image" /> \ - </a> \ - </div> \ - </td> \ - <td class="b"/> \ - </tr> \ - <tr> \ - <td class="bl"/><td class="b"/><td class="br"/> \ - </tr> \ - </tbody> \ - </table> \ - </div> \ - </div>' - }, - - loading: function() { - init() - if ($('#facebox .loading').length == 1) return true - showOverlay() - - $('#facebox .content').empty() - $('#facebox .body').children().hide().end(). - append('<div class="loading"><img src="'+$.facebox.settings.loadingImage+'"/></div>') - - $('#facebox').css({ - top: getPageScroll()[1] + (getPageHeight() / 10), - left: 385.5 - }).show() - - $(document).bind('keydown.facebox', function(e) { - if (e.keyCode == 27) $.facebox.close() - return true - }) - $(document).trigger('loading.facebox') - }, - - reveal: function(data, klass) { - $(document).trigger('beforeReveal.facebox') - if (klass) $('#facebox .content').addClass(klass) - $('#facebox .content').append(data) - $('#facebox .loading').remove() - $('#facebox .body').children().fadeIn('normal') - $('#facebox').css('left', $(window).width() / 2 - ($('#facebox table').width() / 2)) - $(document).trigger('reveal.facebox').trigger('afterReveal.facebox') - }, - - close: function() { - $(document).trigger('close.facebox') - return false - } - }) - - /* - * Public, $.fn methods - */ - - $.fn.facebox = function(settings) { - init(settings) - - function clickHandler() { - $.facebox.loading(true) - - // support for rel="facebox.inline_popup" syntax, to add a class - // also supports deprecated "facebox[.inline_popup]" syntax - var klass = this.rel.match(/facebox[?.(\w+)]?/) - if (klass) klass = klass[1] - - fillFaceboxFromHref(this.href, klass) - return false - } - - return this.click(clickHandler) - } - - /* - * Private methods - */ - - // called one time to setup facebox on this page - function init(settings) { - if ($.facebox.settings.inited) return true - else $.facebox.settings.inited = true - - $(document).trigger('init.facebox') - makeCompatible() - - var imageTypes = $.facebox.settings.imageTypes.join('|') - $.facebox.settings.imageTypesRegexp = new RegExp('.' + imageTypes + '$', 'i') - - if (settings) $.extend($.facebox.settings, settings) - $('body').append($.facebox.settings.faceboxHtml) - - var preload = [ new Image(), new Image() ] - preload[0].src = $.facebox.settings.closeImage - preload[1].src = $.facebox.settings.loadingImage - - $('#facebox').find('.b:first, .bl, .br, .tl, .tr').each(function() { - preload.push(new Image()) - preload.slice(-1).src = $(this).css('background-image').replace(/url((.+))/, '$1') - }) - - $('#facebox .close').click($.facebox.close) - $('#facebox .close_image').attr('src', $.facebox.settings.closeImage) - $('#facebox .footer').remove() - } - - // getPageScroll() by quirksmode.com - function getPageScroll() { - var xScroll, yScroll; - if (self.pageYOffset) { - yScroll = self.pageYOffset; - xScroll = self.pageXOffset; - } else if (document.documentElement && document.documentElement.scrollTop) { // Explorer 6 Strict - yScroll = document.documentElement.scrollTop; - xScroll = document.documentElement.scrollLeft; - } else if (document.body) {// all other Explorers - yScroll = document.body.scrollTop; - xScroll = document.body.scrollLeft; - } - return new Array(xScroll,yScroll) - } - - // Adapted from getPageSize() by quirksmode.com - function getPageHeight() { - var windowHeight - if (self.innerHeight) { // all except Explorer - windowHeight = self.innerHeight; - } else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode - windowHeight = document.documentElement.clientHeight; - } else if (document.body) { // other Explorers - windowHeight = document.body.clientHeight; - } - return windowHeight - } - - // Backwards compatibility - function makeCompatible() { - var $s = $.facebox.settings - - $s.loadingImage = $s.loading_image || $s.loadingImage - $s.closeImage = $s.close_image || $s.closeImage - $s.imageTypes = $s.image_types || $s.imageTypes - $s.faceboxHtml = $s.facebox_html || $s.faceboxHtml - } - - // Figures out what you want to display and displays it - // formats are: - // div: #id - // image: blah.extension - // ajax: anything else - function fillFaceboxFromHref(href, klass) { - // div - if (href.match(/#/)) { - var url = window.location.href.split('#')[0] - var target = href.replace(url,'') - $.facebox.reveal($(target).clone().show(), klass) - - // image - } else if (href.match($.facebox.settings.imageTypesRegexp)) { - fillFaceboxFromImage(href, klass) - // ajax - } else { - fillFaceboxFromAjax(href, klass) - } - } - - function fillFaceboxFromImage(href, klass) { - var image = new Image() - image.onload = function() { - $.facebox.reveal('<div class="image"><img src="' + image.src + '" /></div>', klass) - } - image.src = href - } - - function fillFaceboxFromAjax(href, klass) { - $.get(href, function(data) { $.facebox.reveal(data, klass) }) - } - - function skipOverlay() { - return $.facebox.settings.overlay == false || $.facebox.settings.opacity === null - } - - function showOverlay() { - if (skipOverlay()) return - - if ($('facebox_overlay').length == 0) - $("body").append('<div id="facebox_overlay" class="facebox_hide"></div>') - - $('#facebox_overlay').hide().addClass("facebox_overlayBG") - .css('opacity', $.facebox.settings.opacity) - .click(function() { $(document).trigger('close.facebox') }) - .fadeIn(200) - return false - } - - function hideOverlay() { - if (skipOverlay()) return - - $('#facebox_overlay').fadeOut(200, function(){ - $("#facebox_overlay").removeClass("facebox_overlayBG") - $("#facebox_overlay").addClass("facebox_hide") - $("#facebox_overlay").remove() - }) - - return false - } - - /* - * Bindings - */ - - $(document).bind('close.facebox', function() { - $(document).unbind('keydown.facebox') - $('#facebox').fadeOut(function() { - $('#facebox .content').removeClass().addClass('content') - hideOverlay() - $('#facebox .loading').remove() - }) - }) - -})(jQuery); diff --git a/src/public/javascripts/test/smart_nav_sample_data.js b/src/public/javascripts/test/smart_nav_sample_data.js deleted file mode 100644 index 43e7dbc..0000000 --- a/src/public/javascripts/test/smart_nav_sample_data.js +++ /dev/null @@ -1,151 +0,0 @@ -var pools3 = { - "deleted" : {}, - "pools" :[ - { "name": "default", - "text": "default", - "children": - [{ "name": "Engineering", - "text": "Engineering", - "children": - [{ "name": "Development", - "text": "Development", - "children": - [{ "name": "Project X", - "text": "Project X", - "id": 19, - "type": "VmResourcePool"}, - { "name": "Project Y", - "text": "Project Y", - "id": 20, - "type": "VmResourcePool"}], - "id": 9, - "type": "HardwarePool"}, - { "name": "QA", - "text": "QA", - "children": - [{ "name": "Bob's Team", - "text": "Bob's Team", - "children": - [{ "name": "Bob's VMs", - "text": "Bob's VMs", - "id": 21, - "type": "VmResourcePool"}], - "id": 17, - "type": "HardwarePool"}, - { "name": "Jim's Team", - "text": "Jim's Team", - "children": - [{ "name": "Jim's VMs", - "text": "Jim's VMs", - "id": 22, - "type": "VmResourcePool"}], - "id": 18, - "type": "HardwarePool"}, - { "name": "Sally's Team", - "text": "Sally's Team", - "children": - [{ "name": "Sally's VMs", - "text": "Sally's VMs", - "id": 33, - "type": "VmResourcePool"}], - "id": 32, - "type": "HardwarePool"}], - "id": 10, - "type": "HardwarePool"}, - { "name": "Stage", - "text": "Stage", - "children": - [{ "name": "stage1", - "text": "stage1", - "id": 45, - "type": "HardwarePool"}, - { "name": "stage2", - "text": "stage2", - "id": 46, - "type": "HardwarePool"}], - "id": 44, - "type": "HardwarePool"}], - "id": 5, - "type": "HardwarePool"}, - { "name": "Finance", - "text": "Finance", - "children": - [{ "name": "Payroll", - "text": "Payroll", - "children": - [{ "name": "Payroll VMs", - "text": "Payroll VMs", - "id": 23, - "type": "VmResourcePool"}], - "id": 11, - "type": "HardwarePool"}, - { "name": "Accts. Receivable", - "text": "Accts. Receivable", - "children": - [{ "name": "our VMs", - "text": "our VMs", - "id": 24, - "type": "VmResourcePool"}], - "id": 12, - "type": "HardwarePool"}], - "id": 6, - "type": "HardwarePool"}, - { "name": "HR", - "text": "HR", - "children": - [{ "name": "Hiring Team", - "text": "Hiring Team", - "id": 13, - "type": "HardwarePool"}, - { "name": "Benefits", - "text": "Benefits", - "id": 14, - "type": "HardwarePool"}], - "id": 7, - "type": "HardwarePool"}, - { "name": "External (DMZ)", - "text": "External (DMZ)", - "children": - [{ "name": "VMs", - "text": "VMs", - "id": 25, - "type": "VmResourcePool"}, - { "name": "DB Cluster", - "text": "DB Cluster", - "children": - [{ "name": "VMs", - "text": "VMs", - "id": 27, - "type": "VmResourcePool"}], - "id": 26, - "type": "HardwarePool"}], - "id": 8, - "type": "HardwarePool"}], - "id": 1, - "type": "HardwarePool"}], -"smart_pools":[{ "name": "ovirtadmin", - "text": "ovirtadmin", - "children": - [{ "name": "not so smart", - "text": "not so smart", - "id": 39, - "type": "SmartPool"}, - { "name": "a little smarter", - "text": "a little smarter", - "id": 40, - "type": "SmartPool"}, - { "name": "arrrrr", - "text": "arrrrr", - "id": 41, - "type": "SmartPool"}, - { "name": "huh?", - "text": "huh?", - "id": 42, - "type": "SmartPool"}, - { "name": "booya", - "text": "booya", - "id": 43, - "type": "SmartPool"}], - "id": 37, - "type": "DirectoryPool"}] -} \ No newline at end of file diff --git a/src/public/javascripts/test/storage_tree_sample_data.js b/src/public/javascripts/test/storage_tree_sample_data.js deleted file mode 100644 index f798a45..0000000 --- a/src/public/javascripts/test/storage_tree_sample_data.js +++ /dev/null @@ -1,68 +0,0 @@ -var storage_pools = {"pools": -[ - { - "selected":false, - "name":"iSCSI: 192.168.50.2:ovirtpriv:storage", - "available":false, - "children": - [ - { - "selected":false, - "name":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-2", - "available":true, - "children":[], - "create_volume":true, - "text":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-2", - "id":5, - "type":"IscsiStorageVolume", - "ui_object": "IscsiStorageVolume_5", - "ui_parent": "IscsiStoragePool_2" - }, - - { - "selected":false, - "name":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-3", - "available":true, - "children":[], - "create_volume":true, - "text":"iSCSI: 192.168.50.2:ovirtpriv:storage:lun-3", - "id":4, - "type":"IscsiStorageVolume", - "ui_object": "IscsiStorageVolume_4", - "ui_parent": "IscsiStoragePool_2" - } - ], - "create_volume":false, - "text":"iSCSI: 192.168.50.2:ovirtpriv:storage", - "id":2, - "type":"IscsiStoragePool", - "ui_object": "IscsiStoragePool_2", - "ui_parent": null - }, - - { - "selected":false, - "name":"iSCSI: 192.68.60.2:/fred", - "available":false, - "children":[], - "create_volume":false, - "text":"iSCSI: 192.68.60.2:/fred", - "id":7, - "type":"IscsiStoragePool", - "ui_object": "IscsiStoragePool_7", - "ui_parent": null - }, - - { - "selected":false, - "name":"iSCSI: 192.168.60.4:/mo", - "available":false, - "children":[], - "create_volume":false, - "text":"iSCSI: 192.168.60.4:/mo", - "id":6, - "type":"IscsiStoragePool", - "ui_object": "IscsiStoragePool_6", - "ui_parent": null - } -]} \ No newline at end of file diff --git a/src/test/fixtures/tasks.yml b/src/test/fixtures/tasks.yml deleted file mode 100644 index 7f1e0bf..0000000 --- a/src/test/fixtures/tasks.yml +++ /dev/null @@ -1,9 +0,0 @@ -shutdown_production_httpd_appliance_task: - user: ovirtadmin - action: shutdown_vm - state: running - args: - created_at: 2008-02-13 15:42:43.417883 - message: - type: VmTask - task_target: production_httpd_vm (Vm) diff --git a/src/test/functional/interface_test.rb b/src/test/functional/interface_test.rb deleted file mode 100644 index 227058b..0000000 --- a/src/test/functional/interface_test.rb +++ /dev/null @@ -1,184 +0,0 @@ -# -# Copyright (C) 2008 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA. A copy of the GNU General Public License is -# also available at http://www.gnu.org/copyleft/gpl.html. - -if File.exists? File.dirname(__FILE__) + '/../selenium.rb' - require 'yaml' - - require File.dirname(__FILE__) + '/../test_helper' - require File.dirname(__FILE__) + '/../selenium' - - class InterfaceTest < Test::Unit::TestCase - def setup - @config = YAML::load(File.open("#{RAILS_ROOT}/config/selenium.yml")) - @site_url = "http://%22+ - @config["ovirt_server"]["address"] + "/ovirt/" - - @browser = Selenium::SeleniumDriver.new( - @config["selenium_server"]["address"], - @config["selenium_server"]["port"], - @config["selenium_server"]["browser"], - @site_url, - 15000) - @browser.start - @browser.set_speed(50) # ms delay between operations - @browser.open(@site_url) - end - - def teardown - @browser.close - @browser.stop - end - - def test_1_ovirt - assert_equal("Dashboard", @browser.get_title()) - end - - def test_2_view_pool - @browser.open("http://192.168.50.2/ovirt/") - @browser.wait_for_condition( - "selenium.isElementPresent("//ul[@id='nav_tree']/li/div")", - 10000) - @browser.click( - "//ul[@id='nav_tree']/li/div") # click 'default pool' link - @browser.wait_for_condition( - "selenium.isElementPresent("//div[@class='summary_title']")", - 50000) - - # verify the title of the pool - assert_equal("default", - @browser.get_text("//div[@class='summary_title']")) - end - - def test_3_create_resource_pool - # get us to default pool: - test_2_view_pool - - # click on virtual machines pools tab - @browser.click "//li[@id='nav_vmpool']/a" - @browser.wait_for_condition( - "selenium.isElementPresent("//div[@id='toolbar_nav']/ul/li[1]/a")", - 10000) - # click on 'new virtual machine pool' - @browser.click "//div[@id='toolbar_nav']/ul/li[1]/a" - - # fill in required fields - @browser.wait_for_condition( - "selenium.isElementPresent("//input[@id='vm_resource_pool_name']")", - 10000) - @browser.type("//input[@id='vm_resource_pool_name']", "vm_resource_pool1") - # click the button - @browser.click "//form[@id='vm_pool_form']/div[2]/div[2]/div[2]/a" - - @pool_link="//ul[@id='nav_tree']/li/ul/li/div" - @browser.wait_for_condition( - "selenium.isElementPresent(""+ @pool_link +"")", - 10000) - end - - #def test_4_create_start_stop_vm - # # view default pool's subpools - # @browser.wait_for_condition( - # "selenium.isElementPresent("//ul[@id='nav_tree']/li/span")", - # 10000) - # @browser.click( - # "//ul[@id='nav_tree']/li/span") # click expand sublist checkbox - - # # click on 'vm_resource_pool1' vm resource pool link: - # @pool_link="//ul[@id='nav_tree']/li/ul/li/div" - # @browser.wait_for_condition( - # "selenium.isElementPresent(""+ @pool_link +"")", - # 10000) - # @browser.click @pool_link - # @browser.wait_for_condition( - # "selenium.isElementPresent("//li[@id='nav_vmpool']/a")", - # 10000) - # # click on virtual machines tab - # @browser.click "//li[@id='nav_vmpool']/a" - # @browser.wait_for_condition( - # "selenium.isElementPresent("//div[@id='toolbar_nav']/ul/li[1]/a")", - # 10000) - # # click on 'add virtual machine' - # @browser.click "//div[@id='toolbar_nav']/ul/li[1]/a" - - # # retrieve current # of vms - # num_vms = @browser.get_xpath_count "//table[@id='vms_grid']/tbody/tr" - - # # fill in required fields - # @browser.wait_for_condition( - # "selenium.isElementPresent("//input[@id='vm_description']")", - # 10000) - # @browser.type("//input[@id='vm_description']", "zzz-selenium-test-vm") - # @browser.type("//input[@id='vm_num_vcpus_allocated']", "1") - # @browser.type("//input[@id='vm_memory_allocated_in_mb']", "256") - # # select 1st storage pool - # #@browser.click("//table[@id='storage_volumes_grid']/tbody/tr/td/div/input") - # @browser.wait_for_condition( - # "selenium.isElementPresent("//form[@id='vm_form']/div[2]/div[2]/div[2]/a")", - # 10000) - # # click the button - # @browser.click "//form[@id='vm_form']/div[2]/div[2]/div[2]/a" - - # @browser.wait_for_condition( - # "selenium.isElementPresent("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]")", - # 20000) - # # verify title of newly created vm - # assert_equal("zzz-selenium-test-vm", - # @browser.get_text("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[2]/div")) - - # # start it, click checkbox, 'start vm', confirmation button; reload tab, check result - # @browser.click "//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[1]/div/input" - # @browser.click "//div[@id='toolbar_nav']/ul/li[2]/ul/li[1]" - # @browser.wait_for_condition( - # "selenium.isElementPresent("//div[@id='vm_action_results']/div[3]/div/div[2]/a")", - # 10000) - # @browser.click "//div[@id='vm_action_results']/div[3]/div/div[2]/a" - # sleep 5 # give vm time to start - # @browser.click @pool_link - # @browser.wait_for_condition( - # "selenium.isElementPresent("//li[@id='nav_vmpool']/a")", - # 10000) - # # click on virtual machines tab - # @browser.click "//li[@id='nav_vmpool']/a" - # @browser.wait_for_condition( - # "selenium.isElementPresent("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[7]/div") && " + - # "selenium.getText("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[7]/div") == "running"", - # 20000) - # #assert_equal("running", - # #@browser.get_text("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[7]/div")) - - # # stop / destroy vm - # @browser.click "//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[1]/div/input" - # @browser.click "//div[@id='toolbar_nav']/ul/li[2]/ul/li[2]" - # @browser.wait_for_condition( - # "selenium.isElementPresent("//div[@id='vm_action_results']/div[3]/div/div[2]/a")", - # 10000) - # @browser.click "//div[@id='vm_action_results']/div[3]/div/div[2]/a" - # sleep 5 # give vm time to stop - # @browser.click @pool_link - # @browser.wait_for_condition( - # "selenium.isElementPresent("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[7]/div") && " + - # "selenium.getText("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[7]/div") == "stopped"", - # 20000) - # #assert_equal("stopped", - # #@browser.get_text("//table[@id='vms_grid']/tbody/tr[" + (num_vms.to_i + 1).to_s + "]/td[7]/div")) - - #end - - end - -end
Signed-off-by: Chris Lalancette clalance@redhat.com --- AUTHORS | 2 +- src/spec/fixtures/packagegroups.json | 2 +- src/spec/fixtures/packages.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS index a8516c8..8f7cc64 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ - deltacloud-portal Authors + deltacloud-aggregator Authors =========================
The primary maintainers and people with commit access rights: diff --git a/src/spec/fixtures/packagegroups.json b/src/spec/fixtures/packagegroups.json index 357b59e..d915ac4 100644 --- a/src/spec/fixtures/packagegroups.json +++ b/src/spec/fixtures/packagegroups.json @@ -2,7 +2,7 @@ "conditional_package_names" : { }, "default" : true, "default_package_names" : [ "libdeltacloud", - "deltacloud-portal" + "deltacloud-aggregator" ], "description" : "Deltacloud description", "display_order" : 1024, diff --git a/src/spec/fixtures/packages.json b/src/spec/fixtures/packages.json index aff7484..01b3dc9 100644 --- a/src/spec/fixtures/packages.json +++ b/src/spec/fixtures/packages.json @@ -20,12 +20,12 @@ "_ns" : "packages", "arch" : "src", "checksum" : { "sha256" : "ae415673a3cb07b72d4fe33d9da2a69b0ad1c1e274bd3f04a41f863f17d39035" }, - "description" : "The Portal for deltacloud.", - "download_url" : "http://localhost//pub/deltacloud/deltacloud-portal-0.0.1-1.fc11.src.rpm", + "description" : "The Aggregator for deltacloud.", + "download_url" : "http://localhost//pub/deltacloud/deltacloud-aggregator-0.0.1-1.fc11.src.rpm", "epoch" : "0", - "filename" : "deltacloud-portal-0.0.1-1.fc11.src.rpm", + "filename" : "deltacloud-aggregator-0.0.1-1.fc11.src.rpm", "id" : "e7f2bd45-4afa-412a-98f8-004b40748b82", - "name" : "deltacloud-portal", + "name" : "deltacloud-aggregator", "provides" : [ ], "release" : "1.fc11", "requires" : [ "ruby-devel",
On Fri, 2011-01-14 at 15:00 -0500, Chris Lalancette wrote:
As mother always said, late is better than never. Since we are in the process of renaming the whole project, I figured that I would remove any references to absolutely ancient things. This series does that.
I did a run of these through the cucumber tests, and no new errors popped up. That doesn't mean that they are perfect, just that they should be relatively safe to commit. Please review and ACK.
deltacloud-devel mailing list deltacloud-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/deltacloud-devel
ACK to series, this doesn't cause any tests to fail (though it did make me see 2 that fail, but they are unrelated).
deltacloud-devel@lists.fedorahosted.org
-
Chris Lalancette -
Jason Guiditta