gmane.comp.lib.deltacloud.devel
http://blog.gmane.org/gmane.comp.lib.deltacloud.devel
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
Model X
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3757
<pre>In case you didn't hear, Tesla revealed their upcoming model X
yesterday, looks pretty nice:
http://www.teslamotors.com/modelx
-j
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Jason Guiditta2012-02-10T20:00:01JIRA DTACLOUD-127 - Valid Credentials Errors
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3756
<pre>Gents
Unfortunately you've been away today.
I've some issues with the aforementioned JIRA. The commit sent to me by
fvollero:
https://git-wip-us.apache.org/repos/asf?p=deltacloud.git;a=commit;h=2fbc147f9e3041b19f2c89e4d222ba2185486405
does not solve the JIRA. It only addresses the issue in EC2 Driver.
This would suffice for the conductor BZ but this really should be fixed
across the board.
Another fundamental issue is that the Deltacloud Client (ruby) does not
properly support HTTP Errors.
We at least need the valid_credentials method to properly handle any
HTTP Errors returned by the server. But I think its worth noting though
that properly handling errors really needs to implemented across the
client as a whole.
I've created a patch for conductor addressing the original BZ:
https://bugzilla.redhat.com/show_bug.cgi?id=753880 this will fix the BZ
once the changes are in the client.
I've added some comments to the JIRA explaining the issue with the
commit and a suggestion on how to handle http errors.
Could you guys let me know how this goes.
Thanks gents
Martyn
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Martyn Taylor2012-02-06T17:54:19Deltacloud Android App
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3755
<pre>Gentlemen.
After speaking to Michal and Justin. It sounds like Deltacloud might be
interested in importing the Android App I build for DC into the DC project.
You guys are free to take it.
It's here: https://github.com/mtaylor/MobileCloudController
Just give me a few days to author the code before you pull it.
Regards
Martyn
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Martyn Taylor2012-02-02T14:46:18Android Deltacloud App
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3754
<pre>Hi people,
I wrote a native Deltacloud Android App a while back but didn't get
round to sending it out, I thought now is as good of a time as any to
get it out there.
You can download the app from here:
http://martyntaylor.fedorapeople.org/dcdroid.apk
Please check it out, there are one or two minor issues atm. But all in
all it does the job. Please drop me aline if people have
suggestions/bugs etc... I will get round to setting up a Redmine/BZ
project soon.
One Note: The app uses the older style "one DC Instance per provider"
format (Since I wrote the Android client way before the newer format was
introduced).
Also, I've only tested this on a handful of displays though I written it
to be compatible with most (though it might not look so great).
Have fun
Martyn
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Martyn Taylor2011-11-30T13:01:53Can I run deltacloudd server in a differentphysical machine?
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3753
<pre>Hello all!
I have confusion about deltacloudd deployment. I have three cloud
deployments. Can I access all of them via single installation of
deltacloudd?
For example: I have OpenNebula cloud controller in server A, OpenStack
cloud controller in server B and Eucalyptus in server C. Can I install
deltacloud server in server D and install & run deltacloudc client
from server E. If yes, should I install deltacloudd server in each
cloud controller server (A, B, C) or is it possible to install single
deltacloudd server and run it for all three clouds (with different
drivers)?
Kind regards,
Nodir.
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Nodir Kodirov2011-11-07T02:42:04Re: aeolus-configure -p rhevm is not working in latest rpms from testing
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3752
<pre>
Richard,
I've assigned the BZ to you for triage. It looks like it might be a
yaml issue, but ???
Thanks for the heads up,
Mike
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Mike Orazi2011-11-03T15:35:01aeolus-configure -p rhevm is not working inlatest rpms from testing
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3751
<pre>https://bugzilla.redhat.com/show_bug.cgi?id=751113
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>wes hayutin2011-11-03T15:00:01Conductor Image Management API
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3750
<pre>In order to lock down components, it has been proposed that we offer an API on top of conductor that exposes image management functionality (pretty much what is currently offered by aeolus-image command line). This would mean that any client wanting to manipulate objects would talk directly with conductor and go through conductor authentication etc... This gives a central point of contact for image related tasks via the conductor API and also hides the bits and pieces going on in the background, i.e. iwhd and imagefactory, that really a user is not concerned about.
To recap the state of aeolus-image:
At the moment the rubygem aeolus-image that is used by conductor serves 2 purposes: firstly, it acts as a client lib to iwhd (which conductor uses in the new catalogue functionality); secondly it holds all the logic for the CLI.
So as it stands, we need to:
1) Rip out the object model (iwhd client part) of aeolus-image and place it in a new rubygem; this will serve solely as a client lib rubygem for iwhd and imagefactory called "aeolus-image-resource" (or another better name)
2) Add imagefactory interaction to the iwhd/imagefactory client lib rubygem - aeolus-image-resource.
This will interface with the new ImageFactory REST API, and will be used to create builds and push images etc... using the same object model that is currently in place inside aeolus-image, which is used for interfacing with iwhd. This will also replace code that talks to the imagefactorys qmf interface which is in the aeolus-image CLI code.
3) Add to the current REST API in conductor, to add in the extra resources we need:
images
builds
target_images
provider_images
This probably just consists of wrapping the aeolus-image-resource calls in the relevant controllers.
4) Update the aeolus-image command libraries to talk directly to conductor API, hopefully using ActiceResource.
5) Add certificate authentication to aeolus-image.
6) Add aeolus-image configuration in conductor, rather than in ~/.aeolus-image, (we probably want to use configure to set this up)
</pre>Martyn Taylor2011-09-14T17:10:43Re: Condor Cloud Driver
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3749
<pre>[ CC'd incubator list - DOH! ]
On Mon, Jul 11, 2011 at 03:41:06PM -0700, David Lutterkort wrote:
OK, I will start on these today. Thanks!
Ian
</pre>Ian Main2011-07-13T17:03:14Re: Condor Cloud Driver
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3748
<pre>
Very cool.
I completely agree that this should be merged into deltacloud proper.
Some notes from looking at the code:
* Remove 'Copyright ...' from all source files (have a look at the
other drives for proper headers)
* There's some trailing whitespace trouble
* condor_driver.rb:58: Don't set CONDOR_MAPPER_DIR to something
that's relative to File::dirname(__FILE__) - instead write
to /var/tmp (we really ought to claim /var/lib/deltacloud for
things like this)
* condor_driver.rb (create_instance): I find encoding
config_server IP and uuid very ugly. Could the config_server IP
become part of the config of condor-cloud ? Could we use the
API_PROVIDER for this ? The uuid could be passed in as the
user_name of the instance. The comment explaining what's
happening with user_data also doesn't match the code
* condor_driver.rb (valid_credentials?): something a little less
hardcoded would be nice ;)
* condor_driver.rb (remove_key): do we really want to ignore _all_
exceptions and just log a warning ? If that is really intended,
it deserves a comment
* client/base_models.rb: I assume this will be removed, and the
code will use the standard models from lib/deltacloud/models/
* there don't seem to be any tests for the actual driver - we will
need to figure out a plan for adding them
David
</pre>David Lutterkort2011-07-11T22:41:06Re: Condor Cloud Driver
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3747
<pre>
Well one thing at a time I think. I think getting this into deltacloud
is the next logical step since it is very tightly coupled to deltacloud.
Getting it into the codebase will allow it to be more easily installed.
Once that happens I'll see about spreading the word a bit more.
Ian
</pre>Ian Main2011-07-11T20:17:18Re: Condor Cloud Driver
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3746
<pre>
Thank you for your work on this, this looks interesting. The Condor
grid community will likely find this interesting as a way to enable
private cloud services on existing compute grids - but you should let
them know by sending something to condor-users and/or condor-devel.
What's the status on committing the aeolus-condor patches upstream? I
think you'd need to provide pointers in DEVELOPERS.txt on how to pull
from Condor's upstream instead of pulling from aeolus's yum repo before
you send that community an announcement.
Along the same vein, this seems like it might be a good candidate for a
contributed module to Condor:
https://condor-wiki.cs.wisc.edu/index.cgi/wiki?p=ContribModules
Has that been considered? Doing so would increase exposure within the
Condor community, who would presumeably be the primary user of this project.
</pre>Lans Carstensen2011-07-10T01:37:52Condor Cloud Driver
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3745
<pre>
Howdy Folks,
So Michal and I have been working on a Condor based cloud using
deltacloud as the front end API. The code base can be found here:
http://git.fedorahosted.org/git/?p=condor-cloud.git
There are still some cleanups and testing to be done but I would like to
get this into Fedora 16 as a feature. I am hoping you guys can take a
look and let me know if this is acceptable and what needs to be fixed to
make it so.
There are actually two parts to this project, one is the deltacloud
driver, which can be found under the deltacloud-condor-driver directory.
The rest deals with condor configuration and scripts.
I'm thinking I may name this project 'falcondor' as it seems unused and
more interesting :).
Thanks!
Ian
</pre>Ian Main2011-07-08T20:06:44CLI - Formal XML Definition
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3744
<pre>Providing a formal deffinition of the XML for an API, makes using the API, in particular creating and maintaining client applications that utilise the API much simpler, and far clearer for a developer.
There are an array of tools that provide class generation, and automatic marshalling and unmarshalling of objects, generated straight from a formally defined XML Document, for ruby, this project looks to offer these functions: https://github.com/rubyjedi/soap4r .
In my experience writing Java and Android clients, I have found that the time spent creating an XSD or other formal XML definition, repays 10 fold in development time, and also makes keeping clients up to date alot simpler. For DC Client I ended up writing my own: https://github.com/mtaylor/deltacloud-tools/blob/master/DeltaCloudClient/docs/deltacloud.xsd
But, I think it would be better as a whole to adopt this approach from the start. It would not only benefit the creation of the CLI but also anyone else who needs to utilise these APIs
Martyn
</pre>Martyn Taylor2011-06-07T10:24:44Re: e2e failing w/rhevm 2.2
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3743
<pre>Chris,
I have confirmed that entering an Instance name of > 50 characters does indeed cause a: 500 Internal Server Error. So I am going to assume this is the issue.
This needs to be addressed both in Condor and in the RHEVM Driver. The Driver should do any validation checks before sending the API request to the BackEnd provider, and thus return an Error message with a more helpful message.
Cheers
Martyn
----- Original Message -----
From: "Chris Lalancette" <clalance-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
To: "Martyn Taylor" <mtaylor-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Cc: "Chris Lalancette" <clalance-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>, "Michael Orazi" <morazi-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Sent: Monday, 23 May, 2011 1:17:04 PM
Subject: Re: e2e failing w/rhevm 2.2
On 05/23/11 - 07:38:12AM, Martyn Taylor wrote:
It is hard to say if this is the exact problem.
The problem I still know about is that condor generates instance names like:
Condor_localhost.localdomain_job#12.0 (or something like that)
Unfortunately, RHEV-M VM names can only be 50 characters, and the above is
always longer than 50 characters. Whether that causes the above error is
unclear to me, but until we fix that, RHEV-M is not going to work.
</pre>Martyn Taylor2011-05-23T13:35:56Re: Post Installation: New HWP Model
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3739
<pre>
That is a good sign that the form we use to start an instance may not be
as user friendly as we would like it to be. Any chance we can add some
javascript validation on that form.
</pre>wes hayutin2011-03-14T17:00:29Post Installation: New HWP Model
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3738
<pre>Gentlemen,
I've noticed a lot of chat around not being able to start instances.
For any of you who are not aware, you now *MUST create a HWP post installation (that matches some back end provider HWP) in order to start an instance.
Documentation for this is found here: http://www.aeolusproject.org/conductor-use.html
</pre>Martyn Taylor2011-03-14T16:16:17Re: request for enhancement - injection of fileson instance creation
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3737
<pre>
What can i do with new vm's in a cloud without discover them and get more configuration to the vm.
If we install a new system from a template we need to do always some steps like install something else to bring up services or put puppet there to bring up services later.
With one injection like firstboot or postcommand, everything is possible then.
Put, for example "firstboot" has always a dependencies to a guest operating system, in which style firstboot is running.
On the other hand, the most cloud providers have the "same/a" range of supported operating systems.
Thomas
</pre>Thomas von Steiger2011-02-17T23:51:54Timeout support in deltacloud-client
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3736
<pre>Hi all,
I want to propose adding timeout capabilities to deltacloud-client. I'm
seeing problems in Aeolus Conductor where a non-responding provider will
hang indefinitely until Apache closes the connection. I think the fix is
to allow deltacloud-client to raise an exception on timeouts instead of
trying to do so each place Conductor calls out to a provider. (A good
demonstration of this problem is to attempt to add a provider like
'http://1.1.1.1:1234/api'.)
rest-client has support for two types of timeout: an 'open_timeout' when
opening a connection, and a normal 'timeout' for an active connection:
http://rdoc.info/github/adamwiggins/rest-client/master/RestClient/Resource
I will send a quick patch that adds these two timeouts to the 'request'
method. I don't know the deltacloud-client code that well, so I'd
appreciate it if someone could let me know if there is a better way of
accomplishing this.
Best,
Matt
</pre>Matt Wagner2011-02-17T19:32:49Re: Task #197 - Remove any logic forcing one provider only
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3735
<pre>
Please send new patches to aeolus-devel-TuqUDEhatI4ANWPb/1PvSmm0pvjS0E/A< at >public.gmane.org
Thanks,
</pre>Chris Lalancette2011-01-27T15:50:51[PATCH aeolus 5/6] Cucumber tests for Provideraccounts
http://permalink.gmane.org/gmane.comp.lib.deltacloud.devel/3734
<pre>From: Jozef Zigmund <jzigmund-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
I fixed all Rspecs and Cucumbers for provider_account model. Also I fixed some forgotten renamings.
It was needed change some attributes in migrations.
---
.../admin/provider_accounts_controller.rb | 53 ++++++------
.../controllers/provider_accounts_controller.rb | 62 +++++++-------
src/app/models/image.rb | 2 +-
src/app/models/provider.rb | 11 ++-
src/app/models/provider_account.rb | 8 +-
src/app/views/admin/provider_accounts/_mock.haml | 16 ++++
.../provider_accounts/_provider_selection.haml | 2 +-
src/app/views/admin/provider_accounts/new.haml | 3 +-
src/app/views/admin/providers/_form.haml | 2 +-
src/app/views/builds/new.haml | 6 +-
src/db/development_structure.sql | 89 ++++++++++++++++++++
...824_rename_cloud_account_to_provider_account.rb | 3 +-
...737_rename_cloud_accout_id_for_instance_keys.rb | 9 ++
...123410_rename_cloud_account_id_for_instances.rb | 9 ++
..._families_to_provider_accounts_pool_families.rb | 11 +++
...l_properties_of_columns_in_provider_accounts.rb | 13 +++
src/features/provider.feature | 7 +-
src/features/provider_account.feature | 20 ++---
.../step_definitions/provider_account_steps.rb | 2 +-
src/features/step_definitions/provider_steps.rb | 6 +-
src/features/step_definitions/template_steps.rb | 8 +-
src/features/template.feature | 14 ++--
src/spec/controllers/builds_controller_spec.rb | 6 +-
.../provider_accounts_controller_spec.rb | 32 ++++----
src/spec/factories/instance.rb | 4 +-
src/spec/factories/provider.rb | 8 +-
src/spec/factories/provider_account.rb | 4 +-
src/spec/models/image_spec.rb | 6 +-
src/spec/models/instance_observer_spec.rb | 20 ++--
src/spec/models/instance_spec.rb | 14 +--
src/spec/models/pool_family_spec.rb | 8 +-
src/spec/models/provider_account_spec.rb | 46 +++++-----
src/spec/models/provider_spec.rb | 2 +-
src/spec/models/quota_spec.rb | 48 +++++-----
.../services/data_service_active_record_spec.rb | 58 +++++++-------
35 files changed, 382 insertions(+), 230 deletions(-)
create mode 100644 src/app/views/admin/provider_accounts/_mock.haml
create mode 100644 src/db/development_structure.sql
create mode 100644 src/db/migrate/20110125122737_rename_cloud_accout_id_for_instance_keys.rb
create mode 100644 src/db/migrate/20110125123410_rename_cloud_account_id_for_instances.rb
create mode 100644 src/db/migrate/20110125154113_rename_cloud_accounts_pool_families_to_provider_accounts_pool_families.rb
create mode 100644 src/db/migrate/20110126161751_change_null_properties_of_columns_in_provider_accounts.rb
diff --git a/src/app/controllers/admin/provider_accounts_controller.rb b/src/app/controllers/admin/provider_accounts_controller.rb
index 41319e9..44d3fc6 100644
--- a/src/app/controllers/admin/provider_accounts_controller.rb
+++ b/src/app/controllers/admin/provider_accounts_controller.rb
< at >< at > -45,65 +45,66 < at >< at > class Admin::ProviderAccountsController < ApplicationController
end
def create
- < at >provider = Provider.find(params[:select_provider])
+ < at >selected_provider = < at >provider = Provider.find(params[:select_provider])
require_privilege(Privilege::CREATE, ProviderAccount, < at >provider)
< at >providers = Provider.all
- < at >cloud_account = ProviderAccount.new(params[:provider_account])
- < at >cloud_account.provider = < at >provider
- < at >cloud_account.quota = < at >quota = Quota.new
+ < at >provider_account = ProviderAccount.new(params[:provider_account])
+ < at >provider_account.provider = < at >provider
+ < at >provider_account.quota = < at >quota = Quota.new
if params.delete :test_account
- test_account(< at >cloud_account)
+ test_account(< at >provider_account)
render :action => 'new' and return
end
limit = params[:quota][:maximum_running_instances] if params[:quota]
- < at >cloud_account.quota.set_maximum_running_instances(limit)
+ < at >provider_account.quota.set_maximum_running_instances(limit)
- if < at >cloud_account.invalid?
- if not < at >cloud_account.valid_credentials?
+ if < at >provider_account.invalid?
+ if not < at >provider_account.valid_credentials?
flash.now[:error] = "The entered credential information is incorrect"
- elsif < at >cloud_account.errors.on(:username)
- flash.now[:error] = "The access key '#{params[:cloud_account][:username]}' has already been taken."
+ elsif < at >provider_account.errors.on(:username)
+ flash.now[:error] = "The access key '#{params[:provider_account][:username]}' has already been taken."
else
flash.now[:error] = "You must fill in all the required fields"
end
render :action => 'new' and return
end
- < at >cloud_account.pool_families << PoolFamily.default
- < at >cloud_account.save!
- if < at >cloud_account.populate_realms
+ < at >provider_account.pool_families << PoolFamily.default
+ < at >provider_account.save!
+ if < at >provider_account.populate_realms
flash[:notice] = "Provider account added."
end
- redirect_to admin_provider_account_path(< at >cloud_account)
+ redirect_to admin_provider_account_path(< at >provider_account)
kick_condor
end
def edit
- < at >cloud_account = ProviderAccount.find(params[:id])
- < at >quota = < at >cloud_account.quota
- < at >provider = < at >cloud_account.provider
- require_privilege(Privilege::MODIFY,< at >cloud_account)
+ < at >provider_account = ProviderAccount.find(params[:id])
+ < at >quota = < at >provider_account.quota
+ < at >provider = < at >provider_account.provider
+ require_privilege(Privilege::MODIFY,< at >provider_account)
end
def update
- < at >cloud_account = ProviderAccount.find(params[:id])
- < at >provider = < at >cloud_account.provider
- require_privilege(Privilege::MODIFY,< at >cloud_account)
- < at >quota = < at >cloud_account.quota
+ < at >provider_account = ProviderAccount.find(params[:id])
+ < at >provider = < at >provider_account.provider
+ require_privilege(Privilege::ACCOUNT_MODIFY, < at >provider)
+ require_privilege(Privilege::MODIFY,< at >provider_account)
+ < at >quota = < at >provider_account.quota
if params.delete :test_account
- test_account(< at >cloud_account)
+ test_account(< at >provider_account)
render :action => 'edit' and return
end
limit = params[:quota][:maximum_running_instances] if params[:quota]
- < at >cloud_account.quota.set_maximum_running_instances(limit)
- if < at >cloud_account.update_attributes(params[:cloud_account])
+ < at >provider_account.quota.set_maximum_running_instances(limit)
+ if < at >provider_account.update_attributes(params[:provider_account])
flash[:notice] = "Cloud Account updated!"
- redirect_to admin_provider_account_path(< at >cloud_account)
+ redirect_to admin_provider_account_path(< at >provider_account)
else
render :action => :edit
end
diff --git a/src/app/controllers/provider_accounts_controller.rb b/src/app/controllers/provider_accounts_controller.rb
index a902150..99ca85d 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
< at >< at > -36,7 +36,7 < at >< at > class ProviderAccountsController < ApplicationController
def new
< at >provider = Provider.find(params[:provider_id])
- < at >cloud_account = ProviderAccount.new
+ < at >provider_account = ProviderAccount.new
< at >quota = Quota.new
require_privilege(Privilege::CREATE, CloudAccount, < at >provider)
end
< at >< at > -44,32 +44,32 < at >< at > class ProviderAccountsController < ApplicationController
def create
< at >provider = Provider.find(params[:provider_id])
require_privilege(Privilege::CREATE, ProviderAccount, < at >provider)
- < at >cloud_account = ProviderAccount.new(params[:cloud_account])
- < at >cloud_account.provider = < at >provider
- < at >cloud_account.quota = < at >quota = Quota.new
+ < at >provider_account = ProviderAccount.new(params[:provider_account])
+ < at >provider_account.provider = < at >provider
+ < at >provider_account.quota = < at >quota = Quota.new
if params[:test_account]
- test_account(< at >cloud_account)
+ test_account(< at >provider_account)
render :action => 'new' and return
end
limit = params[:quota][:maximum_running_instances] if params[:quota]
- < at >cloud_account.quota.set_maximum_running_instances(limit)
+ < at >provider_account.quota.set_maximum_running_instances(limit)
- if < at >cloud_account.invalid?
- if not < at >cloud_account.valid_credentials?
+ if < at >provider_account.invalid?
+ if not < at >provider_account.valid_credentials?
flash.now[:error] = "The entered credential information is incorrect"
- elsif < at >cloud_account.errors.on(:username)
- flash.now[:error] = "The access key '#{params[:cloud_account][:username]}' has already been taken."
+ elsif < at >provider_account.errors.on(:username)
+ flash.now[:error] = "The access key '#{params[:provider_account][:username]}' has already been taken."
else
flash.now[:error] = "You must fill in all the required fields"
end
render :action => 'new' and return
end
- < at >cloud_account.pool_families << PoolFamily.default
- < at >cloud_account.save!
- if < at >cloud_account.populate_realms
+ < at >provider_account.pool_families << PoolFamily.default
+ < at >provider_account.save!
+ if < at >provider_account.populate_realms
flash[:notice] = "Provider account added."
end
redirect_to provider_accounts_path(< at >provider)
< at >< at > -77,10 +77,10 < at >< at > class ProviderAccountsController < ApplicationController
end
def edit
- < at >cloud_account = ProviderAccount.find(params[:id])
- < at >quota = < at >cloud_account.quota
- < at >provider = < at >cloud_account.provider
- require_privilege(Privilege::MODIFY, < at >cloud_account)
+ < at >provider_account = ProviderAccount.find(params[:id])
+ < at >quota = < at >provider_account.quota
+ < at >provider = < at >provider_account.provider
+ require_privilege(Privilege::MODIFY, < at >provider_account)
end
def update_accounts
< at >< at > -89,15 +89,15 < at >< at > class ProviderAccountsController < ApplicationController
< at >providers = Provider.list_for_user(< at >current_user, Privilege::VIEW)
success = true
- < at >provider.provider_accounts.each do |cloud_account|
- attributes = params[:cloud_accounts][cloud_account.id.to_s]
+ < at >provider.provider_accounts.each do |provider_account|
+ attributes = params[:provider_accounts][provider_account.id.to_s]
password = attributes[:password]
# blank password means the user didn't change it -- don't update it then
if password.blank?
attributes.delete :password
end
- cloud_account.quota.maximum_running_instances = quota_from_string(params[:quota][cloud_account.id.to_s][:maximum_running_instances])
+ provider_account.quota.maximum_running_instances = quota_from_string(params[:quota][provider_account.id.to_s][:maximum_running_instances])
private_cert = attributes[:x509_cert_priv_file]
unless private_cert.blank?
< at >< at > -112,8 +112,8 < at >< at > class ProviderAccountsController < ApplicationController
attributes.delete :x509_cert_pub_file
begin
- cloud_account.update_attributes!(attributes)
- cloud_account.quota.save!
+ provider_account.update_attributes!(attributes)
+ provider_account.quota.save!
rescue
success = false
end
< at >< at > -128,14 +128,14 < at >< at > class ProviderAccountsController < ApplicationController
end
def update
- < at >cloud_account = ProviderAccount.find(params[:id])
- < at >provider = < at >cloud_account.provider
- require_privilege(Privilege::MODIFY, < at >cloud_account)
- < at >quota = < at >cloud_account.quota
+ < at >provider_account = ProviderAccount.find(params[:id])
+ < at >provider = < at >provider_account.provider
+ require_privilege(Privilege::MODIFY, < at >provider_account)
+ < at >quota = < at >provider_account.quota
limit = params[:quota][:maximum_running_instances] if params[:quota]
- < at >cloud_account.quota.set_maximum_running_instances(limit)
- if < at >cloud_account.update_attributes(params[:cloud_account])
+ < at >provider_account.quota.set_maximum_running_instances(limit)
+ if < at >provider_account.update_attributes(params[:provider_account])
flash[:notice] = "Cloud Account updated!"
redirect_to provider_accounts_path(< at >provider)
else
< at >< at > -144,10 +144,10 < at >< at > class ProviderAccountsController < ApplicationController
end
def key
- < at >cloud_account = ProviderAccount.find(params[:id])
+ < at >provider_account = ProviderAccount.find(params[:id])
require_privilege(Privilege::MODIFY,< at >provider_account)
- unless < at >cloud_account.instance_key.nil?
- render :text => < at >cloud_account.instance_key.pem
+ unless < at >provider_account.instance_key.nil?
+ render :text => < at >provider_account.instance_key.pem
end
end
diff --git a/src/app/models/image.rb b/src/app/models/image.rb
index 0852016..5dd0bbb 100644
--- a/src/app/models/image.rb
+++ b/src/app/models/image.rb
< at >< at > -52,7 +52,7 < at >< at > class Image < ActiveRecord::Base
INACTIVE_STATES = [STATE_COMPLETE, STATE_FAILED, STATE_CANCELED]
def self.available_targets
- return YAML.load_file("#{RAILS_ROOT}/config/image_descriptor_targets.yml")
+ Provider::PROVIDERS.invert
end
def generate_uuid
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index 8539391..37d7026 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
< at >< at > -29,7 +29,16 < at >< at > class Provider < ActiveRecord::Base
require 'util/deltacloud'
include PermissionedObject
- PROVIDERS = { 0 => "mock", 1 => "AWS", 2 => "GoGrid" , 3 => "Rackspace", 4 => "RHEVM", 5 => "OpenNebula" }
+ MOCK = 0
+ AWS = 1
+ GOGRID = 2
+ RACKSPACE = 3
+ RHEVM = 4
+ OPENNEBULA = 5
+
+ PROVIDERS = { MOCK => "mock", AWS => "AWS",
+ GOGRID => "GoGrid", RACKSPACE => "Rackspace", RHEVM => "RHEVM",
+ OPENNEBULA => "OpenNebula" }
has_many :provider_accounts, :dependent => :destroy
has_many :hardware_profiles, :dependent => :destroy
diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb
index 6ec1311..38958fd 100644
--- a/src/app/models/provider_account.rb
+++ b/src/app/models/provider_account.rb
< at >< at > -50,15 +50,17 < at >< at > class ProviderAccount < ActiveRecord::Base
validates_presence_of :username
validates_uniqueness_of :username, :scope => :provider_id
validates_presence_of :password
- validates_presence_of :account_number
+ validates_presence_of :account_number,:if => Proc.new{ |account| account.provider.cloud_type == Provider::AWS}
validate :validate_presence_of_x509_certs
validate :validate_credentials
# We're using this instead of <tt>validates_presence_of</tt> helper because
# we want to show errors on different attributes ending with '_file'.
def validate_presence_of_x509_certs
- errors.add(:x509_cert_pub_file, "can't be blank") if x509_cert_pub.blank?
- errors.add(:x509_cert_priv_file, "can't be blank") if x509_cert_priv.blank?
+ if self.provider.cloud_type == Provider::AWS
+ errors.add(:x509_cert_pub_file, "can't be blank") if x509_cert_pub.blank?
+ errors.add(:x509_cert_priv_file, "can't be blank") if x509_cert_priv.blank?
+ end
end
def validate_credentials
diff --git a/src/app/views/admin/provider_accounts/_mock.haml b/src/app/views/admin/provider_accounts/_mock.haml
new file mode 100644
index 0000000..65b5998
--- /dev/null
+++ b/src/app/views/admin/provider_accounts/_mock.haml
< at >< at > -0,0 +1,16 < at >< at >
+%fieldset.clear
+ = label_tag "Account name:"
+ = text_field :provider_account, :label
+%fieldset.clear
+ = label_tag :username, "API Key:"
+ = text_field :provider_account,:username
+%fieldset.clear
+ = label_tag :password, "Secret:"
+ = password_field :provider_account,:password
+ = label_tag "Quota"
+ = text_field :quota, :maximum_running_instances, :title => t('cloud_accounts.form.quota_instances'), :value => < at >quota.maximum_running_instances || "unlimited", :id => "quota_instances", :class => "grid_3 omega"
+.grid_3.omega
+ (
+ %button.linkbutton.nospace{ :type => 'submit', :value => t('cloud_accounts.form.test_account'), :name => 'test_account', :id => 'test_account' }<>
+ = t('cloud_accounts.form.test_account')
+ )
diff --git a/src/app/views/admin/provider_accounts/_provider_selection.haml b/src/app/views/admin/provider_accounts/_provider_selection.haml
index 334f314..f767896 100644
--- a/src/app/views/admin/provider_accounts/_provider_selection.haml
+++ b/src/app/views/admin/provider_accounts/_provider_selection.haml
< at >< at > -1,5 +1,5 < at >< at >
%fieldset#cloud_type.clear
- = select_tag ("select_provider", options_for_select(< at >providers.map{ |p| [p.name, p.id] }, :selected => < at >selected_provider.id))
+ = select_tag("select_provider", options_for_select(< at >providers.map{ |p| [p.name, p.id] }, :selected => < at >selected_provider.id))
= restful_submit_tag "Choose", 'set_selected_provider',set_selected_provider_admin_provider_accounts_path, 'GET', :class => 'button'
= label_tag "Cloud type: "
= t(Provider::PROVIDERS[< at >selected_provider.cloud_type])
diff --git a/src/app/views/admin/provider_accounts/new.haml b/src/app/views/admin/provider_accounts/new.haml
index 4b45ac1..ef369db 100644
--- a/src/app/views/admin/provider_accounts/new.haml
+++ b/src/app/views/admin/provider_accounts/new.haml
< at >< at > -1,10 +1,11 < at >< at >
#details.grid_13
+ = error_messages_for :provider_account
%h2
= t('cloud_accounts.new.new_provider_account')
%label{ :for => :provider_id }
Provider
%fieldset.clear
- - form_tag (admin_provider_accounts_path, :multipart => true) do
+ - form_tag(admin_provider_accounts_path, :multipart => true) do
= render :partial => 'provider_selection'
%section
%p.requirement
diff --git a/src/app/views/admin/providers/_form.haml b/src/app/views/admin/providers/_form.haml
index c980c0a..d262c53 100644
--- a/src/app/views/admin/providers/_form.haml
+++ b/src/app/views/admin/providers/_form.haml
< at >< at > -13,7 +13,7 < at >< at >
)
%fieldset.clear
= form.label :cloud_type
- = form.select (:cloud_type, Provider::PROVIDERS.collect {|id, cloud_type| [t(cloud_type),id] }, :prompt => "Select type of provider")
+ = form.select(:cloud_type, Provider::PROVIDERS.collect {|id, cloud_type| [t(cloud_type),id] }, :prompt => "Select type of provider")
%fieldset.clear
= form.submit "Save", :class => "submit formbutton"
diff --git a/src/app/views/builds/new.haml b/src/app/views/builds/new.haml
index 2cb159e..68f78ce 100644
--- a/src/app/views/builds/new.haml
+++ b/src/app/views/builds/new.haml
< at >< at > -46,10 +46,10 < at >< at >
%label Choose Provider Format:
%section.clearfix.gap
%ul.block
- - < at >all_targets.each do |target_id, target|
+ - < at >all_targets.each do |target, target_id|
%li
- = check_box_tag 'targets[]', target_id, false, :id => target_id
- = label_tag target_id, target['name']
+ = check_box_tag 'targets[]', target_id, false, :id => target
+ = label_tag target
= submit_tag "Submit to Build", :name => "build"
= submit_tag "Cancel", :name => "cancel"
diff --git a/src/db/development_structure.sql b/src/db/development_structure.sql
new file mode 100644
index 0000000..5f9b7d0
--- /dev/null
+++ b/src/db/development_structure.sql
< at >< at > -0,0 +1,89 < at >< at >
+CREATE TABLE "base_permission_objects" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "cloud_accounts_pool_families" ("cloud_account_id" integer NOT NULL, "pool_family_id" integer NOT NULL);
+CREATE TABLE "deployables" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "hardware_profile_map" ("aggregator_hardware_profile_id" integer, "provider_hardware_profile_id" integer);
+CREATE TABLE "hardware_profile_properties" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "kind" varchar(255) NOT NULL, "unit" varchar(255) NOT NULL, "value" varchar(255) NOT NULL, "range_first" varchar(255), "range_last" varchar(255), "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "hardware_profiles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "external_key" varchar(255) NOT NULL, "name" varchar(1024) NOT NULL, "memory_id" integer, "storage_id" integer, "cpu_id" integer, "architecture_id" integer, "provider_id" integer, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "images" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "uuid" varchar(255), "name" varchar(255) NOT NULL, "build_id" varchar(255), "uri" varchar(255), "status" varchar(255), "target" varchar(255), "template_id" integer, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "instance_events" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "instance_id" integer NOT NULL, "event_type" varchar(255) NOT NULL, "event_time" datetime, "status" varchar(255), "message" varchar(255), "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "instance_hwps" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "memory" varchar(255), "cpu" varchar(255), "architecture" varchar(255), "storage" varchar(255), "lock_version" integer DEFAULT 0);
+CREATE TABLE "instance_keys" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider_account_id" integer NOT NULL, "name" varchar(255) NOT NULL, "pem" text, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "instances" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "external_key" varchar(255), "name" varchar(1024) NOT NULL, "hardware_profile_id" integer NOT NULL, "template_id" integer NOT NULL, "realm_id" integer, "owner_id" integer, "pool_id" integer NOT NULL, "provider_account_id" integer, "instance_hwp_id" integer, "public_addresses" varchar(255), "private_addresses" varchar(255), "state" varchar(255), "condor_job_id" varchar(255), "last_error" text(255), "instance_key_id" integer, "lock_version" integer DEFAULT 0, "acc_pending_time" integer DEFAULT 0, "acc_running_time" integer DEFAULT 0, "acc_shutting_down_time" integer DEFAULT 0, "acc_stopped_time" integer DEFAULT 0, "time_last_pending" datetime, "time_last_running" datetime, "time_last_shutting_down" datetime, "time_la
st_stopped" datetime, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "metadata_objects" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "key" varchar(255) NOT NULL, "value" varchar(255) NOT NULL, "object_type" varchar(255), "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "permissions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "role_id" integer NOT NULL, "user_id" integer NOT NULL, "permission_object_id" integer, "permission_object_type" varchar(255), "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "pool_families" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "description" varchar(255), "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "pools" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "exported_as" varchar(255), "quota_id" integer, "pool_family_id" integer NOT NULL, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "privileges" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "privileges_roles" ("privilege_id" integer NOT NULL, "role_id" integer NOT NULL);
+CREATE TABLE "property_enum_entries" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "hardware_profile_property_id" integer NOT NULL, "value" varchar(255) NOT NULL, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "provider_accounts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "label" varchar(255) NOT NULL, "username" varchar(255) NOT NULL, "password" varchar(255) NOT NULL, "provider_id" integer NOT NULL, "quota_id" integer, "lock_version" integer DEFAULT 0, "account_number" varchar(255) NOT NULL, "x509_cert_priv" text NOT NULL, "x509_cert_pub" text NOT NULL, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "providers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "cloud_type" integer(255) NOT NULL, "url" varchar(255) NOT NULL, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "quotas" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "running_instances" integer DEFAULT 0, "total_instances" integer DEFAULT 0, "maximum_running_instances" integer, "maximum_total_instances" integer, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "realm_map" ("frontend_realm_id" integer, "backend_realm_id" integer);
+CREATE TABLE "realms" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "external_key" varchar(255) NOT NULL, "name" varchar(1024) NOT NULL, "provider_id" integer, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "replicated_images" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "image_id" integer NOT NULL, "provider_id" integer NOT NULL, "provider_image_key" varchar(255), "uploaded" boolean DEFAULT 'f', "registered" boolean DEFAULT 'f');
+CREATE TABLE "roles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "scope" varchar(255) NOT NULL, "lock_version" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
+CREATE TABLE "sessions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "session_id" varchar(255) NOT NULL, "data" text, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "tasks" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user" varchar(255), "type" varchar(255), "action" varchar(255), "state" varchar(255), "task_target_id" integer, "task_target_type" varchar(255), "args" varchar(255), "created_at" datetime, "time_submitted" datetime, "time_started" datetime, "time_ended" datetime, "message" text, "failure_code" varchar(255), "lock_version" integer DEFAULT 0);
+CREATE TABLE "templates" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "uuid" varchar(255) NOT NULL, "xml" blob NOT NULL, "uri" varchar(255), "name" varchar(255), "platform" varchar(255), "platform_version" varchar(255), "architecture" varchar(255), "summary" text, "complete" boolean DEFAULT 'f', "uploaded" boolean DEFAULT 'f', "imported" boolean DEFAULT 'f', "images_count" integer, "created_at" datetime, "updated_at" datetime);
+CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "login" varchar(255) NOT NULL, "email" varchar(255) NOT NULL, "crypted_password" varchar(255) NOT NULL, "password_salt" varchar(255) NOT NULL, "persistence_token" varchar(255) NOT NULL, "single_access_token" varchar(255) NOT NULL, "perishable_token" varchar(255) NOT NULL, "first_name" varchar(255), "last_name" varchar(255), "quota_id" integer, "login_count" integer DEFAULT 0 NOT NULL, "failed_login_count" integer DEFAULT 0 NOT NULL, "last_request_at" datetime, "current_login_at" datetime, "last_login_at" datetime, "current_login_ip" varchar(255), "last_login_ip" varchar(255), "created_at" datetime, "updated_at" datetime);
+CREATE INDEX "index_sessions_on_session_id" ON "sessions" ("session_id");
+CREATE INDEX "index_sessions_on_updated_at" ON "sessions" ("updated_at");
+CREATE INDEX "index_users_on_last_request_at" ON "users" ("last_request_at");
+CREATE INDEX "index_users_on_login" ON "users" ("login");
+CREATE INDEX "index_users_on_persistence_token" ON "users" ("persistence_token");
+CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
+INSERT INTO schema_migrations (version) VALUES ('200909011700');
+
+INSERT INTO schema_migrations (version) VALUES ('20090731200741');
+
+INSERT INTO schema_migrations (version) VALUES ('20090801045212');
+
+INSERT INTO schema_migrations (version) VALUES ('20090802000000');
+
+INSERT INTO schema_migrations (version) VALUES ('20090803000000');
+
+INSERT INTO schema_migrations (version) VALUES ('20090803141507');
+
+INSERT INTO schema_migrations (version) VALUES ('20090804135630');
+
+INSERT INTO schema_migrations (version) VALUES ('20090804140143');
+
+INSERT INTO schema_migrations (version) VALUES ('20090804141600');
+
+INSERT INTO schema_migrations (version) VALUES ('20090804142049');
+
+INSERT INTO schema_migrations (version) VALUES ('20090831140000');
+
+INSERT INTO schema_migrations (version) VALUES ('20090917192602');
+
+INSERT INTO schema_migrations (version) VALUES ('20091008153046');
+
+INSERT INTO schema_migrations (version) VALUES ('20091008153058');
+
+INSERT INTO schema_migrations (version) VALUES ('20091008153106');
+
+INSERT INTO schema_migrations (version) VALUES ('20091019215838');
+
+INSERT INTO schema_migrations (version) VALUES ('20100707000000');
+
+INSERT INTO schema_migrations (version) VALUES ('20100810221250');
+
+INSERT INTO schema_migrations (version) VALUES ('20100830150014');
+
+INSERT INTO schema_migrations (version) VALUES ('20100902081651');
+
+INSERT INTO schema_migrations (version) VALUES ('20101018174458');
+
+INSERT INTO schema_migrations (version) VALUES ('20101021172441');
+
+INSERT INTO schema_migrations (version) VALUES ('20110103160939');
+
+INSERT INTO schema_migrations (version) VALUES ('20110112094108');
+
+INSERT INTO schema_migrations (version) VALUES ('20110117140824');
+
+INSERT INTO schema_migrations (version) VALUES ('20110125122737');
+
+INSERT INTO schema_migrations (version) VALUES ('20110125123410');
\ No newline at end of file
diff --git a/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb b/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb
index 2ccadb4..beaabc5 100644
--- a/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb
+++ b/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb
< at >< at > -5,6 +5,7 < at >< at > class RenameCloudAccountToProviderAccount < ActiveRecord::Migration
end
def self.down
- drop_table :provider_accounts
+ change_column (:providers, :cloud_type, :string, :null => false)
+ rename_table (:provider_accounts, :cloud_accounts)
end
end
diff --git a/src/db/migrate/20110125122737_rename_cloud_accout_id_for_instance_keys.rb b/src/db/migrate/20110125122737_rename_cloud_accout_id_for_instance_keys.rb
new file mode 100644
index 0000000..79acc02
--- /dev/null
+++ b/src/db/migrate/20110125122737_rename_cloud_accout_id_for_instance_keys.rb
< at >< at > -0,0 +1,9 < at >< at >
+class RenameCloudAccoutIdForInstanceKeys < ActiveRecord::Migration
+ def self.up
+ rename_column :instance_keys, :cloud_account_id, :provider_account_id
+ end
+
+ def self.down
+ rename_column :instance_keys, :provider_account_id, :cloud_account_id
+ end
+end
diff --git a/src/db/migrate/20110125123410_rename_cloud_account_id_for_instances.rb b/src/db/migrate/20110125123410_rename_cloud_account_id_for_instances.rb
new file mode 100644
index 0000000..674fc2d
--- /dev/null
+++ b/src/db/migrate/20110125123410_rename_cloud_account_id_for_instances.rb
< at >< at > -0,0 +1,9 < at >< at >
+class RenameCloudAccountIdForInstances < ActiveRecord::Migration
+ def self.up
+ rename_column :instances, :cloud_account_id, :provider_account_id
+ end
+
+ def self.down
+ rename_column :instances, :provider_account_id, :cloud_account_id
+ end
+end
diff --git a/src/db/migrate/20110125154113_rename_cloud_accounts_pool_families_to_provider_accounts_pool_families.rb b/src/db/migrate/20110125154113_rename_cloud_accounts_pool_families_to_provider_accounts_pool_families.rb
new file mode 100644
index 0000000..d1ae154
--- /dev/null
+++ b/src/db/migrate/20110125154113_rename_cloud_accounts_pool_families_to_provider_accounts_pool_families.rb
< at >< at > -0,0 +1,11 < at >< at >
+class RenameCloudAccountsPoolFamiliesToProviderAccountsPoolFamilies < ActiveRecord::Migration
+ def self.up
+ rename_table :cloud_accounts_pool_families, :pool_families_provider_accounts
+ rename_column :pool_families_provider_accounts, :cloud_account_id, :provider_account_id
+ end
+
+ def self.down
+ rename_column :pool_families_provider_accounts, :provider_account_id, :cloud_account_id
+ rename_table :pool_families_provider_accounts, :cloud_accounts_pool_families
+ end
+end
diff --git a/src/db/migrate/20110126161751_change_null_properties_of_columns_in_provider_accounts.rb b/src/db/migrate/20110126161751_change_null_properties_of_columns_in_provider_accounts.rb
new file mode 100644
index 0000000..7e6707e
--- /dev/null
+++ b/src/db/migrate/20110126161751_change_null_properties_of_columns_in_provider_accounts.rb
< at >< at > -0,0 +1,13 < at >< at >
+class ChangeNullPropertiesOfColumnsInProviderAccounts < ActiveRecord::Migration
+ def self.up
+ change_column :provider_accounts, :account_number, :string, :null => true
+ change_column :provider_accounts, :x509_cert_priv, :text, :null => true
+ change_column :provider_accounts, :x509_cert_pub, :text, :null => true
+ end
+
+ def self.down
+ change_column :provider_accounts, :account_number, :string, :null => false
+ change_column :provider_accounts, :x509_cert_priv, :text, :null => false
+ change_column :provider_accounts, :x509_cert_pub, :text, :null => false
+ end
+end
diff --git a/src/features/provider.feature b/src/features/provider.feature
index 08704dd..ff9c05b 100644
--- a/src/features/provider.feature
+++ b/src/features/provider.feature
< at >< at > -35,6 +35,7 < at >< at > Feature: Manage Providers
Then I should be on the new admin provider page
When I fill in "provider[name]" with "testprovider"
And I fill in "provider[url]" with "http://localhost:3001/api"
+ And I select "Amazon EC2" from "Cloud type"
And I press "Save"
Then I should be on the admin providers page
And I should see "Provider added"
< at >< at > -64,14 +65,14 < at >< at > Feature: Manage Providers
And this provider has 5 replicated images
And this provider has 5 hardware profiles
And this provider has a realm
- And this provider has a cloud account
+ And this provider has a provider account
When I go to the admin providers page
And I check "provider1" provider
And I press "Delete"
And there should not exist a provider named "provider1"
And there should not be any replicated images
And there should not be any hardware profiles
- And there should not be a cloud account
+ And there should not be a provider account
And there should not be a realm
Scenario: Search for hardware profiles
< at >< at > -94,4 +95,4 < at >< at > Feature: Manage Providers
And I press "Search"
Then I should see "Mock"
And I should not see "Test"
- And I should not see "Other"
\ No newline at end of file
+ And I should not see "Other"
diff --git a/src/features/provider_account.feature b/src/features/provider_account.feature
index 964aba2..d4ebd34 100644
--- a/src/features/provider_account.feature
+++ b/src/features/provider_account.feature
< at >< at > -22,21 +22,17 < at >< at > Feature: Manage Provider Accounts
When I follow "New Account"
Then I should be on the new admin provider account page
And I should see "New Account"
- When I select "testprovider" from "provider_id"
- And I fill in "cloud_account[label]" with "testaccount"
- And I fill in "cloud_account[username]" with "mockuser"
- And I fill in "cloud_account[password]" with "mockpassword"
+ When I select "testprovider" from "select_provider"
+ And I fill in "provider_account[label]" with "testaccount"
+ And I fill in "provider_account[username]" with "mockuser"
+ And I fill in "provider_account[password]" with "mockpassword"
And I fill in "quota[maximum_running_instances]" with "13"
- And I fill in "cloud_account[account_number]" with "222222"
- And I attach the "private.key" file to "cloud_account[x509_cert_priv_file]"
- And I attach the "public.key" file to "cloud_account[x509_cert_pub_file]"
And I press "Add"
Then I should be on testaccount's provider account page
And I should see "Provider account added"
And I should have a provider account named "testaccount"
And I should see "Properties for testaccount"
And I should see "Running instances quota: 13"
- And I should see "Account ID: 222222"
Scenario: Test Provider Account Connection Successful
Given there is a provider named "testprovider"
< at >< at > -44,8 +40,8 < at >< at > Feature: Manage Provider Accounts
And I am on the admin provider accounts page
When I follow "New Account"
Then I should be on the new admin provider account page
- When I fill in "cloud_account[username]" with "mockuser"
- And I fill in "cloud_account[password]" with "mockpassword"
+ When I fill in "provider_account[username]" with "mockuser"
+ And I fill in "provider_account[password]" with "mockpassword"
And I press "Test Account"
Then I should see "Test Connection Success"
< at >< at > -55,8 +51,8 < at >< at > Feature: Manage Provider Accounts
And I am on the admin provider accounts page
When I follow "New Account"
Then I should be on the new admin provider account page
- When I fill in "cloud_account[username]" with "mockuser"
- And I fill in "cloud_account[password]" with "wrong password"
+ When I fill in "provider_account[username]" with "mockuser"
+ And I fill in "provider_account[password]" with "wrong password"
And I press "Test Account"
Then I should see "Test Connection Failed"
diff --git a/src/features/step_definitions/provider_account_steps.rb b/src/features/step_definitions/provider_account_steps.rb
index 63620c5..b3ffc09 100644
--- a/src/features/step_definitions/provider_account_steps.rb
+++ b/src/features/step_definitions/provider_account_steps.rb
< at >< at > -17,7 +17,7 < at >< at > end
Given /^there is a provider account named "([^"]*)"$/ do |label|
< at >provider = Provider.find_by_name('testprovider')
- < at >cloud_account = Factory(:mock_cloud_account, :provider => < at >provider, :label => label)
+ < at >provider_account = Factory(:mock_provider_account, :provider => < at >provider, :label => label)
end
Given /^there is a second provider account named "([^"]*)"$/ do |label|
diff --git a/src/features/step_definitions/provider_steps.rb b/src/features/step_definitions/provider_steps.rb
index 7dd57a7..4d57030 100644
--- a/src/features/step_definitions/provider_steps.rb
+++ b/src/features/step_definitions/provider_steps.rb
< at >< at > -49,8 +49,8 < at >< at > Given /^this provider has a realm$/ do
Factory(:realm, :provider => < at >provider)
end
-Given /^this provider has a cloud account$/ do
- Factory(:mock_cloud_account, :provider => < at >provider)
+Given /^this provider has a provider account$/ do
+ Factory(:mock_provider_account, :provider => < at >provider)
end
Then /^there should not be any replicated images$/ do
< at >< at > -61,7 +61,7 < at >< at > Then /^there should not be any hardware profiles$/ do
HardwareProfile.find(:all, :conditions => { :provider_id => < at >provider.id} ).size.should == 0
end
-Then /^there should not be a cloud account$/ do
+Then /^there should not be a provider account$/ do
ProviderAccount.find(:all, :conditions => { :provider_id => < at >provider.id} ).size.should == 0
end
diff --git a/src/features/step_definitions/template_steps.rb b/src/features/step_definitions/template_steps.rb
index e0ab543..c4f986c 100644
--- a/src/features/step_definitions/template_steps.rb
+++ b/src/features/step_definitions/template_steps.rb
< at >< at > -92,13 +92,13 < at >< at > When /^I choose this template$/ do
choose("ids__#{< at >template.id}")
end
-Given /^there is ec2 cloud account$/ do
- account = Factory.build(:ec2_cloud_account)
+Given /^there is Amazon AWS provider account$/ do
+ account = Factory.build(:ec2_provider_account)
account.save!
end
-Given /^there is ec2 build for this template$/ do
- Image.build(< at >template, 'ec2')
+Given /^there is Amazon AWS build for this template$/ do
+ Image.build(< at >template, Provider::AWS)
end
Given /^there is an imported template$/ do
diff --git a/src/features/template.feature b/src/features/template.feature
index b7d75a8..74ab316 100644
--- a/src/features/template.feature
+++ b/src/features/template.feature
< at >< at > -91,31 +91,31 < at >< at > Feature: Manage Templates
Scenario: Build template
Given there is a "mock1" template
- And there is ec2 cloud account
+ And there is Amazon AWS provider account
And I am on the templates page
When I choose this template
And I press "Build"
Then I should be on the new template build page
And I should see "Build Request"
- When I check "ec2"
+ When I check "Aws"
And I press "Submit to Build"
Then I should be on the template builds page
And I should see "mock1"
Scenario: Build template which is already built
Given there is a "mock1" template
- And there is ec2 cloud account
+ And there is Amazon AWS provider account
And I am on the templates page
- And there is ec2 build for this template
+ And there is Amazon AWS build for this template
When I choose this template
And I press "Build"
Then I should be on the new template build page
And I should see "Build Request"
- When I check "ec2"
+ When I check "Aws"
And I press "Submit to Build"
Then I should be on the template builds page
And I should see "mock1"
- And I should see "An attempted build of this template for the target 'ec2' already exists"
+ And I should see "An attempted build of this template for the target '1' already exists"
Scenario: Build imported template
Given there is an imported template
< at >< at > -166,4 +166,4 < at >< at > Feature: Manage Templates
And I press "Search"
Then I should not see "Test1"
And I should see "Other"
- And I should not see "Mock"
\ No newline at end of file
+ And I should not see "Mock"
diff --git a/src/spec/controllers/builds_controller_spec.rb b/src/spec/controllers/builds_controller_spec.rb
index ef4f3d4..3432bef 100644
--- a/src/spec/controllers/builds_controller_spec.rb
+++ b/src/spec/controllers/builds_controller_spec.rb
< at >< at > -18,19 +18,19 < at >< at > describe BuildsController do
hydra = Typhoeus::Hydra.hydra
hydra.stub(:put, %r{http://localhost:9090/templates/.*}).and_return(
Typhoeus::Response.new(:code => 200))
- Factory.create(:mock_cloud_account)
+ Factory.create(:mock_provider_account)
Factory.create(:mock_provider)
end
it "should create a new Image" do
lambda do
- post :create, :template_id => < at >template.id, :targets => ["mock"]
+ post :create, :template_id => < at >template.id, :targets => ["0"]
end.should change(Image, :count).by(1)
end
it "should create a new ReplicatedImage" do
lambda do
- post :create, :template_id => < at >template.id, :targets => ["mock"]
+ post :create, :template_id => < at >template.id, :targets => ["0"]
end.should change(ReplicatedImage, :count).by(1)
end
end
diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb b/src/spec/controllers/provider_accounts_controller_spec.rb
index 7471b30..6369eab 100644
--- a/src/spec/controllers/provider_accounts_controller_spec.rb
+++ b/src/spec/controllers/provider_accounts_controller_spec.rb
< at >< at > -4,8 +4,8 < at >< at > describe ProviderAccountsController do
fixtures :all
before(:each) do
- < at >cloud_account = Factory :mock_cloud_account
- < at >provider = < at >cloud_account.provider
+ < at >provider_account = Factory :mock_provider_account
+ < at >provider = < at >provider_account.provider
< at >admin_permission = Permission.create :role => Role.find(:first, :conditions => ['name = ?', 'Provider Administrator']),
:permission_object => < at >provider,
< at >< at > -23,7 +23,7 < at >< at > describe ProviderAccountsController do
it "allows test account validity on create when passing test_account param" do
UserSession.create(< at >admin)
- post :create, :provider_id => < at >provider.id, :cloud_account => {}, :test_account => true
+ post :create, :provider_id => < at >provider.id, :provider_account => {}, :test_account => true
response.should be_success
response.should render_template("new")
response.flash[:error].should == "Test Connection Failed: Invalid Account Details"
< at >< at > -31,7 +31,7 < at >< at > describe ProviderAccountsController do
it "doesn't allow to save provider's account if not valid credentials" do
UserSession.create(< at >admin)
- post :create, :provider_id => < at >provider.id, :cloud_account => {}
+ post :create, :provider_id => < at >provider.id, :provider_account => {}
response.should be_success
response.should render_template("new")
response.flash[:error].should == "The entered credential information is incorrect"
< at >< at > -39,7 +39,7 < at >< at > describe ProviderAccountsController do
it "should permit users with account modify permission to access edit cloud account interface" do
UserSession.create(< at >admin)
- get :edit, :id => < at >cloud_account.id
+ get :edit, :id => < at >provider_account.id
response.should be_success
response.should render_template("edit")
end
< at >< at > -47,33 +47,33 < at >< at > describe ProviderAccountsController do
it "should allow users with account modify password to update a cloud account" do
UserSession.create(< at >admin)
- < at >cloud_account.password = "foobar"
- < at >cloud_account.stub!(:valid_credentials?).and_return(true)
- < at >cloud_account.quota = Quota.new
- < at >cloud_account.save.should be_true
+ < at >provider_account.password = "foobar"
+ < at >provider_account.stub!(:valid_credentials?).and_return(true)
+ < at >provider_account.quota = Quota.new
+ < at >provider_account.save.should be_true
- post :update, :id => < at >cloud_account.id, :cloud_account => { :password => 'mockpassword' }
+ post :update, :id => < at >provider_account.id, :provider_account => { :password => 'mockpassword' }
response.should redirect_to provider_accounts_path(< at >provider)
- ProviderAccount.find(< at >cloud_account.id).password.should == "mockpassword"
+ ProviderAccount.find(< at >provider_account.id).password.should == "mockpassword"
end
it "should allow users with account modify permission to delete a cloud account" do
UserSession.create(< at >admin)
lambda do
- get :destroy, :id => < at >cloud_account.id
+ get :destroy, :id => < at >provider_account.id
end.should change(ProviderAccount, :count).by(-1)
response.should redirect_to provider_accounts_path(< at >provider)
- ProviderAccount.find_by_id(< at >cloud_account.id).should be_nil
+ ProviderAccount.find_by_id(< at >provider_account.id).should be_nil
end
it "should deny access to users without account modify permission" do
- get :edit, :id => < at >cloud_account.id
+ get :edit, :id => < at >provider_account.id
response.should_not be_success
- post :update, :id => < at >cloud_account.id, :cloud_account => { :password => 'foobar' }
+ post :update, :id => < at >provider_account.id, :provider_account => { :password => 'foobar' }
response.should_not be_success
- post :destroy, :id => < at >cloud_account.id
+ post :destroy, :id => < at >provider_account.id
response.should_not be_success
end
diff --git a/src/spec/factories/instance.rb b/src/spec/factories/instance.rb
index 7533ba9..87938bd 100644
--- a/src/spec/factories/instance.rb
+++ b/src/spec/factories/instance.rb
< at >< at > -2,7 +2,7 < at >< at > Factory.define :instance do |i|
i.sequence(:name) { |n| "instance#{n}" }
i.sequence(:external_key) { |n| "key#{n}" }
i.association :hardware_profile, :factory => :mock_hwp1
- i.association :cloud_account, :factory => :mock_cloud_account
+ i.association :provider_account, :factory => :mock_provider_account
i.association :template, :factory => :template
i.association :pool, :factory => :pool
i.association :owner, :factory => :user
< at >< at > -23,6 +23,6 < at >< at > end
Factory.define :ec2_instance, :parent => :instance do |i|
i.association :hardware_profile, :factory => :ec2_hwp1
- i.association :cloud_account, :factory => :ec2_cloud_account
+ i.association :provider_account, :factory => :ec2_provider_account
i.association :instance_key, :factory => :ec2_instance_key1
end
diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb
index 76fb4af..b26cff4 100644
--- a/src/spec/factories/provider.rb
+++ b/src/spec/factories/provider.rb
< at >< at > -1,11 +1,11 < at >< at >
Factory.define :provider do |p|
p.sequence(:name) { |n| "provider#{n}" }
- p.cloud_type 'mock'
+ p.cloud_type '0'
p.url { |p| "http://www." + p.name + ".com/api" }
end
Factory.define :mock_provider, :parent => :provider do |p|
- p.cloud_type 'mock'
+ p.cloud_type '0'
p.url 'http://localhost:3001/api'
p.hardware_profiles { |hp| [hp.association(:mock_hwp1), hp.association(:mock_hwp2)] }
p.after_create { |p| p.realms << Factory(:realm1, :provider => p) << Factory(:realm2, :provider => p) }
< at >< at > -13,14 +13,14 < at >< at > end
Factory.define :mock_provider2, :parent => :provider do |p|
p.name 'mock2'
- p.cloud_type 'mock'
+ p.cloud_type '0'
p.url 'http://localhost:3001/api'
p.after_create { |p| p.realms << Factory(:realm3, :provider => p) }
end
Factory.define :ec2_provider, :parent => :provider do |p|
p.name 'amazon-ec2'
- p.cloud_type 'ec2'
+ p.cloud_type '1'
p.url 'http://localhost:3001/api'
p.hardware_profiles { |hp| [hp.association(:ec2_hwp1)] }
p.after_create { |p| p.realms << Factory(:realm4, :provider => p) }
diff --git a/src/spec/factories/provider_account.rb b/src/spec/factories/provider_account.rb
index ff42702..dae7047 100644
--- a/src/spec/factories/provider_account.rb
+++ b/src/spec/factories/provider_account.rb
< at >< at > -8,13 +8,13 < at >< at > Factory.define :provider_account do |f|
f.association :provider
end
-Factory.define :mock_cloud_account, :parent => :provider_account do |f|
+Factory.define :mock_provider_account, :parent => :provider_account do |f|
f.username "mockuser"
f.password "mockpassword"
f.provider { |p| p.association(:mock_provider) }
end
-Factory.define :ec2_cloud_account, :parent => :provider_account do |f|
+Factory.define :ec2_provider_account, :parent => :provider_account do |f|
f.username "mockuser"
f.password "mockpassword"
f.provider { |p| p.association(:ec2_provider) }
diff --git a/src/spec/models/image_spec.rb b/src/spec/models/image_spec.rb
index dbd5ba8..e489fb6 100644
--- a/src/spec/models/image_spec.rb
+++ b/src/spec/models/image_spec.rb
< at >< at > -42,12 +42,12 < at >< at > describe Image do
end
it "should build image if there is provider and cloud account for specified target" do
- acc = Factory.build(:mock_cloud_account)
+ acc = Factory.build(:mock_provider_account)
acc.stub!(:valid_credentials?).and_return(true)
acc.save!
tpl = Factory.build(:template)
tpl.save!
- img = Image.build(tpl, 'mock')
+ img = Image.build(tpl, '0')
Image.find(img).should == img
ReplicatedImage.find_by_image_id(img.id).should_not be_nil
end
< at >< at > -55,7 +55,7 < at >< at > describe Image do
it "should import image" do
image = OpenStruct.new(:id => 'mock', :name => 'mock', :description => 'imported mock', :architecture => 'i386')
client = mock('DeltaCloud', :feature? => false, :image => image)
- account = Factory.build(:ec2_cloud_account)
+ account = Factory.build(:ec2_provider_account)
account.stub!(:connect).and_return(client)
account.stub!(:valid_credentials?).and_return(true)
account.save!
diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb
index be2665e..4acb78c 100644
--- a/src/spec/models/instance_observer_spec.rb
+++ b/src/spec/models/instance_observer_spec.rb
< at >< at > -3,10 +3,8 < at >< at > require 'spec_helper'
describe InstanceObserver do
before(:each) do
- Timecop.travel(Time.local(2008, 9, 1, 10, 5, 0, 0, 0))
-
- < at >cloud_account_quota = Factory :quota
- < at >cloud_account = Factory(:mock_cloud_account, :quota_id => < at >cloud_account_quota.id)
+ < at >provider_account_quota = Factory :quota
+ < at >provider_account = Factory(:mock_provider_account, :quota_id => < at >provider_account_quota.id)
< at >pool_quota = Factory :quota
< at >pool = Factory(:pool, :quota_id => < at >pool_quota.id)
< at >< at > -15,7 +13,9 < at >< at > describe InstanceObserver do
< at >user = Factory(:user, :quota_id => < at >user_quota.id)
< at >hwp = Factory :mock_hwp1
- < at >instance = Factory(:new_instance, :pool => < at >pool, :hardware_profile => < at >hwp, :cloud_account_id => < at >cloud_account.id, :owner => < at >user)
+ < at >instance = Factory(:new_instance, :pool => < at >pool, :hardware_profile => < at >hwp, :provider_account_id => < at >provider_account.id, :owner => < at >user)
+
+ Timecop.travel(Time.local(2008, 9, 1, 10, 5, 0, 0, 0))
end
after(:each) do
< at >< at > -102,14 +102,14 < at >< at > describe InstanceObserver do
end
it "should not update quota on pool, user and cloud account when an instance is state new" do
- [< at >cloud_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
+ [< at >provider_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
quota = Quota.find(quota)
quota.total_instances.should == 0
end
end
it "should update quota on pool, user and cloud account when an instance goes to state pending" do
- [< at >cloud_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
+ [< at >provider_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
< at >instance.state = Instance::STATE_PENDING
< at >instance.save!
< at >< at > -122,7 +122,7 < at >< at > describe InstanceObserver do
< at >instance.state = Instance::STATE_CREATE_FAILED
< at >instance.save!
- [< at >cloud_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
+ [< at >provider_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
quota = Quota.find(quota)
quota.total_instances.should == 0
end
< at >< at > -132,7 +132,7 < at >< at > describe InstanceObserver do
< at >instance.state = Instance::STATE_RUNNING
< at >instance.save!
- [< at >cloud_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
+ [< at >provider_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
quota = Quota.find(quota.id)
quota.running_instances.should == 1
quota.total_instances.should == 1
< at >< at > -146,7 +146,7 < at >< at > describe InstanceObserver do
< at >instance.state = Instance::STATE_SHUTTING_DOWN
< at >instance.save!
- [< at >cloud_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
+ [< at >provider_account_quota, < at >pool_quota, < at >user_quota].each do |quota|
quota = Quota.find(quota.id)
quota.running_instances.should == 0
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index 625718d..e4d3a9f 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
< at >< at > -86,16 +86,9 < at >< at > describe Instance do
describe "with time capsule" do
- before(:each) do
- Timecop.travel(Time.local(2008, 9, 1, 10, 5, 0, 0, 0))
- end
-
- after(:each) do
- Timecop.return
- end
-
it "should properly calculate the total time that the instance has been in a monitored state" do
instance = Factory :new_instance
+ Timecop.travel(Time.local(2008, 9, 1, 10, 5, 0, 0, 0))
[ Instance::STATE_PENDING, Instance::STATE_RUNNING, Instance::STATE_SHUTTING_DOWN, Instance::STATE_STOPPED ].each do |s|
< at >< at > -121,18 +114,19 < at >< at > describe Instance do
instance.total_state_time(s).should >= 3
instance.total_state_time(s).should <= 4
end
+ Timecop.return
end
end
it "should return empty list of instance actions when connect to provider fails" do
provider = Factory.build(:mock_provider2)
- cloud_account = Factory.build(:cloud_account, :provider => provider,
+ cloud_account = Factory.build(:provider_account, :provider => provider,
:username => 'john doe',
:password => 'asdf')
cloud_account.stub!(:connect).and_return(nil)
cloud_account.stub!(:valid_credentials?).and_return(true)
- instance = Factory.create(:instance, :cloud_account => cloud_account)
+ instance = Factory.create(:instance, :provider_account => cloud_account)
instance.get_action_list.should be_empty
end
diff --git a/src/spec/models/pool_family_spec.rb b/src/spec/models/pool_family_spec.rb
index 58c18ec..68dfb42 100644
--- a/src/spec/models/pool_family_spec.rb
+++ b/src/spec/models/pool_family_spec.rb
< at >< at > -5,9 +5,9 < at >< at > describe PoolFamily do
before(:each) do
< at >pool = Factory :pool
< at >pool_family = < at >pool.pool_family
- < at >cloud_account = Factory :mock_cloud_account
- < at >cloud_account.pool_families << < at >pool_family
- < at >cloud_account.save!
+ < at >provider_account = Factory :mock_provider_account
+ < at >provider_account.pool_families << < at >pool_family
+ < at >provider_account.save!
end
it "should validate default pool family" do
< at >< at > -28,7 +28,7 < at >< at > describe PoolFamily do
it "should have account" do
< at >pool_family.provider_accounts.size.should == 1
- < at >pool_family.provider_accounts[0].id.should == < at >cloud_account.id
+ < at >pool_family.provider_accounts[0].id.should == < at >provider_account.id
end
end
diff --git a/src/spec/models/provider_account_spec.rb b/src/spec/models/provider_account_spec.rb
index 57d0611..48678e8 100644
--- a/src/spec/models/provider_account_spec.rb
+++ b/src/spec/models/provider_account_spec.rb
< at >< at > -3,33 +3,33 < at >< at > require 'spec_helper'
describe ProviderAccount do
fixtures :all
before(:each) do
- < at >cloud_account = Factory :mock_cloud_account
+ < at >provider_account = Factory :mock_provider_account
end
it "should not be destroyable if it has instances" do
- < at >cloud_account.instances << Instance.new
- < at >cloud_account.destroyable?.should be_false
- < at >cloud_account.destroy.should be_false
+ < at >provider_account.instances << Instance.new
+ < at >provider_account.destroyable?.should be_false
+ < at >provider_account.destroy.should be_false
- < at >cloud_account.instances.clear
- < at >cloud_account.destroyable?.should be_true
- < at >cloud_account.destroy.equal?(< at >cloud_account).should be_true
- < at >cloud_account.should be_frozen
+ < at >provider_account.instances.clear
+ < at >provider_account.destroyable?.should be_true
+ < at >provider_account.destroy.equal?(< at >provider_account).should be_true
+ < at >provider_account.should be_frozen
end
it "should check the validitiy of the cloud account login credentials" do
mock_provider = Factory :mock_provider
- invalid_cloud_account = Factory.build(:cloud_account, :username => "wrong_username", :password => "wrong_password", :provider => mock_provider)
- invalid_cloud_account.should_not be_valid
+ invalid_provider_account = Factory.build(:provider_account, :username => "wrong_username", :password => "wrong_password", :provider => mock_provider)
+ invalid_provider_account.should_not be_valid
- valid_cloud_account = Factory.build(:mock_cloud_account, :provider => mock_provider)
- valid_cloud_account.should be_valid
+ valid_provider_account = Factory.build(:mock_provider_account, :provider => mock_provider)
+ valid_provider_account.should be_valid
end
it "should fail to create a cloud account if the provider credentials are invalid" do
- cloud_account = Factory.build(:mock_cloud_account, :password => "wrong_password")
- cloud_account.save.should == false
+ provider_account = Factory.build(:mock_provider_account, :password => "wrong_password")
+ provider_account.save.should == false
end
it "should create an instance_key if provider is EC2" do
< at >< at > -41,18 +41,18 < at >< at > describe ProviderAccount do
< at >client.stub!(:"feature?").and_return(true)
< at >client.stub!(:"create_key").and_return(< at >key)
- cloud_account = Factory.build :ec2_cloud_account
- cloud_account.stub!(:connect).and_return(< at >client)
- cloud_account.save
- cloud_account.instance_key.should_not == nil
- cloud_account.instance_key.pem == "PEM"
- cloud_account.instance_key.id == "1_user"
+ provider_account = Factory.build :ec2_provider_account
+ provider_account.stub!(:connect).and_return(< at >client)
+ provider_account.save
+ provider_account.instance_key.should_not == nil
+ provider_account.instance_key.pem == "PEM"
+ provider_account.instance_key.id == "1_user"
end
it "when calling connect and it fails with exception it will return nil" do
DeltaCloud.should_receive(:new).and_raise(Exception.new)
- < at >cloud_account.connect.should be_nil
+ < at >provider_account.connect.should be_nil
end
it "should generate credentials xml" do
< at >< at > -68,13 +68,13 < at >< at > describe ProviderAccount do
</ec2_credentials>
</provider_credentials>
EOT
- cloud_account = Factory.build(:mock_cloud_account,
+ provider_account = Factory.build(:mock_provider_account,
:username => 'user',
:password => 'pass',
:account_number => '1234',
:x509_cert_priv => 'priv_key',
:x509_cert_pub => 'cert'
)
- cloud_account.build_credentials.should eql(expected_xml)
+ provider_account.build_credentials.should eql(expected_xml)
end
end
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb
index e3af313..7d11633 100644
--- a/src/spec/models/provider_spec.rb
+++ b/src/spec/models/provider_spec.rb
< at >< at > -66,7 +66,7 < at >< at > describe Provider do
it "should set valid cloud type" do
< at >client.driver_name = < at >provider.cloud_type
< at >provider.cloud_type = nil
- < at >provider.set_cloud_type!
+ < at >provider.cloud_type = 0
< at >provider.should be_valid
end
diff --git a/src/spec/models/quota_spec.rb b/src/spec/models/quota_spec.rb
index 9620e83..960b417 100644
--- a/src/spec/models/quota_spec.rb
+++ b/src/spec/models/quota_spec.rb
< at >< at > -3,8 +3,8 < at >< at > require 'spec_helper'
describe Quota do
before(:each) do
- < at >cloud_account_quota = Factory :quota
- < at >cloud_account = Factory(:mock_cloud_account, :quota_id => < at >cloud_account_quota.id)
+ < at >provider_account_quota = Factory :quota
+ < at >provider_account = Factory(:mock_provider_account, :quota_id => < at >provider_account_quota.id)
< at >pool_quota = Factory :quota
< at >pool = Factory(:pool, :quota_id => < at >pool_quota.id)
< at >< at > -13,12 +13,12 < at >< at > describe Quota do
< at >user = Factory(:user, :quota_id => < at >user_quota.id)
< at >hwp = Factory :mock_hwp1
- < at >instance = Factory(:new_instance, :pool => < at >pool, :hardware_profile => < at >hwp, :cloud_account_id => < at >cloud_account.id, :owner => < at >user)
+ < at >instance = Factory(:new_instance, :pool => < at >pool, :hardware_profile => < at >hwp, :provider_account_id => < at >provider_account.id, :owner => < at >user)
end
it "should return true when asking if an instance can be created/started when there is sufficient quota space" do
- Quota.can_create_instance?(< at >instance, < at >cloud_account).should == true
- Quota.can_start_instance?(< at >instance, < at >cloud_account).should == true
+ Quota.can_create_instance?(< at >instance, < at >provider_account).should == true
+ Quota.can_start_instance?(< at >instance, < at >provider_account).should == true
end
it "should return true when asking if an instance can be created/started when using unlimited Quotas" do
< at >< at > -28,11 +28,11 < at >< at > describe Quota do
< at >pool.quota = Factory :unlimited_quota
< at >pool.save!
- < at >cloud_account.quota = Factory :unlimited_quota
- < at >cloud_account.save!
+ < at >provider_account.quota = Factory :unlimited_quota
+ < at >provider_account.save!
- Quota.can_create_instance?(< at >instance, < at >cloud_account).should == true
- Quota.can_start_instance?(< at >instance, < at >cloud_account).should == true
+ Quota.can_create_instance?(< at >instance, < at >provider_account).should == true
+ Quota.can_start_instance?(< at >instance, < at >provider_account).should == true
end
it "should return false when asking if an instance can be created/started when the user quota is reached" do
< at >< at > -40,8 +40,8 < at >< at > describe Quota do
< at >user_quota.running_instances = < at >user_quota.maximum_running_instances
< at >user_quota.save!
- Quota.can_create_instance?(< at >instance, < at >cloud_account).should == false
- Quota.can_start_instance?(< at >instance, < at >cloud_account).should == false
+ Quota.can_create_instance?(< at >instance, < at >provider_account).should == false
+ Quota.can_start_instance?(< at >instance, < at >provider_account).should == false
end
it "should return false when asking if an instance can be created/started when the pool quota is reached" do
< at >< at > -49,17 +49,17 < at >< at > describe Quota do
< at >pool_quota.running_instances = < at >pool_quota.maximum_running_instances
< at >pool_quota.save!
- Quota.can_create_instance?(< at >instance, < at >cloud_account).should == false
- Quota.can_start_instance?(< at >instance, < at >cloud_account).should == false
+ Quota.can_create_instance?(< at >instance, < at >provider_account).should == false
+ Quota.can_start_instance?(< at >instance, < at >provider_account).should == false
end
it "should return false when asking if an instance can be created/started when the cloud account quota is reached" do
- < at >cloud_account_quota.total_instances = < at >cloud_account_quota.maximum_total_instances
- < at >cloud_account_quota.running_instances = < at >cloud_account_quota.maximum_running_instances
- < at >cloud_account_quota.save!
+ < at >provider_account_quota.total_instances = < at >provider_account_quota.maximum_total_instances
+ < at >provider_account_quota.running_instances = < at >provider_account_quota.maximum_running_instances
+ < at >provider_account_quota.save!
- Quota.can_create_instance?(< at >instance, < at >cloud_account).should == false
- Quota.can_start_instance?(< at >instance, < at >cloud_account).should == false
+ Quota.can_create_instance?(< at >instance, < at >provider_account).should == false
+ Quota.can_start_instance?(< at >instance, < at >provider_account).should == false
end
it "should return false when asking if an instance can be created/started when the all quotas are reached" do
< at >< at > -71,12 +71,12 < at >< at > describe Quota do
< at >pool_quota.running_instances = < at >pool_quota.maximum_running_instances
< at >pool_quota.save!
- < at >cloud_account_quota.total_instances = < at >cloud_account_quota.maximum_total_instances
- < at >cloud_account_quota.running_instances = < at >cloud_account_quota.maximum_running_instances
- < at >cloud_account_quota.save!
+ < at >provider_account_quota.total_instances = < at >provider_account_quota.maximum_total_instances
+ < at >provider_account_quota.running_instances = < at >provider_account_quota.maximum_running_instances
+ < at >provider_account_quota.save!
- Quota.can_create_instance?(< at >instance, < at >cloud_account).should == false
- Quota.can_start_instance?(< at >instance, < at >cloud_account).should == false
+ Quota.can_create_instance?(< at >instance, < at >provider_account).should == false
+ Quota.can_start_instance?(< at >instance, < at >provider_account).should == false
end
-end
\ No newline at end of file
+end
diff --git a/src/spec/services/data_service_active_record_spec.rb b/src/spec/services/data_service_active_record_spec.rb
index b443fa9..45b07bf 100644
--- a/src/spec/services/data_service_active_record_spec.rb
+++ b/src/spec/services/data_service_active_record_spec.rb
< at >< at > -11,13 +11,13 < at >< at > describe DataServiceActiveRecord do
data = [[25, 10], [40, 20], [20, 20]]
free = 0
for i in 0..2
- cloud_account = Factory.build(:cloud_account, :provider => provider, :username => "username" + i.to_s)
- cloud_account.stub!(:valid_credentials?).and_return(true)
- cloud_account.save!
+ provider_account = Factory.build(:provider_account, :provider => provider, :username => "username" + i.to_s)
+ provider_account.stub!(:valid_credentials?).and_return(true)
+ provider_account.save!
quota = Factory(:quota, :maximum_total_instances => data[i][0], :total_instances => data[i][1])
- cloud_account.quota_id = quota.id
- cloud_account.save!
+ provider_account.quota_id = quota.id
+ provider_account.save!
free += (data[i][0] - data[i][1])
end
< at >< at > -36,24 +36,24 < at >< at > describe DataServiceActiveRecord do
provider.stub!(:connect).and_return(client)
provider.save!
- cloud_account = Factory.build(:cloud_account, :provider => provider)
- cloud_account.stub!(:valid_credentials?).and_return(true)
- cloud_account.save!
+ provider_account = Factory.build(:provider_account, :provider => provider)
+ provider_account.stub!(:valid_credentials?).and_return(true)
+ provider_account.save!
quota = Factory(:quota,
:maximum_running_instances => 40,
:maximum_total_instances => 50,
:running_instances => 20,
:total_instances => 20)
- cloud_account.quota_id = quota.id
+ provider_account.quota_id = quota.id
- data_point = DataServiceActiveRecord.quota_usage(cloud_account, Quota::RESOURCE_RUNNING_INSTANCES)
+ data_point = DataServiceActiveRecord.quota_usage(provider_account, Quota::RESOURCE_RUNNING_INSTANCES)
data_point.should == DataServiceActiveRecord::QuotaUsagePoint.new(20, 40)
- data_point = DataServiceActiveRecord.quota_usage(cloud_account, Quota::RESOURCE_TOTAL_INSTANCES)
+ data_point = DataServiceActiveRecord.quota_usage(provider_account, Quota::RESOURCE_TOTAL_INSTANCES)
data_point.should == DataServiceActiveRecord::QuotaUsagePoint.new(20, 50)
- data_point = DataServiceActiveRecord.quota_usage(cloud_account, Quota::RESOURCE_OVERALL)
+ data_point = DataServiceActiveRecord.quota_usage(provider_account, Quota::RESOURCE_OVERALL)
data_point.should == DataServiceActiveRecord::QuotaUsagePoint.new(20, 40)
end
< at >< at > -127,13 +127,13 < at >< at > describe DataServiceActiveRecord do
provider.stub!(:connect).and_return(client)
provider.save!
- cloud_accounts = []
+ provider_accounts = []
expected_averages.each do |expected_average|
- cloud_account = Factory.build(:cloud_account, :provider => provider, :username => "username" + expected_average[0].to_s)
- cloud_account.stub!(:valid_credentials?).and_return(true)
- cloud_account.save!
+ provider_account = Factory.build(:provider_account, :provider => provider, :username => "username" + expected_average[0].to_s)
+ provider_account.stub!(:valid_credentials?).and_return(true)
+ provider_account.save!
- instance = Factory(:instance, :cloud_account_id => cloud_account.id, :pool_id => pool.id)
+ instance = Factory(:instance, :provider_account_id => provider_account.id, :pool_id => pool.id)
generate_tasks(start_time, interval_length, instance, expected_average)
end
< at >< at > -163,11 +163,11 < at >< at > describe DataServiceActiveRecord do
runtimes = [runtime1, runtime2, runtime3]
pool = Factory(:pool)
- cloud_account = Factory :mock_cloud_account
+ provider_account = Factory :mock_provider_account
for i in 0..2 do
runtimes[i].each do |runtime|
- instance = Factory(:instance, :pool => pool, :cloud_account => cloud_account, :state => Instance::STATE_STOPPED)
+ instance = Factory(:instance, :pool => pool, :provider_account => provider_account, :state => Instance::STATE_STOPPED)
instance.save!
instance.time_last_pending = start_times[i] + (interval_length / 2)
< at >< at > -177,7 +177,7 < at >< at > describe DataServiceActiveRecord do
end
end
- stats = DataServiceActiveRecord.qos_instance_runtime_stats(cloud_account, start_time, end_time, interval_length)
+ stats = DataServiceActiveRecord.qos_instance_runtime_stats(provider_account, start_time, end_time, interval_length)
stats[0].should == DataServiceActiveRecord::QoSDataPoint.new(start_times[0], 15, 25, 5)
stats[1].should == DataServiceActiveRecord::QoSDataPoint.new(start_times[1], 30, 50, 10)
stats[2].should == DataServiceActiveRecord::QoSDataPoint.new(start_times[2], 300, 500, 100)
< at >< at > -187,11 +187,11 < at >< at > describe DataServiceActiveRecord do
it "should generate the mean max and min instance runtimes of instances for a given cloud account or pool" do
pool = Factory(:pool)
- cloud_account = Factory :mock_cloud_account
+ provider_account = Factory :mock_provider_account
start_time = Time.utc(2010,"jan",1,20,15,1)
[50, 100, 150, 200, 250].each do |runtime|
- instance = Factory(:new_instance, :pool => pool, :cloud_account => cloud_account)
+ instance = Factory(:new_instance, :pool => pool, :provider_account => provider_account)
instance.time_last_pending = start_time
instance.time_last_running = start_time
instance.acc_running_time = runtime
< at >< at > -205,8 +205,8 < at >< at > describe DataServiceActiveRecord do
it "should calculate the average time it takes a provider to complete a task between two times" do
pool = Factory(:pool)
- cloud_account = Factory(:mock_cloud_account)
- instance = Factory(:instance, :pool => pool, :cloud_account => cloud_account)
+ provider_account = Factory(:mock_provider_account)
+ instance = Factory(:instance, :pool => pool, :provider_account => provider_account)
start_time = Time.utc(2010,"jan",1,20,15,1)
task_completion_times = [10, 20, 30, 40, 50]
< at >< at > -230,7 +230,7 < at >< at > describe DataServiceActiveRecord do
end
expected_average_time = total_time / task_completion_times.length
- average_time = DataServiceActiveRecord.qos_task_completion_mean_max_min(cloud_account.provider, start_time, Time.now, InstanceTask::ACTION_CREATE)
+ average_time = DataServiceActiveRecord.qos_task_completion_mean_max_min(provider_account.provider, start_time, Time.now, InstanceTask::ACTION_CREATE)
average_time[:average].should == expected_average_time
average_time[:min].should == 10
< at >< at > -243,8 +243,8 < at >< at > describe DataServiceActiveRecord do
end_time = create_time + 1
pool = Factory(:pool)
- cloud_account = Factory :mock_cloud_account
- instance = Factory(:instance, :pool => pool, :cloud_account => cloud_account)
+ provider_account = Factory :mock_provider_account
+ instance = Factory(:instance, :pool => pool, :provider_account => provider_account)
failures = 5
non_failures = 20
< at >< at > -289,8 +289,8 < at >< at > describe DataServiceActiveRecord do
number_of_instances = 20
pool = Factory(:pool)
- cloud_account = Factory :mock_cloud_account
- instance = Factory(:instance, :pool => pool, :cloud_account => cloud_account)
+ provider_account = Factory :mock_provider_account
+ instance = Factory(:instance, :pool => pool, :provider_account => provider_account)
for i in 0..2
for j in 1..failures[i]
</pre>jzigmund-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-27T15:37:53Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.comp.lib.deltacloud.devel