September 2011 - aeolus-devel - Fedora mailing-lists

packaging aeolus components
by Mo Morsi 19 Jan '12

19 Jan '12

Inorder to assist with the Aeolus packaging process, we are looking to split the end-of-development-cycle packaging tasks up among engineers working on the various components. The tentative list of lead packagers can be found below as well as on the wiki [1]. These packagers are responsible for making sure their component is tested against the supported Fedora versions at the time (currently F15, F16, and rawhide), and their component is pushed into Fedora with all of its dependencies (both new and updated ones). They may ask delegate some of this responsobility off to other team members as appropriate on a case by case basis. audrey - JoeVLcek conductor - sseago configure - mmorsi deltacloud - mfojtik imagefactory - sloranz iwhd - jmeyering oz - clalance If anyone feels that there are a better fits, feel free to suggest. -Mo [1] https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Packaging

2 2

[PATCH] Use a thread to do instance creates V4.
by Ian Main 19 Oct '11

19 Oct '11

From: Chris Lalancette <clalance(a)redhat.com> I modified Chris' patch to use a thread instead of fork. This pushes the communications with deltacloud into a thread which can take as long as it needs to complete the start. In the future we may want to put a retry in here too. You will notice in V2 we now set allow_concurrency = true in the postgres config. I'm a little worried that this means it may not work with other DB providers. V4: Fix whitespace errors Signed-off-by: Ian Main <imain(a)redhat.com> --- src/app/util/taskomatic.rb | 81 ++++++++++++++++++++++++++++++------------- src/config/database.pg | 3 ++ 2 files changed, 59 insertions(+), 25 deletions(-) diff --git a/src/app/util/taskomatic.rb b/src/app/util/taskomatic.rb index 84dabd0..2f08daa 100644 --- a/src/app/util/taskomatic.rb +++ b/src/app/util/taskomatic.rb @@ -26,27 +26,15 @@ module Taskomatic task.state = Task::STATE_PENDING task.save! - task.instance.provider_account = match.provider_account - task.instance.create_auth_key unless task.instance.instance_key - - dcloud_instance = create_dcloud_instance(task.instance, match) - - handle_dcloud_error(dcloud_instance) + create_dcloud_instance(task.instance, match) task.state = Task::STATE_RUNNING - task.save! - - Rails.logger.info "Task instance create completed with key #{dcloud_instance.id} and state #{dcloud_instance.state}" - task.instance.external_key = dcloud_instance.id - task.instance.state = dcloud_to_instance_state(dcloud_instance.state) - task.instance.save! rescue HttpException => ex task.failure_code = Task::FAILURE_PROVIDER_CONTACT_FAILED handle_create_instance_error(task, ex) rescue Exception => ex handle_create_instance_error(task, ex) ensure - task.instance.save! task.save! end end @@ -146,18 +134,61 @@ module Taskomatic end def self.create_dcloud_instance(instance, match) - client = match.provider_account.connect - - overrides = HardwareProfile.generate_override_property_values(instance.hardware_profile, match.hwp) - - client.create_instance(:image_id => match.provider_image.target_identifier, - :name => instance.name.tr("/", "-"), - :hwp_id => match.hwp.external_key, - :hwp_memory => overrides[:memory], - :hwp_cpu => overrides[:cpu], - :hwp_storage => overrides[:storage], - :realm_id => (match.realm.external_key rescue nil), - :keyname => (instance.instance_key.name)) + # because creating an instance can take a potentially long time (and + # creating multiple of them just prolongs this), we start a new thread + # that does this work. The new thread continues to run in the background + # and communicates the status back to the main UI via the database + + # This cleans up old DB connections. AR creates a new connection for each + # thread. This can leak FDs if you don't clean them up. Basically this + # ensures the previously used FD is cleaned up. + ActiveRecord::Base.connection_pool.clear_stale_cached_connections! + + Thread.new do + begin + # These all need to be reloaded because when you create a new thread + # AR creates a new connection and these objects become stale. + # + # Everything used here must be reloaded. + instance.reload + match.provider_account.reload + match.hwp.reload + match.realm.reload if match.realm + + instance.provider_account = match.provider_account + instance.create_auth_key unless instance.instance_key + + client = match.provider_account.connect + + overrides = HardwareProfile.generate_override_property_values(instance.hardware_profile, match.hwp) + + dcloud_instance = client.create_instance(:image_id => match.provider_image.target_identifier, + :name => instance.name.tr("/", "-"), + :hwp_id => match.hwp.external_key, + :hwp_memory => overrides[:memory], + :hwp_cpu => overrides[:cpu], + :hwp_storage => overrides[:storage], + :realm_id => (match.realm.external_key rescue nil), + :keyname => (instance.instance_key.name)) + + handle_dcloud_error(dcloud_instance) + + Rails.logger.info "Task instance create completed with key #{dcloud_instance.id} and state #{dcloud_instance.state}" + instance.external_key = dcloud_instance.id + instance.state = dcloud_to_instance_state(dcloud_instance.state) + rescue Exception => ex + # any sort of exception causes us to put the instance in CREATE_FAILED + # FIXME: if the exception is raised *after* the create_instance, this + # isn't true and will result in a rogue instance + Rails.logger.error ex.message + Rails.logger.error ex.backtrace.join("\n") + instance.state = Instance::STATE_CREATE_FAILED + raise ex + ensure + instance.save! + Thread.exit + end + end end def self.matches(instance) diff --git a/src/config/database.pg b/src/config/database.pg index 19fe4e6..72a3895 100644 --- a/src/config/database.pg +++ b/src/config/database.pg @@ -45,6 +45,7 @@ development: username: aeolus password: v23zj59an host: localhost + allow_concurrency: true min_messages: warning # Warning: The database defined as 'test' will be erased and @@ -56,6 +57,7 @@ test: &TEST username: aeolus password: v23zj59an host: localhost + allow_concurrency: true min_messages: warning production: @@ -63,6 +65,7 @@ production: database: conductor username: aeolus password: v23zj59an + allow_concurrency: true host: localhost cucumber: -- 1.7.6.2

3 3

[PATCH 1/3] Document undocumented hard-coded 300 second timeout and default timout value.
by Steven Dake 18 Oct '11

18 Oct '11

Signed-off-by: Steven Dake <sdake(a)redhat.com> --- man/oz-install.1 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/man/oz-install.1 b/man/oz-install.1 index b497813..7cf0077 100644 --- a/man/oz-install.1 +++ b/man/oz-install.1 @@ -70,9 +70,14 @@ will undefine the libvirt guest with the same name or UUID and delete the diskimage, so it should be used with caution. .TP .B "\-t" -Use a timeout value of \fBtimeout\fR for installation, rather than the -oz default. This can be useful if you know you have slower storage -and want to wait longer for the installation to timeout. +Terminate the installation of the guest image in \fBtimeout\fR seconds +rather then the default of 1200 seconds. This value can be increased in the +case of slow storage or multiple oz-install operations on the same machine +consuming the disk bandwidth. + +Please note there is a separate termination action that occurs if 300 seconds +elapses before any data is written to the VM image. This timer value is not +configurable. .TP .B "\-u" Customize the image after installation. This generally installs -- 1.7.4.4

5 23

Let's switch to GitHub
by Matt Wagner 05 Oct '11

05 Oct '11

Hi all, I'd like to propose that we move Conductor and aeolus-configure over to GitHub. (Bear with me for one second, please.) "But wait," you're thinking. "Didn't we just have that discussion the other week?" Not like this. What I'd like to propose is that we keep our workflow exactly the same as it is today, but move the repository from FedoraHosted to GitHub. We'll still send patches to the list, have someone test them and send an ACK to the list, and then push the code. It'll just be to the git repo on GitHub instead of the repo on FedoraHosted. Why do this? Two reasons, really: a.) Most of the other Aeolus projects are already on GitHub. This way, everything will be in one place. b.) GitHub is a lot more widely-known than FedoraHosted. If we link people in the community to the GitHub page for Conductor, most will instinctively know how to clone the source and how to start contributing. As it is today, I have to cat .git/config to have any idea where our repo lives. I think that we should probably do this at the end of this sprint before starting the next one, since I imagine moving it mid-sprint would be too disruptive. Does anyone object to this change? I think the change will look something like this: 1.) Create the Conductor and aeolus-configure repos on GitHub, and give existing developers commit rights there 2.) Change our .git/config files to point there 3.) Update the aeolusproject.org site which has documentation pointing to the FH repos 4.) Update Redmine's repo browser to use the new location 5.) Modify Jenkins to use the GitHub repo 6.) Send out an email explaining the change and telling everyone what they need to do 7.) Add a logo to the main Aeolus Project organization to replace the default octocat Again, I'm happy to take the lead on making this happen, but I want to make sure there's consensus. (Plus, I don't have rights to the project right now.) What do you think? Best, Matt

8 18

OAuth in iwhd preview patch
by Pete Zaitcev 04 Oct '11

04 Oct '11

Guys: Below is what I have now for 2-legged OAuth in iwhd. It actually works, with oauthtest2 from liboauth. The patch is only a small piece, since it has no client, which we need to run the tests, has no documentation, and no user list. However, it retires most of the risk. We know that it can be done, this way. The biggest risk left is interoperability with Aeolus. BTW, the OAuth header looks like this: Authorization: OAuth realm="http://example.org/", oauth_consumer_key="chiaki", oauth_nonce="mitPzrhrCMHABJiYava_", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1317182031", oauth_version="1.0", oauth_signature="Ya36%2FkXTG5YATRx%2BWAXK9NXzZCg%3D" -- Pete diff --git a/configure.ac b/configure.ac index e23d1fa..8b115cb 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,9 @@ AC_CHECK_LIB([uuid], [uuid_generate_random], [AC_MSG_ERROR([Missing required uuid lib])]) AC_SUBST([UUID_LIB]) +dnl How to check properly? +LIBS="$LIBS -loauth" + PKG_CHECK_MODULES([HAIL],[libhail >= 0.8]) AC_SUBST([HAIL_LIBS]) AC_SUBST([HAIL_CFLAGS]) @@ -97,6 +100,9 @@ AC_CACHE_CHECK([whether json_load_file takes 3 arguments], AC_DEFINE_UNQUOTED([JANSSON_LOAD_FLAG], $iw_cv_func_jansson_flag, [Define to "0," if json_load_file and json_loads require a flags arguments.]) +AC_CHECK_HEADER([oauth.h], , + [AC_MSG_ERROR([Missing OAuth development library: liboauth-devel])]) + # from http://www.gnu.org/software/autoconf-archive/ AX_BOOST_BASE AX_BOOST_SYSTEM diff --git a/rest.c b/rest.c index 92f36cb..fec602c 100644 --- a/rest.c +++ b/rest.c @@ -15,12 +15,14 @@ #include <config.h> +#include <ctype.h> #include <error.h> #include <fcntl.h> #include <getopt.h> #include <poll.h> #include <pthread.h> #include <semaphore.h> +#include <stdbool.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -33,6 +35,7 @@ #include <microhttpd.h> #include <hstor.h> /* only for ARRAY_SIZE at this point */ #include <curl/curl.h> +#include <oauth.h> #include "configmake.h" /* for LOCALEDIR */ #include "dirname.h" @@ -113,6 +116,9 @@ static unsigned short my_port = MY_PORT; static LIST_HEAD(gc_list, _my_state) my_states; /* this keeps GC informed */ static pthread_mutex_t my_lock = PTHREAD_MUTEX_INITIALIZER; static const char *log_name; +static char my_hostname[HOST_NAME_MAX+1]; +static bool oauth = false; +static const char *username, *userpass; static const char *const (reserved_name[]) = {"_default", "_new", "_policy", "_query", NULL}; static const char *const (reserved_attr[]) = {"_attrs", "_bucket", "_date", "_etag", "_key", "_loc", "_size", NULL}; @@ -2091,6 +2097,454 @@ parse_url (const char *url, my_state *ms) return eindex; } +/* TBD: evict this to "user.h" once -U is gone. */ +#define USERNAME_MAX 64 +#define USERPASS_MAX 64 +struct user { + char name[USERNAME_MAX+1]; + char pass[USERPASS_MAX+1]; +}; + +static struct user * +user_lookup (const char *user) +{ + struct user *ret; + + /* + * We do not have a real user table yet, so just compare with -U. + */ + if (username == NULL || strcmp(user, username) != 0) + return NULL; + + ret = malloc(sizeof(struct user)); + if (!ret) + return NULL; + memset(ret,0,sizeof(struct user)); + strcpy(ret->name, username); + strcpy(ret->pass, userpass); + return ret; +} + +static char * +rebuild_url(bool is_ssl, struct MHD_Connection *conn, const char *path) +{ + const char *val; + char *ret; + int rc; + + /* + * Luckily for us, this header includes the colon-port. + * It really should be called "Netloc", not "Host". + */ + val = MHD_lookup_connection_value(conn,MHD_HEADER_KIND,"Host"); + if (!val) { + if (my_hostname[0] == 0) { + if (gethostname(my_hostname, HOST_NAME_MAX) != 0) { + /* TBD: This may flood - user-driven. */ + error (0, errno, _("gethostname")); + return NULL; + } + my_hostname[HOST_NAME_MAX] = 0; + } + /* TBD: And port? But this is a fall-back anyway. */ + val = my_hostname; + } + + rc = asprintf(&ret, "%s://%s%s", is_ssl? "https": "http", val, path); + if (rc < 0) { + DPRINTF("No core"); + return NULL; + } + return ret; +} + +static const char * +auth_type_check (const char *val, const char *type) +{ + const char *p; + size_t tlen = strlen(type); + + p = val; + while (*p == ' ') { + if (*p == 0) { + return false; + } + p++; + } + if (strncmp(p, type, tlen) != 0) + return false; + p += tlen; + if (*p != ' ') + return false; + p++; + while (*p == ' ') { + if (*p == 0) { + return false; + } + p++; + } + return p; +} + +/* + * Split up an Authorization header. + * Note that this decodes the strings. + */ +static bool +auth_hdr_split (int *pargc, char ***pargv, const char *val) +{ + enum { ARGC_MAX = 20 }; /* better than 2-pass */ + enum { VAL_MAX = 512 }; /* a constant is not great, but... */ + enum { + ST_NONE, ST_ERR, ST_KEY, ST_EQ, ST_VAL, ST_Q2, ST_COM, + ST_PCENT1, ST_PCENT2 + } state; + int argc; + char **argv; + const char *p; + const char *key; + size_t klen = 0; + size_t vlen = 0; + char vbuf[VAL_MAX+1]; + unsigned int acc = 0, n; + char *arg; + + if (!(val = auth_type_check(val, "OAuth"))) + return false; + + argv = malloc((ARGC_MAX+1) * sizeof(char*)); + if (!argv) { + return false; + } + argc = 0; + + arg = NULL; + state = ST_NONE; + key = NULL; + for (p = val; *p != 0; p++) { + switch (state) { + case ST_NONE: + if (*p == ' ') { + ; + } + else if (!isascii(*p) || !isalpha(*p)) { + state = ST_ERR; + } + else { + state = ST_KEY; + key = p; + } + break; + case ST_KEY: + if (*p == '=') { + state = ST_EQ; + klen = p-key; + } + break; + case ST_EQ: + if (*p == '"') { + state = ST_VAL; + vlen = 0; + } + else { + /* + * A compiler writer would've had an ulcer + * from this, because obviously we are going + * to recover in a dirty way. But whatever, + * all we want is an error indication. + */ + state = ST_ERR; + } + break; + case ST_VAL: + if (*p == '"') { + vbuf[vlen] = 0; + state = ST_Q2; + } + else if (*p == '%') { + state = ST_PCENT1; + acc = 0; + } + else { + vbuf[vlen++] = *p; + } + break; + case ST_PCENT1: + if (isxdigit(*p)) { + if (*p <= '9') { + n = toupper(*p) - '0'; + } else { + n = toupper(*p) - 'A' + 10; + } + acc = (acc << 4) | (n & 0x0f); + state = ST_PCENT2; + } else { + state = ST_ERR; + } + break; + case ST_PCENT2: + if (isxdigit(*p)) { + if (*p <= '9') { + n = toupper(*p) - '0'; + } else { + n = toupper(*p) - 'A' + 10; + } + acc = (acc << 4) | (n & 0x0f); + if (iscntrl(acc)) + acc = '?'; + if (vlen >= VAL_MAX) { + state = ST_ERR; + break; + } + vbuf[vlen++] = acc; + state = ST_VAL; + } + else { + state = ST_ERR; + } + break; + case ST_Q2: + if (*p == ',') { + arg = malloc(klen+1+vlen+1); + if (!arg) { + state = ST_ERR; + break; + } + memcpy(arg, key, klen); + arg[klen] = '='; + memcpy(arg+klen+1, vbuf, vlen); + arg[klen+1+vlen] = 0; + + state = ST_COM; + key = NULL; + } + else { + state = ST_ERR; + } + break; + case ST_COM: + if (*p == ' ') { + if (!arg) { + state = ST_NONE; + key = NULL; + break; + } + if (argc >= ARGC_MAX) { + /* TBD: error out immediately */ + state = ST_ERR; + break; + } + argv[argc++] = arg; + arg = NULL; + state = ST_NONE; + key = NULL; + } + else { + state = ST_ERR; + } + default: // ST_ERR + if (*p == ',') { + state = ST_COM; + } + } + } + + if (arg) { + DPRINTF("auth_hdr_split ended with arg %s\n", arg); + free (arg); + } + + if (state == ST_Q2) { + if (key) { + arg = malloc(klen+1+vlen+1); + if (arg && argc < ARGC_MAX) { + memcpy(arg, key, klen); + arg[klen] = '='; + memcpy(arg+klen+1, vbuf, vlen); + arg[klen+1+vlen] = 0; + argv[argc++] = arg; + } + } + } + argv[argc] = NULL; + + *pargc = argc; + *pargv = argv; + return true; +} + +/* Extract the value from key="val". */ +static char * +oauth_param_val(const char *arg) { + char *val; + + val = strchr(arg, '='); + if (!val) + return NULL; + val++; + if (*val == 0) + return NULL; + return strdup(val); +} + +/* clone of oauth_param_exists with minimal changes */ +static int +oauth_param_find(char **argv, int argc, const char *key) { + int i; + size_t l= strlen(key); + for (i=0;i<argc;i++) + if (strlen(argv[i])>l && !strncmp(argv[i],key,l) && argv[i][l] == '=') return i; + return -1; +} + +static int +do_oauth (struct MHD_Connection *conn, my_state *ms, + const char *url, const char *method) +{ + const char *val; + struct MHD_Response *resp; + int argc; + char **argv; + int oargc; + char **oargv; + int x; + struct user *u; + char *sig_supplied, *sig_calculated; + + val = MHD_lookup_connection_value(conn,MHD_HEADER_KIND,"Authorization"); + if (!val) { + resp = MHD_create_response_from_data(0,NULL,MHD_NO,MHD_NO); + if (!resp) { + return -1; + } + MHD_add_response_header(resp,"WWW-Authenticate","OAuth"); + MHD_queue_response(conn,MHD_HTTP_UNAUTHORIZED,resp); + MHD_destroy_response(resp); + return 1; + } + + if (!auth_hdr_split(&argc, &argv, val)) { + do_resp(conn,NULL,MHD_HTTP_BAD_REQUEST,NULL,"400\r\n"); + return -1; + } + if (verbose >= 2) { + int i; + printf("OAuth supplied [%d]\n", argc); + for (i = 0; i < argc; i++) { + printf(" %s\n", argv[i]); + } + } + + x = oauth_param_find(argv,argc,"oauth_consumer_key"); + if (x == -1) { + do_resp(conn,NULL,MHD_HTTP_BAD_REQUEST,NULL,"400 no user\r\n"); + return -1; + } + + u = user_lookup(oauth_param_val(argv[x])); + if (!u) { + do_resp(conn,NULL,MHD_HTTP_FORBIDDEN,NULL,"403 bad user\r\n"); + return -1; + } + + /* + * Putting marshalling arguments for and extracting results from + * oauth_sign_array2_process makes you dirty, but this way offloads + * some tricks to liboauth, so there. + * XXX - verify HMAC or other type + */ + oargc = 1+argc; /* add a slot for URL */ + + /* + * If we just call malloc() here, we actually involve a function + * intercepted by GC. Then, glibc will abort inside liboauth + * oauth_sign_array2_process->xrealloc->free() => "invalid pointer". + * Solution: use a random liboauth function which allocates + * the memory we need. The result can be safely passed to liboauth. + */ + oargv = malloc((oargc+1)*sizeof(char*)); + + memset((void*)oargv, '0', (oargc+1)*sizeof(char*)); + ((char *)oargv)[(oargc+1)*sizeof(char*) - 1] = 0; + oargv = (char **) oauth_url_escape((char *)oargv); + + if (!oargv) { + do_resp(conn,NULL,MHD_HTTP_INTERNAL_SERVER_ERROR,NULL, + "500\r\n"); + return -1; + } + oargv[0] = rebuild_url(false, conn, url); /* TBD: SSL */ + if (!oargv[0]) { + do_resp(conn,NULL,MHD_HTTP_INTERNAL_SERVER_ERROR,NULL, + "500\r\n"); + return -1; + } + + // no good, must filter + // memcpy(&oargv[1], argv, (argc+1)*sizeof(char*)); + + oargc = 1; + + x = oauth_param_find(argv,argc,"oauth_nonce"); + if (x == -1) { + do_resp(conn,NULL,MHD_HTTP_BAD_REQUEST,NULL,"400 no nonce\r\n"); + return -1; + } + oargv[oargc++] = argv[x]; + + x = oauth_param_find(argv,argc,"oauth_timestamp"); + if (x == -1) { + do_resp(conn,NULL,MHD_HTTP_BAD_REQUEST,NULL, + "400 no timestamp\r\n"); + return -1; + } + oargv[oargc++] = argv[x]; + + oauth_sign_array2_process(&oargc, &oargv, NULL, OA_HMAC, method, + u->name, u->pass, NULL, NULL); + if (verbose >= 2) { + int i; + printf("OAuth calculated\n"); + for (i = 0; i < oargc; i++) { + printf(" %s\n", oargv[i]); + } + } + + /* + * We've got the signature, now verify. + */ + x = oauth_param_find(argv,argc,"oauth_signature"); + if (x == -1) { + do_resp(conn,NULL,MHD_HTTP_BAD_REQUEST,NULL, + "400 no signature\r\n"); + return -1; + } + sig_supplied = oauth_param_val(argv[x]); + + x = oauth_param_find(oargv,oargc,"oauth_signature"); + if (x == -1) { + do_resp(conn,NULL,MHD_HTTP_INTERNAL_SERVER_ERROR,NULL, + "500 no signature\r\n"); + return -1; + } + sig_calculated = oauth_param_val(oargv[x]); + + if (strcmp(sig_supplied, sig_calculated) != 0) { + DPRINTF("OAuth signature mismatch"); + return -1; + } + return 0; +} + +static int kv_iter_dump(void *cls, enum MHD_ValueKind kind, + const char *key, const char *value) +{ + /* ok to use printf when MHD_USE_THREAD_PER_CONNECTION maybe? */ + printf("%s: %s\n", key, value); + + return MHD_YES; +} + static int access_handler_0 (void *cctx, struct MHD_Connection *conn, const char *url, const char *method, const char *version, const char *data, @@ -2099,10 +2553,24 @@ access_handler_0 (void *cctx, struct MHD_Connection *conn, const char *url, unsigned int i; url_type utype; my_state *ms = *rctx; + int rc; log_check(); + if (verbose >= 2) { + printf(">> HTTP\n"); + rc = MHD_get_connection_values(conn, MHD_HEADER_KIND, + kv_iter_dump, NULL); + printf(">> headers: %d\n", rc); + } if (ms) { + if (oauth) { + rc = do_oauth(conn,ms,url,method); + if (rc < 0) + return MHD_NO; + if (rc > 0) + return MHD_YES; + } return ms->handler(cctx,conn,url,method,version, data,data_size,rctx); } @@ -2131,12 +2599,20 @@ access_handler_0 (void *cctx, struct MHD_Connection *conn, const char *url, ms->conn = conn; *rctx = ms; pthread_mutex_lock(&my_lock); - LIST_INSERT_HEAD(&my_states, ms, gc_link); + LIST_INSERT_HEAD(&my_states,ms,gc_link); pthread_mutex_unlock(&my_lock); + if (oauth) { + rc = do_oauth(conn,ms,url,method); + if (rc < 0) + return MHD_NO; + if (rc > 0) + return MHD_YES; + } return ms->handler(cctx,conn,url,method,version, data,data_size,rctx); } + /* This is *unauthenticated*. Remove altogether? TBD */ if (!strcmp(method,"QUIT")) { (void)sem_post((sem_t *)cctx); return MHD_NO; @@ -2194,7 +2670,9 @@ static const struct option my_options[] = { { "db", required_argument, NULL, 'd' }, { "logfile", required_argument, NULL, 'l' }, { "master", required_argument, NULL, 'm' }, + { "oauth", no_argument, NULL, 'o' }, { "port", required_argument, NULL, 'p' }, + { "usercred", required_argument, NULL, 'U' }, { "verbose", no_argument, NULL, 'v' }, { "version", no_argument, NULL, GETOPT_VERSION_CHAR }, { "help", no_argument, NULL, GETOPT_HELP_CHAR }, @@ -2222,7 +2700,9 @@ A configuration file must be specified.\n\ -d, --db=HOST_PORT database server as ip[:port]\n\ -l, --logfile=FILE logfile (default stdout/stderr)\n\ -m, --master=HOST_PORT master (upstream) server as ip[:port]\n\ + -o, --oauth enable OAuth\n\ -p, --port=PORT alternate listen port (default 9090)\n\ + -U, --usercred=U:P singleton pair of username:password\n\ -v, --verbose verbose/debug output\n\ \n\ --help display this help and exit\n\ @@ -2275,6 +2755,7 @@ main (int argc, char **argv) sem_t the_sem; bool autostart = false; char *cfg_file = NULL; + char *usercred = NULL; set_program_name (argv[0]); setlocale (LC_ALL, ""); @@ -2287,7 +2768,8 @@ main (int argc, char **argv) db_host = xstrdup ("localhost"); for (;;) - switch (getopt_long(argc,argv,"ac:d:l:m:p:v",my_options,NULL)) { + switch (getopt_long(argc,argv,"ac:d:l:m:op:U:v",my_options,NULL)) + { case 'a': autostart = true; break; @@ -2308,10 +2790,16 @@ main (int argc, char **argv) free (master_host); master_host = NULL; extract_host_port (optarg, &master_host, &master_port); break; + case 'o': + oauth = true; + break; case 'p': assert (optarg); my_port = get_port (optarg); break; + case 'U': /* Uppercase because very temporary until -u appears. */ + usercred = optarg; + break; case 'v': ++verbose; break; @@ -2366,6 +2854,30 @@ args_done: usage (EXIT_FAILURE); } + if (usercred) { + const char *p = strchr(usercred,':'); + if (!p) { + error (0, 0, _("The -U argument must contain a colon")); + usage (EXIT_FAILURE); + } + if (p == usercred) { + error (0, 0, + _("The user part of -U argument is empty")); + usage (EXIT_FAILURE); + } + username = strndup(usercred,p-usercred); + userpass = strdup(p+1); + if (!username || !userpass) { + error (EXIT_FAILURE, 0, _("No core")); + } + if (strlen(username) > USERNAME_MAX) { + error (EXIT_FAILURE, 0, _("User name too long")); + } + if (strlen(userpass) > USERPASS_MAX) { + error (EXIT_FAILURE, 0, _("User password too long")); + } + } + char *t; char const *tmpdir = ((t = getenv ("TMPDIR")) ? t : "/tmp"); tmpfile_template = xasprintf ("%s/iwhd.XXXXXX", tmpdir); @@ -2382,6 +2894,9 @@ args_done: printf("db is at %s:%u\n",db_host,db_port); printf("will listen on port %u\n",my_port); printf("my location is \"%s\"\n",me); + if (oauth) { + printf("autheticated with OAuth\n"); + } if (fflush(stdout) || ferror(stdout)) error(EXIT_FAILURE, 0, _("write failed")); }

4 7

[PATCH 0/1] Accounts Tab in Provider
by Jirka Tomasek 04 Oct '11

04 Oct '11

This patch adds Accounts Tab in Provider. Having Provider Accounts listed under filter view of Connectivity tab is confusing. This fixes BZ741469 (https://bugzilla.redhat.com/show_bug.cgi?id=741469) Patch needs to be applied on Admin UI Bugfixes rev1 patchset

2 9

[PATCH conductor] Implement User card automatic filling with the form information
by jzigmund＠redhat.com 03 Oct '11

03 Oct '11

From: Jozef Zigmund <jzigmund(a)redhat.com> --- src/app/stylesheets/custom.scss | 11 +++++++++++ src/app/views/users/_form.haml | 28 +++++++++++++++++++++++----- src/app/views/users/edit.haml | 7 ++++--- src/app/views/users/new.haml | 7 ++++--- 4 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index d019798..967137b 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -47,3 +47,14 @@ ul.deployment-array.small li.deployment { height: 90px; } + +div#user_card header.user-card-header h2#first_name { + color: white; + padding: 15px 10px 10px 60px; + background: transparent url('../../images/user_card_icon.png') no-repeat 12px 10px; +} + +div#user_card header.user-card-header h2#first_name + h2#last_name { + padding: 0px; + background: transparent; +} \ No newline at end of file diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml index 43f49f8..0289025 100644 --- a/src/app/views/users/_form.haml +++ b/src/app/views/users/_form.haml @@ -1,20 +1,20 @@ - if @user.errors.any? = render 'layouts/error_messages', :object => @user -%fieldset +%fieldset.kokot %p = form.label :first_name, t(:first_name) - = form.text_field :first_name + = form.text_field :first_name, :class =>"check_change" %p = form.label :last_name, t(:last_name) - = form.text_field :last_name + = form.text_field :last_name, :class =>"check_change" %p = form.label :email, t(:email) - = form.text_field :email + = form.text_field :email, :class =>"check_change" %fieldset %p = form.label :login, t(:choose_name) - = form.text_field :login, :class => "em" + = form.text_field :login, :class => "em check_change" %p = form.label :password, form.object.new_record? ? t(:choose_password) : t(:change_password) = form.password_field :password @@ -48,3 +48,21 @@ %fieldset.options = form.submit "Save User", :class => "submit button pill" + +:javascript + $('.check_change').change(function(){ + switch(this.id){ + case 'user_last_name': + $('h2#last_name').text(this.value); + break; + case 'user_first_name': + $('h2#first_name').text(this.value); + break; + case 'user_email': + $('dd#email').text(this.value); + break; + case 'user_login': + $('dd#login').text(this.value); + break; + } + }); diff --git a/src/app/views/users/edit.haml b/src/app/views/users/edit.haml index ddbb891..aebcfd7 100644 --- a/src/app/views/users/edit.haml +++ b/src/app/views/users/edit.haml @@ -12,12 +12,13 @@ .content #user_card.user_form_card %header.user-card-header - %h2= @user.name + %h2#first_name= @user.first_name + %h2#last_name= @user.last_name .user-card-content %dl %dt E-mail Address - %dd= @user.email + %dd#email= @user.email %dt Username - %dd= @user.login + %dd#login= @user.login = form_for @user, :url => user_path(@user), :html => { :method => :put, :class => 'generic' } do |f| = render :partial => "form", :locals => { :form => f, :cancel_path => users_path } diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml index d5d76d9..ca41a1b 100644 --- a/src/app/views/users/new.haml +++ b/src/app/views/users/new.haml @@ -14,13 +14,14 @@ %br #user_card.user_form_card %header.user-card-header - %h2 Kenneth Keiter + %h2 Kenneth + %h2#last_name Keiter .user-card-content %dl %dt E-mail Address - %dd kkeiter(a)redhat.com + %dd#email kkeiter(a)redhat.com %dt Username - %dd kkeiter + %dd#login kkeiter = form_for @user, :url => users_path, :html => {:class => 'generic'} do |f| -if current_user = render :partial => "form", :locals => { :form => f } -- 1.7.6.2

3 4

RFC: proposal for upcoming release of aeolus project components
by steve linabery 03 Oct '11

03 Oct '11

Hello aeolus community, I think it's high time we did a community release of aeolus components. To quote an aeolus thought leader: "we have good reasons for doing it now -- we've got most stuff working end to end again on rails 3, we've pulled Condor, we have an admin UI, we have a (not perfect but adequate) permissions management UI, etc." And I agree; we're overdue and the time is right. There is an 0.4.0 branch in conductor git repo which needs to be brought up current with master, and then I say we tag a RC early next week and pick over commits through end of sprint. Steve|eggs

2 1

[PATCH conductor] Fix delete button on deployment#show
by jzigmund＠redhat.com 03 Oct '11

03 Oct '11

From: Jozef Zigmund <jzigmund(a)redhat.com> --- src/app/views/deployments/_header_show.haml | 2 +- src/features/deployment.feature | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/views/deployments/_header_show.haml b/src/app/views/deployments/_header_show.haml index 8d03753..a1ea557 100644 --- a/src/app/views/deployments/_header_show.haml +++ b/src/app/views/deployments/_header_show.haml @@ -3,5 +3,5 @@ = [@deployment.name, "Deployment"].join(' ') #obj_actions.button-container .button-group - = button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger", :id => 'delete_button' + = button_to 'Delete', deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger", :id => 'delete' .corner   diff --git a/src/features/deployment.feature b/src/features/deployment.feature index e246c1a..aab0c5c 100644 --- a/src/features/deployment.feature +++ b/src/features/deployment.feature @@ -175,7 +175,7 @@ Feature: Manage Deployments Given there is a deployment named "testdeployment" belonging to "testdeployable" owned by "testuser" And I am on the pools page When I follow "testdeployment" - And I press "delete_button" + And I press "delete" Then I should see "The deployment testdeployment was scheduled for deletion" Scenario: Delete multiple deployments @@ -195,7 +195,7 @@ Feature: Manage Deployments And the instance "myinstance" is in the running state And I am on the pools page When I follow "mockdeployment" - And I press "delete_button" + And I press "delete" Then I should see "The deployment mockdeployment was scheduled for deletion" Scenario: Launch a deployment which is not launchable -- 1.7.6.2

2 1

[PATCH conductor] Fix flash messages for multi_stop action in deployments_controller
by jzigmund＠redhat.com 03 Oct '11

03 Oct '11

From: Jozef Zigmund <jzigmund(a)redhat.com> --- src/app/controllers/deployments_controller.rb | 8 ++++---- src/app/views/layouts/_new_notification.haml | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/app/controllers/deployments_controller.rb b/src/app/controllers/deployments_controller.rb index 98171a9..b74bebb 100644 --- a/src/app/controllers/deployments_controller.rb +++ b/src/app/controllers/deployments_controller.rb @@ -234,8 +234,8 @@ class DeploymentsController < ApplicationController end def multi_stop - notices = "" - errors = "" + notices = [] + errors = [] Deployment.find(params[:deployments_selected] || []).each do |deployment| deployment.instances.each do |instance| begin @@ -250,9 +250,9 @@ class DeploymentsController < ApplicationController raise ActionError.new("stop cannot be performed on this instance.") end Taskomatic.stop_instance(@task) - notices << "Deployment: #{instance.deployment.name}, Instance: #{instance.name}: stop action was successfully queued.<br/>" + notices << "Deployment: #{instance.deployment.name}, Instance: #{instance.name}: stop action was successfully queued." rescue Exception => err - errors << "Deployment: #{instance.deployment.name}, Instance: #{instance.name}: " + err + "<br/>" + errors << "Deployment: #{instance.deployment.name}, Instance: #{instance.name}: " + err end end end diff --git a/src/app/views/layouts/_new_notification.haml b/src/app/views/layouts/_new_notification.haml index 33a654c..e248684 100644 --- a/src/app/views/layouts/_new_notification.haml +++ b/src/app/views/layouts/_new_notification.haml @@ -14,7 +14,11 @@ %div.heading =image_tag 'flash_notice_icon.png', :alt => 'Notices' %ul.flashes - %li= flash[:notice] + -if flash[:notice].kind_of?(Array) + -flash[:notice].each do |msg| + %li= msg + -else flash[:notice] + %li= flash[:notice] -if flash[:warning] .warning.flash-group @@ -30,7 +34,7 @@ %div.heading =image_tag 'flash_error_icon.png', :alt => 'Errors' =flash[:error] - -else + -elsif flash[:error].kind_of?(Hash) -unless flash[:error][:successes].blank? .notice.flash-group .flash-subset @@ -55,3 +59,11 @@ -else -flash[:error].each do |e| %li= e + -elsif flash[:error].kind_of?(Array) + .error.flash-group + .flash-subset + %div.heading + =image_tag 'flash_error_icon.png', :alt => 'Errors' + %ul.flashes + -flash[:error].each do |msg| + %li= msg -- 1.7.6.2

2 1

[PATCH conductor 1/3] Updated "Content" admin section
by Jan Provazník 03 Oct '11

03 Oct '11

From: Jan Provaznik <jprovazn(a)redhat.com> https://www.aeolusproject.org/redmine/issues/2420 Tabs which are not accessible from anywhere are now linked from "Content" section (catalogs, realms, hw profiles). Not saying this is ideal but allows users to navigate to this sections for now. What is not still accessible is "Settings" tab - maybe it could be separate section? --- src/app/controllers/application_controller.rb | 9 +++++++++ src/app/controllers/catalogs_controller.rb | 5 +++++ .../controllers/hardware_profiles_controller.rb | 11 ++++++++--- src/app/controllers/realms_controller.rb | 5 +++++ src/app/views/catalogs/_list.haml | 7 ++++--- src/app/views/catalogs/index.haml | 3 +-- src/app/views/catalogs/new.haml | 14 ++++++++------ src/app/views/hardware_profiles/_list.haml | 2 +- src/app/views/hardware_profiles/index.haml | 3 +-- src/app/views/hardware_profiles/new.haml | 16 +++++++++------- src/app/views/layouts/_admin_content_tabs.haml | 14 ++++++++++++++ src/app/views/realms/index.haml | 3 +-- src/config/navigation.rb | 4 ++-- 13 files changed, 68 insertions(+), 28 deletions(-) create mode 100644 src/app/views/layouts/_admin_content_tabs.haml diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 8f8934c..b2d7453 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -232,4 +232,13 @@ class ApplicationController < ActionController::Base session[:breadcrumbs] = breadcrumbs end + def set_admin_content_tabs(tab) + @tabs = [{:name => 'Catalogs', :url => catalogs_url, :id => 'catalogs'}, + {:name => 'Realms', :url => realms_url, :id => 'realms'}, + {:name => 'Hardware', :url => hardware_profiles_url, :id => 'hardware_profiles'}, + ] + unless @details_tab = @tabs.find {|t| t[:id] == tab} + raise "Tab '#{tab}' doesn't exist" + end + end end diff --git a/src/app/controllers/catalogs_controller.rb b/src/app/controllers/catalogs_controller.rb index e299f98..59b0eca 100644 --- a/src/app/controllers/catalogs_controller.rb +++ b/src/app/controllers/catalogs_controller.rb @@ -24,6 +24,11 @@ class CatalogsController < ApplicationController @catalogs = Catalog.list_for_user(current_user, Privilege::VIEW) save_breadcrumb(catalogs_path(:viewstate => @viewstate ? @viewstate.id : nil)) set_header + set_admin_content_tabs 'catalogs' + respond_to do |format| + format.html + format.js { render :partial => 'list' } + end end def new diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb index b478873..8df760f 100644 --- a/src/app/controllers/hardware_profiles_controller.rb +++ b/src/app/controllers/hardware_profiles_controller.rb @@ -27,12 +27,17 @@ class HardwareProfilesController < ApplicationController clear_breadcrumbs save_breadcrumb(hardware_profiles_path) @params = params + set_admin_content_tabs 'hardware_profiles' respond_to do |format| format.html format.js do - build_hardware_profile(params[:hardware_profile]) - matching_provider_hardware_profiles - render :partial => 'matching_provider_hardware_profiles' and return + if params[:hardware_profile] + build_hardware_profile(params[:hardware_profile]) + matching_provider_hardware_profiles + render :partial => 'matching_provider_hardware_profiles' + else + render :partial => 'list' + end end end end diff --git a/src/app/controllers/realms_controller.rb b/src/app/controllers/realms_controller.rb index 8e707b6..0e9e64e 100644 --- a/src/app/controllers/realms_controller.rb +++ b/src/app/controllers/realms_controller.rb @@ -23,6 +23,11 @@ class RealmsController < ApplicationController def index clear_breadcrumbs save_breadcrumb(realms_path) + set_admin_content_tabs 'realms' + respond_to do |format| + format.html + format.js { render :partial => 'list' } + end end def new diff --git a/src/app/views/catalogs/_list.haml b/src/app/views/catalogs/_list.haml index 3e1a6cf..9b0555d 100644 --- a/src/app/views/catalogs/_list.haml +++ b/src/app/views/catalogs/_list.haml @@ -1,11 +1,12 @@ %section.admin-content-section.catalogs - %header - %h2 Catalogs List - %span.label.badge.dark.count= @catalogs.length + /%header + / %h2 Catalogs List + / %span.label.badge.dark.count= @catalogs.length .content - content_for :form_header do %li= restful_submit_tag "Delete", "destroy", multi_destroy_catalogs_path, 'DELETE', :id => 'delete_button', :class => 'button danger' + %li= link_to "New Catalog", new_catalog_path, :id => 'new_catalog_button', :class => 'button pill' = filter_table(@header, @catalogs) do |catalog| %tr{:class => cycle('nostripe','stripe')} diff --git a/src/app/views/catalogs/index.haml b/src/app/views/catalogs/index.haml index 3fae6b6..947fd74 100644 --- a/src/app/views/catalogs/index.haml +++ b/src/app/views/catalogs/index.haml @@ -1,3 +1,2 @@ = render :partial => 'layouts/admin_nav' -= render :partial => 'section_header' -= render :partial => 'list' += render :partial => 'layouts/admin_content_tabs' diff --git a/src/app/views/catalogs/new.haml b/src/app/views/catalogs/new.haml index be583cf..1b24fa7 100644 --- a/src/app/views/catalogs/new.haml +++ b/src/app/views/catalogs/new.haml @@ -1,10 +1,12 @@ = render :partial => 'layouts/admin_nav' -= render :partial => 'section_header' -%section.admin-content-section.provider_accounts +%header.admin-page-header %header - %h2 Add New Catalog + %h1 Add New Catalog + #obj_actions + Return to: + = link_to "Catalogs", catalogs_path, :class => 'rounded-link' - .content - = form_for @catalog, :url => catalogs_path, :html => {:class => 'generic'} do |f| - = render :partial => "form", :locals => { :form => f } +%section.admin-content-section + = form_for @catalog, :url => catalogs_path, :html => {:class => 'generic'} do |f| + = render :partial => "form", :locals => { :form => f } diff --git a/src/app/views/hardware_profiles/_list.haml b/src/app/views/hardware_profiles/_list.haml index d40d837..013cb8b 100644 --- a/src/app/views/hardware_profiles/_list.haml +++ b/src/app/views/hardware_profiles/_list.haml @@ -1,7 +1,7 @@ .content - content_for :form_header do %li= restful_submit_tag "Delete Selected", "destroy", multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button pill danger' - %li= link_to "New Hardware", new_hardware_profile_path, :id => 'new_hardware_profile', :class => 'button pill' + %li= link_to "New Hardware", new_hardware_profile_path, :id => 'new_hardware_profile_button', :class => 'button pill' = filter_table(hardware_profiles_header, @hardware_profiles) do |hwp| %tr{:class => cycle('nostripe','stripe')} diff --git a/src/app/views/hardware_profiles/index.haml b/src/app/views/hardware_profiles/index.haml index 3fae6b6..947fd74 100644 --- a/src/app/views/hardware_profiles/index.haml +++ b/src/app/views/hardware_profiles/index.haml @@ -1,3 +1,2 @@ = render :partial => 'layouts/admin_nav' -= render :partial => 'section_header' -= render :partial => 'list' += render :partial => 'layouts/admin_content_tabs' diff --git a/src/app/views/hardware_profiles/new.haml b/src/app/views/hardware_profiles/new.haml index 5d5f3f4..795a706 100644 --- a/src/app/views/hardware_profiles/new.haml +++ b/src/app/views/hardware_profiles/new.haml @@ -1,12 +1,14 @@ = render :partial => 'layouts/admin_nav' -= render :partial => 'section_header' -%section.admin-content-section +%header.admin-page-header %header - %h2 New Hardware Profile + %h1 New Hardware Profile + #obj_actions + Return to: + = link_to "Hardware Profiles", hardware_profiles_path, :class => 'rounded-link' - .content - = form_for @hardware_profile, :url => hardware_profiles_path, :html => { :multipart => true } do |hwp_form| - = render :partial => "form", :locals => { :hwp_form => hwp_form } +%section.admin-content-section + = form_for @hardware_profile, :url => hardware_profiles_path, :html => { :multipart => true } do |hwp_form| + = render :partial => "form", :locals => { :hwp_form => hwp_form } - = render :partial => 'matching_provider_hardware_profiles' if params[:commit] == 'Check Matches' + = render :partial => 'matching_provider_hardware_profiles' if params[:commit] == 'Check Matches' diff --git a/src/app/views/layouts/_admin_content_tabs.haml b/src/app/views/layouts/_admin_content_tabs.haml new file mode 100644 index 0000000..57d551a --- /dev/null +++ b/src/app/views/layouts/_admin_content_tabs.haml @@ -0,0 +1,14 @@ +%section.admin-content-section + %header#tab-container-1 + %h2   + %nav.faceted + %ul#tab-container-1-nav + - @tabs.each do |tab| + %li + %a{ :href => tab[:url], :id => "details_#{tab[:id]}", :class => "#{'active' if @details_tab[:id] == tab[:id]} show"} + = tab[:name] + -if tab[:count] + %span.label.badge.count.dark=tab[:count] + .content.collapsible.toggle-view.pools#tab + %ul.deployable-cards + = render :partial => 'list' diff --git a/src/app/views/realms/index.haml b/src/app/views/realms/index.haml index 3fae6b6..947fd74 100644 --- a/src/app/views/realms/index.haml +++ b/src/app/views/realms/index.haml @@ -1,3 +1,2 @@ = render :partial => 'layouts/admin_nav' -= render :partial => 'section_header' -= render :partial => 'list' += render :partial => 'layouts/admin_content_tabs' diff --git a/src/config/navigation.rb b/src/config/navigation.rb index 0d5bad3..8edc32a 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -24,8 +24,8 @@ SimpleNavigation::Configuration.run do |navigation| first_level.item :administer, t(:administer), users_path, :class => 'administer' do |second_level| second_level.item :users_and_groups, "Users & Groups", users_path, :link => { :class => 'users' }, :highlights_on => /\/users|\/roles|\/account/ second_level.item :environments, "Environments", pool_families_path, :link => { :class => 'environments' }, :highlights_on => /\/pool_families/ - second_level.item :content, "Content", catalogs_path, :link => { :class => 'content' }, :highlights_on => /\/catalogs|\/catalog_entries/ - second_level.item :cloud_providers, "Cloud Providers", providers_path, :link => { :class => 'providers' }, :highlights_on => /\/providers|\/realms|\/realm_mappingsi|\/hardware_profiles/ + second_level.item :content, "Content", catalogs_path, :link => { :class => 'content' }, :highlights_on => /\/catalogs|\/catalog_entries|\/realms|\/hardware_profiles|\/realm_mappings/ + second_level.item :cloud_providers, "Cloud Providers", providers_path, :link => { :class => 'providers' }, :highlights_on => /\/providers/ end end end -- 1.7.6

2 5

[PATCH conductor 0/2] #2121 - Implements OAuth client (v3)
by Matt Wagner 03 Oct '11

03 Oct '11

This implements the fixes/suggestions that Jan had from my earlier send. Of note: - The key for providers is now the base URL, e.g., 'http://example.com:5000/api' instead of 'example.com'. - The methods are "get", "post", etc., instead of "authenticated_get", etc.

2 3

[PATCH conductor] Fixed some failing spec tests
by Jan Provazník 03 Oct '11

03 Oct '11

From: Jan Provaznik <jprovazn(a)redhat.com> This partially fixes https://www.aeolusproject.org/redmine/issues/2412 But not all of them. --- src/app/controllers/providers_controller.rb | 2 +- .../provider_accounts_controller_spec.rb | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb index 818c423..516b65b 100644 --- a/src/app/controllers/providers_controller.rb +++ b/src/app/controllers/providers_controller.rb @@ -172,6 +172,6 @@ class ProvidersController < ApplicationController protected def load_providers - @providers = Provider.list_for_user(current_user, Privilege::VIEW, :order => :name) + @providers = Provider.list_for_user(current_user, Privilege::VIEW) end end diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb b/src/spec/controllers/provider_accounts_controller_spec.rb index b4d9962..4406a83 100644 --- a/src/spec/controllers/provider_accounts_controller_spec.rb +++ b/src/spec/controllers/provider_accounts_controller_spec.rb @@ -32,11 +32,10 @@ describe ProviderAccountsController do @admin = @admin_permission.user end - it "shows provider accounts as list" do + it "shows provider accounts as XML list" do mock_warden(@admin) - get :index, :provider_id => @provider.id + get :index, :format => :xml response.should be_success - response.should render_template("index") end it "doesn't allow to save provider's account if not valid credentials" do @@ -49,7 +48,7 @@ describe ProviderAccountsController do it "should permit users with account modify permission to access edit cloud account interface" do mock_warden(@admin) - get :edit, :id => @provider_account.id + get :edit, :provider_id => @provider, :id => @provider_account.id response.should be_success response.should render_template("edit") end -- 1.7.6

2 1

Fw: Re: Email sending delays and archiving delays for aeolus-devel@lists.fedorahosted.org
by Chris Alfonso 30 Sep '11

30 Sep '11

fyi ----- Forwarded message from Kevin Fenzi <kevin(a)scrye.com> ----- Date: Thu, 29 Sep 2011 14:08:17 -0600 From: Kevin Fenzi <kevin(a)scrye.com> To: infrastructure(a)lists.fedoraproject.org Subject: Re: Email sending delays and archiving delays for aeolus-devel(a)lists.fedorahosted.org Organization: Scrye, INC Reply-To: Fedora Infrastructure <infrastructure(a)lists.fedoraproject.org> On Thu, 29 Sep 2011 08:11:45 -0400 Chris Alfonso <calfonso(a)redhat.com> wrote: > Hello, > > The aeolus project development team is consistently seeing long > delays (hours) when sending email to > aeolus-devel(a)lists.fedorahosted.org. We are also seeing the archives > lag by a couple days. Do any of you know of relay or archiving > issues? If not, is there anyone that can look into the issue? Let > me know if you need more information. This is likely due to archiving issues on the hosted01 server. There's a high volume list that it's archiving thats taking up a lot of it's I/O. ;( Short term, I have moved a rsync job to be less frequent, so that might help us catch back up and stay in sync. Longer term we are waiting to hear about new hardware there, so we can migrate the machine to new hardware and OS. ;( Sorry for the delay. kevin _______________________________________________ infrastructure mailing list infrastructure(a)lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/infrastructure ----- End forwarded message -----

1 0

[PATCH] avoid warning from logrotate about "postrotate without endscript"
by Jim Meyering 30 Sep '11

30 Sep '11

FYI, pushed as obviously useful and safe: >From 80f9671bb52214a441ddda20cd318d2c8f85d154 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 30 Sep 2011 09:05:29 +0200 Subject: [PATCH] avoid warning from logrotate about "postrotate without endscript" * iwhd.logrotate: Add "endscript" to delimit end of "postrotate" command. --- iwhd.logrotate | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/iwhd.logrotate b/iwhd.logrotate index 164d536..59c8c32 100644 --- a/iwhd.logrotate +++ b/iwhd.logrotate @@ -5,4 +5,5 @@ # kill -HUP `cat /var/run/iwhd.pid` <--- we haven't got a pidfile yet postrotate /usr/bin/killall -HUP iwhd 2>/dev/null || true + endscript } -- 1.7.7.rc0.362.g5a14

2 1

Test - disregard
by Matt Wagner 30 Sep '11

30 Sep '11

Sorry for more noise.

1 0

Aeolus [and friends] packaging status - f16
by James Laska 30 Sep '11

30 Sep '11

Greetings gang, As promised, here are the results of my investigation into ensuring all aeolus* BuildRequires (and Requires) are satisfied using a stock f16 packages. This exercise highlighted a few problems, some of which have patches out for review already. There is also a minor problem where not all git-built packages use a unique %{version} or %{release} which makes it difficult to determine if a git-built package is newer than what's available in repos. We've discussed this topic in another thread [1], and I just need to follow-up with some patches to assist (assuming folks are okay using tito). == BuildRequires == The following lists whether I was able to satisfy BuildRequires and create RPM packages from the corresponding git repository. Please let me know if I'm missing any components. > oz - OK > audrey - FAIL * 'rake rpm' fails to build - patch out for review on aeolus-devel@ > candlepin - FAIL * candlepin-deps >= 0:0.0.18 is needed by candlepin-0.4.17-1.git.4.e185bd5.fc16.noarch * spoke to jmrodrig about this bundled .jar package and it isn't planned for acceptance in Fedora. A custom repo file will be required for building in Fedora. > condor - FAIL * classads-devel >= 1.0.4 is needed by condor-7.6.4-0dcloud.fc16.x86_64 * However, package classads-devel is obsoleted by condor-classads-devel which is already installed. I believe make_condor_package_7.x.sh needs to be updated > conductor - OK > configure - OK > imagefactory - OK > iwhd - OK > katello - FAIL * No package satisfies dependency: rubygem(compass) >= 0.11.5 - Needs a new bodhi update * No package satisfies dependency: rubygem(jammit) - review inprogress https://bugzilla.redhat.com/show_bug.cgi?id=739478 > libdeltacloud - OK > matahari - OK * Updated qmf-devel dependency - https://github.com/matahari/matahari/commit/4b1e8f046e590e701bf9f12823a16ae… > oz - OK > pulp - OK * Had to work around broken texlive+poppler deps in F16 (fixed with pending bodhi update) * See Requires failures below > python-rhsm - WARN * builds just fine, despite missing BuildRequires ... No package satisfies dependency: candlepin-deps >= 0:0.0.18 == Requires == The following lists any unsatisfied package Requires when installing the above git-built packages. > Error: Package: aeolus-conductor-devel-0.4.0-0.20110927181947gitaffcd9c.fc16.noarch (/aeolus-conductor-devel-0.4.0-0.20110927181947gitaffcd9c.fc16.noarch) > Requires: rubygem(webmock) > Error: pulp-cds conflicts with pulp-0.0.234-1.git.70.f691215.fc16.noarch > Error: pulp conflicts with pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch > Error: Package: pulp-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: python-gofer >= 0.48 > Error: Package: pulp-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: grinder >= 0.0.110 > Error: Package: pulp-client-lib-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-client-lib-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: python-isodate >= 0.4.4 > Error: Package: pulp-client-lib-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-client-lib-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: gofer >= 0.48 > Error: Package: pulp-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: mod_wsgi = 3.2-3.sslpatch.fc16 > Available: mod_wsgi-3.2-3.fc15.x86_64 (fedora) > mod_wsgi = 3.2-3.fc15 > Error: Package: pulp-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: m2crypto = 0.21.1.pulp > Installing: m2crypto-0.21.1-5.fc16.x86_64 (fedora) > m2crypto = 0.21.1-5.fc16 > Error: Package: pulp-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: python-isodate >= 0.4.4 > Error: Package: pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: gofer >= 0.48 > Error: Package: pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: grinder > Error: Package: pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: mod_wsgi = 3.2-3.sslpatch.fc16 > Available: mod_wsgi-3.2-3.fc15.x86_64 (fedora) > mod_wsgi = 3.2-3.fc15 > Error: Package: pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch (/pulp-cds-0.0.234-1.git.70.f691215.fc16.noarch) > Requires: m2crypto = 0.21.1.pulp > Installing: m2crypto-0.21.1-5.fc16.x86_64 (fedora) > m2crypto = 0.21.1-5.fc16 [1] https://fedorahosted.org/pipermail/aeolus-devel/2011-September/005087.html Thanks, James

5 8

[PATCH conductor] Fixed some failing spec tests
by Jan Provazník 30 Sep '11

30 Sep '11

From: Jan Provaznik <jprovazn(a)redhat.com> This partially fixes https://www.aeolusproject.org/redmine/issues/2412 But not all of them. --- src/app/controllers/providers_controller.rb | 2 +- .../provider_accounts_controller_spec.rb | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb index c977d1b..8ee370d 100644 --- a/src/app/controllers/providers_controller.rb +++ b/src/app/controllers/providers_controller.rb @@ -151,7 +151,7 @@ class ProvidersController < ApplicationController protected def load_providers - @providers = Provider.list_for_user(current_user, Privilege::VIEW, :order => :name) + @providers = Provider.list_for_user(current_user, Privilege::VIEW) end def provider_alerts(provider) diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb b/src/spec/controllers/provider_accounts_controller_spec.rb index b4d9962..4406a83 100644 --- a/src/spec/controllers/provider_accounts_controller_spec.rb +++ b/src/spec/controllers/provider_accounts_controller_spec.rb @@ -32,11 +32,10 @@ describe ProviderAccountsController do @admin = @admin_permission.user end - it "shows provider accounts as list" do + it "shows provider accounts as XML list" do mock_warden(@admin) - get :index, :provider_id => @provider.id + get :index, :format => :xml response.should be_success - response.should render_template("index") end it "doesn't allow to save provider's account if not valid credentials" do @@ -49,7 +48,7 @@ describe ProviderAccountsController do it "should permit users with account modify permission to access edit cloud account interface" do mock_warden(@admin) - get :edit, :id => @provider_account.id + get :edit, :provider_id => @provider, :id => @provider_account.id response.should be_success response.should render_template("edit") end -- 1.7.6

1 0

Re: [PATCH aeolus-image-rubygem 1/3] Moved warehouse models in Warehouse Module
by Matt Wagner 30 Sep '11

30 Sep '11

On Thu, Sep 29, 2011 at 06:36:51PM +0100, mtaylor(a)redhat.com wrote: > From: Martyn Taylor <mtaylor(a)redhat.com> > > This will help separate the warehouse and factory models > --- > lib/aeolus_image.rb | 21 +-- > lib/aeolus_image/model/image.rb | 91 ---------- > lib/aeolus_image/model/image_build.rb | 68 -------- > lib/aeolus_image/model/provider_image.rb | 46 ----- > lib/aeolus_image/model/target_image.rb | 56 ------ > lib/aeolus_image/model/template.rb | 29 --- > lib/aeolus_image/model/warehouse/image.rb | 93 ++++++++++ > lib/aeolus_image/model/warehouse/image_build.rb | 70 ++++++++ > lib/aeolus_image/model/warehouse/provider_image.rb | 48 +++++ > lib/aeolus_image/model/warehouse/target_image.rb | 58 +++++++ > lib/aeolus_image/model/warehouse/template.rb | 31 ++++ > .../model/warehouse/warehouse_client.rb | 178 +++++++++++++++++++ > .../model/warehouse/warehouse_model.rb | 162 ++++++++++++++++++ > lib/aeolus_image/model/warehouse_client.rb | 180 -------------------- > lib/aeolus_image/model/warehouse_model.rb | 162 ------------------ > 15 files changed, 647 insertions(+), 646 deletions(-) > delete mode 100644 lib/aeolus_image/model/image.rb > delete mode 100644 lib/aeolus_image/model/image_build.rb > delete mode 100644 lib/aeolus_image/model/provider_image.rb > delete mode 100644 lib/aeolus_image/model/target_image.rb > delete mode 100644 lib/aeolus_image/model/template.rb > create mode 100644 lib/aeolus_image/model/warehouse/image.rb > create mode 100644 lib/aeolus_image/model/warehouse/image_build.rb > create mode 100644 lib/aeolus_image/model/warehouse/provider_image.rb > create mode 100644 lib/aeolus_image/model/warehouse/target_image.rb > create mode 100644 lib/aeolus_image/model/warehouse/template.rb > create mode 100644 lib/aeolus_image/model/warehouse/warehouse_client.rb > create mode 100644 lib/aeolus_image/model/warehouse/warehouse_model.rb > delete mode 100644 lib/aeolus_image/model/warehouse_client.rb > delete mode 100644 lib/aeolus_image/model/warehouse_model.rb > > diff --git a/lib/aeolus_image.rb b/lib/aeolus_image.rb > index f17ed66..ce23933 100644 > --- a/lib/aeolus_image.rb > +++ b/lib/aeolus_image.rb > @@ -14,17 +14,10 @@ > > require 'optparse' > require 'logger' > -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'base_command') > -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'list_command') > -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'build_command') > -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'push_command') > -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'import_command') > -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'delete_command') > -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'config_parser') > -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'warehouse_client') # Not sure we need this > -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'warehouse_model') # We may be able to factor this out? > -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'image') > -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'image_build') > -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'provider_image') > -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'target_image') > -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'template') > +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'warehouse_client') # Not sure we need this > +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'warehouse_model') # We may be able to factor this out? > +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'image') > +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'image_build') > +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'provider_image') > +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'target_image') > +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'template') > diff --git a/lib/aeolus_image/model/image.rb b/lib/aeolus_image/model/image.rb > deleted file mode 100644 > index 73b004e..0000000 > --- a/lib/aeolus_image/model/image.rb > +++ /dev/null > @@ -1,91 +0,0 @@ > -# Copyright 2011 Red Hat, Inc. > -# > -# Licensed under the Apache License, Version 2.0 (the "License"); > -# you may not use this file except in compliance with the License. > -# You may obtain a copy of the License at > -# > -# http://www.apache.org/licenses/LICENSE-2.0 > -# > -# Unless required by applicable law or agreed to in writing, software > -# distributed under the License is distributed on an "AS IS" BASIS, > -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > -# See the License for the specific language governing permissions and > -# limitations under the License. > - > -module Aeolus > - module Image > - class Image < WarehouseModel > - OS = Struct.new(:name, :version, :arch) > - > - @bucket_name = 'images' > - > - def initialize(attrs) > - attrs.each do |k,v| > - if k.to_sym == :latest_build > - sym = :attr_writer > - else > - sym = :attr_accessor > - end > - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > - send(:"#{k}=", v) > - end > - @xml_body = Nokogiri::XML @body > - end > - > - def template_xml > - unless @template_xml > - begin > - @template_xml = Nokogiri::XML image_builds.first.target_images.first.target_template.body > - rescue > - @template_xml = Nokogiri::XML "<template></template>" > - end > - end > - @template_xml > - end > - > - def latest_pushed_build > - ImageBuild.find(@latest_build) if @latest_build > - end > - > - def image_builds > - ImageBuild.find_all_by_image_uuid(@uuid) > - end > - > - #TODO: We should get the image fields from the object body once we have it defined. > - def name > - unless @name > - @name = @xml_body.xpath("/image/name").text > - if @name.empty? > - @name = template_xml.xpath("/template/name").text > - end > - end > - @name > - end > - > - def os > - unless @os > - @os = OS.new(template_xml.xpath("/template/os/name").text, template_xml.xpath("/template/os/version").text, template_xml.xpath("/template/os/arch").text) > - end > - @os > - end > - > - def description > - unless @description > - @description = template_xml.xpath("/template/description").text > - end > - @description > - end > - > - # Delete this image and all child objects > - def delete! > - begin > - image_builds.each do |build| > - build.delete! > - end > - rescue NoMethodError > - end > - Image.delete(@uuid) > - end > - end > - end > -end > diff --git a/lib/aeolus_image/model/image_build.rb b/lib/aeolus_image/model/image_build.rb > deleted file mode 100644 > index b751117..0000000 > --- a/lib/aeolus_image/model/image_build.rb > +++ /dev/null > @@ -1,68 +0,0 @@ > -# Copyright 2011 Red Hat, Inc. > -# > -# Licensed under the Apache License, Version 2.0 (the "License"); > -# you may not use this file except in compliance with the License. > -# You may obtain a copy of the License at > -# > -# http://www.apache.org/licenses/LICENSE-2.0 > -# > -# Unless required by applicable law or agreed to in writing, software > -# distributed under the License is distributed on an "AS IS" BASIS, > -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > -# See the License for the specific language governing permissions and > -# limitations under the License. > - > -module Aeolus > - module Image > - class ImageBuild < WarehouseModel > - @bucket_name = 'builds' > - > - def initialize(attrs) > - attrs.each do |k,v| > - if k.to_sym == :image > - sym = :attr_writer > - else > - sym = :attr_accessor > - end > - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > - send(:"#{k}=", v) > - end > - end > - > - def self.find_all_by_image_uuid(uuid) > - self.set_warehouse_and_bucket if self.bucket.nil? > - self.bucket.objects.map do |wh_object| > - if wh_object.attr('image') == uuid > - ImageBuild.new(wh_object.attrs(wh_object.attr_list)) > - end > - end.compact > - end > - > - def image > - Image.find(@image) if @image > - end > - > - def target_images > - TargetImage.all.select {|ti| ti.build and (ti.build.uuid == self.uuid)} > - end > - > - def provider_images > - targets = target_images > - ProviderImage.all.select do |pi| > - targets.include?(pi.target_image) > - end > - end > - > - # Deletes this image and all child objects > - def delete! > - begin > - target_images.each do |ti| > - ti.delete! > - end > - rescue NoMethodError > - end > - ImageBuild.delete(@uuid) > - end > - end > - end > -end > diff --git a/lib/aeolus_image/model/provider_image.rb b/lib/aeolus_image/model/provider_image.rb > deleted file mode 100644 > index a5f319d..0000000 > --- a/lib/aeolus_image/model/provider_image.rb > +++ /dev/null > @@ -1,46 +0,0 @@ > -# Copyright 2011 Red Hat, Inc. > -# > -# Licensed under the Apache License, Version 2.0 (the "License"); > -# you may not use this file except in compliance with the License. > -# You may obtain a copy of the License at > -# > -# http://www.apache.org/licenses/LICENSE-2.0 > -# > -# Unless required by applicable law or agreed to in writing, software > -# distributed under the License is distributed on an "AS IS" BASIS, > -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > -# See the License for the specific language governing permissions and > -# limitations under the License. > - > -module Aeolus > - module Image > - class ProviderImage < WarehouseModel > - @bucket_name = 'provider_images' > - > - def initialize(attrs) > - attrs.each do |k,v| > - if [:provider, :target_image].include?(k.to_sym) > - sym = :attr_writer > - else > - sym = :attr_accessor > - end > - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > - send(:"#{k}=", v) > - end > - end > - > - def target_image > - TargetImage.find(@target_image) if @target_image > - end > - > - def provider_name > - @provider > - end > - > - # Deletes this provider image > - def delete! > - ProviderImage.delete(@uuid) > - end > - end > - end > -end > diff --git a/lib/aeolus_image/model/target_image.rb b/lib/aeolus_image/model/target_image.rb > deleted file mode 100644 > index c029430..0000000 > --- a/lib/aeolus_image/model/target_image.rb > +++ /dev/null > @@ -1,56 +0,0 @@ > -# Copyright 2011 Red Hat, Inc. > -# > -# Licensed under the Apache License, Version 2.0 (the "License"); > -# you may not use this file except in compliance with the License. > -# You may obtain a copy of the License at > -# > -# http://www.apache.org/licenses/LICENSE-2.0 > -# > -# Unless required by applicable law or agreed to in writing, software > -# distributed under the License is distributed on an "AS IS" BASIS, > -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > -# See the License for the specific language governing permissions and > -# limitations under the License. > - > -module Aeolus > - module Image > - class TargetImage < WarehouseModel > - @bucket_name = 'target_images' > - > - def initialize(attrs) > - attrs.each do |k,v| > - if k.to_sym == :build > - sym = :attr_writer > - else > - sym = :attr_accessor > - end > - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > - send(:"#{k}=", v) > - end > - end > - > - def build > - ImageBuild.find(@build) if @build > - end > - > - def provider_images > - ProviderImage.all.select{|pi| pi.target_image and (pi.target_image.uuid == self.uuid)} > - end > - > - def target_template > - Template.find(@template) if @template > - end > - > - # Deletes this targetimage and all child objects > - def delete! > - begin > - provider_images.each do |pi| > - pi.delete! > - end > - rescue NoMethodError > - end > - TargetImage.delete(@uuid) > - end > - end > - end > -end > diff --git a/lib/aeolus_image/model/template.rb b/lib/aeolus_image/model/template.rb > deleted file mode 100644 > index e1ac3cb..0000000 > --- a/lib/aeolus_image/model/template.rb > +++ /dev/null > @@ -1,29 +0,0 @@ > -# Copyright 2011 Red Hat, Inc. > -# > -# Licensed under the Apache License, Version 2.0 (the "License"); > -# you may not use this file except in compliance with the License. > -# You may obtain a copy of the License at > -# > -# http://www.apache.org/licenses/LICENSE-2.0 > -# > -# Unless required by applicable law or agreed to in writing, software > -# distributed under the License is distributed on an "AS IS" BASIS, > -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > -# See the License for the specific language governing permissions and > -# limitations under the License. > - > -module Aeolus > - module Image > - class Template < WarehouseModel > - @bucket_name = 'templates' > - > - def initialize(attrs) > - attrs.each do |k,v| > - sym = :attr_accessor > - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > - send(:"#{k}=", v) > - end > - end > - end > - end > -end > diff --git a/lib/aeolus_image/model/warehouse/image.rb b/lib/aeolus_image/model/warehouse/image.rb > new file mode 100644 > index 0000000..7a7a4f3 > --- /dev/null > +++ b/lib/aeolus_image/model/warehouse/image.rb > @@ -0,0 +1,93 @@ > +# Copyright 2011 Red Hat, Inc. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > + > +module Aeolus > + module Image > + module Warehouse > + class Image < WarehouseModel > + OS = Struct.new(:name, :version, :arch) > + > + @bucket_name = 'images' > + > + def initialize(attrs) > + attrs.each do |k,v| > + if k.to_sym == :latest_build > + sym = :attr_writer > + else > + sym = :attr_accessor > + end > + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > + send(:"#{k}=", v) > + end > + @xml_body = Nokogiri::XML @body > + end > + > + def template_xml > + unless @template_xml > + begin > + @template_xml = Nokogiri::XML image_builds.first.target_images.first.target_template.body > + rescue > + @template_xml = Nokogiri::XML "<template></template>" > + end > + end > + @template_xml > + end > + > + def latest_pushed_build > + ImageBuild.find(@latest_build) if @latest_build > + end > + > + def image_builds > + ImageBuild.find_all_by_image_uuid(@uuid) > + end > + > + #TODO: We should get the image fields from the object body once we have it defined. > + def name > + unless @name > + @name = @xml_body.xpath("/image/name").text > + if @name.empty? > + @name = template_xml.xpath("/template/name").text > + end > + end > + @name > + end > + > + def os > + unless @os > + @os = OS.new(template_xml.xpath("/template/os/name").text, template_xml.xpath("/template/os/version").text, template_xml.xpath("/template/os/arch").text) > + end > + @os > + end > + > + def description > + unless @description > + @description = template_xml.xpath("/template/description").text > + end > + @description > + end > + > + # Delete this image and all child objects > + def delete! > + begin > + image_builds.each do |build| > + build.delete! > + end > + rescue NoMethodError > + end > + Image.delete(@uuid) > + end > + end > + end > + end > +end > \ No newline at end of file > diff --git a/lib/aeolus_image/model/warehouse/image_build.rb b/lib/aeolus_image/model/warehouse/image_build.rb > new file mode 100644 > index 0000000..d99069d > --- /dev/null > +++ b/lib/aeolus_image/model/warehouse/image_build.rb > @@ -0,0 +1,70 @@ > +# Copyright 2011 Red Hat, Inc. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > + > +module Aeolus > + module Image > + module Warehouse > + class ImageBuild < WarehouseModel > + @bucket_name = 'builds' > + > + def initialize(attrs) > + attrs.each do |k,v| > + if k.to_sym == :image > + sym = :attr_writer > + else > + sym = :attr_accessor > + end > + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > + send(:"#{k}=", v) > + end > + end > + > + def self.find_all_by_image_uuid(uuid) > + self.set_warehouse_and_bucket if self.bucket.nil? > + self.bucket.objects.map do |wh_object| > + if wh_object.attr('image') == uuid > + ImageBuild.new(wh_object.attrs(wh_object.attr_list)) > + end > + end.compact > + end > + > + def image > + Image.find(@image) if @image > + end > + > + def target_images > + TargetImage.all.select {|ti| ti.build and (ti.build.uuid == self.uuid)} > + end > + > + def provider_images > + targets = target_images > + ProviderImage.all.select do |pi| > + targets.include?(pi.target_image) > + end > + end > + > + # Deletes this image and all child objects > + def delete! > + begin > + target_images.each do |ti| > + ti.delete! > + end > + rescue NoMethodError > + end > + ImageBuild.delete(@uuid) > + end > + end > + end > + end > +end > \ No newline at end of file > diff --git a/lib/aeolus_image/model/warehouse/provider_image.rb b/lib/aeolus_image/model/warehouse/provider_image.rb > new file mode 100644 > index 0000000..acd0386 > --- /dev/null > +++ b/lib/aeolus_image/model/warehouse/provider_image.rb > @@ -0,0 +1,48 @@ > +# Copyright 2011 Red Hat, Inc. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > + > +module Aeolus > + module Image > + module Warehouse > + class ProviderImage < WarehouseModel > + @bucket_name = 'provider_images' > + > + def initialize(attrs) > + attrs.each do |k,v| > + if [:provider, :target_image].include?(k.to_sym) > + sym = :attr_writer > + else > + sym = :attr_accessor > + end > + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > + send(:"#{k}=", v) > + end > + end > + > + def target_image > + TargetImage.find(@target_image) if @target_image > + end > + > + def provider_name > + @provider > + end > + > + # Deletes this provider image > + def delete! > + ProviderImage.delete(@uuid) > + end > + end > + end > + end > +end > \ No newline at end of file > diff --git a/lib/aeolus_image/model/warehouse/target_image.rb b/lib/aeolus_image/model/warehouse/target_image.rb > new file mode 100644 > index 0000000..8636694 > --- /dev/null > +++ b/lib/aeolus_image/model/warehouse/target_image.rb > @@ -0,0 +1,58 @@ > +# Copyright 2011 Red Hat, Inc. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > + > +module Aeolus > + module Image > + module Warehouse > + class TargetImage < WarehouseModel > + @bucket_name = 'target_images' > + > + def initialize(attrs) > + attrs.each do |k,v| > + if k.to_sym == :build > + sym = :attr_writer > + else > + sym = :attr_accessor > + end > + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > + send(:"#{k}=", v) > + end > + end > + > + def build > + ImageBuild.find(@build) if @build > + end > + > + def provider_images > + ProviderImage.all.select{|pi| pi.target_image and (pi.target_image.uuid == self.uuid)} > + end > + > + def target_template > + Template.find(@template) if @template > + end > + > + # Deletes this targetimage and all child objects > + def delete! > + begin > + provider_images.each do |pi| > + pi.delete! > + end > + rescue NoMethodError > + end > + TargetImage.delete(@uuid) > + end > + end > + end > + end > +end > \ No newline at end of file > diff --git a/lib/aeolus_image/model/warehouse/template.rb b/lib/aeolus_image/model/warehouse/template.rb > new file mode 100644 > index 0000000..a3b9ec5 > --- /dev/null > +++ b/lib/aeolus_image/model/warehouse/template.rb > @@ -0,0 +1,31 @@ > +# Copyright 2011 Red Hat, Inc. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > + > +module Aeolus > + module Image > + module Warehouse > + class Template < WarehouseModel > + @bucket_name = 'templates' > + > + def initialize(attrs) > + attrs.each do |k,v| > + sym = :attr_accessor > + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") > + send(:"#{k}=", v) > + end > + end > + end > + end > + end > +end > \ No newline at end of file > diff --git a/lib/aeolus_image/model/warehouse/warehouse_client.rb b/lib/aeolus_image/model/warehouse/warehouse_client.rb > new file mode 100644 > index 0000000..4df83a1 > --- /dev/null > +++ b/lib/aeolus_image/model/warehouse/warehouse_client.rb > @@ -0,0 +1,178 @@ > +# Copyright 2011 Red Hat, Inc. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > + > +require 'rubygems' > + > +require 'rest-client' > +require 'nokogiri' > + > +#TODO: perform iwhd version-dependent URI mapping > +module Aeolus > + module Image > + module Warehouse > + class BucketObject > + attr_reader :key > + > + def initialize(connection, key, bucket) > + @connection = connection > + @key = key > + @bucket = bucket > + @path = "/#{@bucket.name}/#{@key}" > + end > + > + def self.create(connection, key, bucket, body, attrs = {}) > + obj = new(connection, key, bucket) > + obj.set_body(body) > + obj.set_attrs(attrs) > + obj > + end > + > + def body > + @connection.do_request @path, :plain => true > + end > + > + def set_body(body) > + @connection.do_request @path, :content => body, :method => :put > + end > + > + def attr_list > + result = @connection.do_request @path, :content => 'op=parts', :method => :post > + return result.xpath('/object/object_attr/@name').to_a.map {|item| item.value} > + end > + > + def attrs(list) > + attrs = {} > + list.each do |att| > + next if att.match('-') > + attrs[att] = (@connection.do_request("#{@path}/#{att}", :plain => true) rescue nil) > + end > + attrs[:body] = body > + attrs > + end > + > + def attr(name) > + attrs([name])[name] > + end > + > + def set_attrs(hash) > + hash.each do |name, content| > + set_attr(name, content) > + end > + end > + > + def set_attr(name, content) > + path = "#{@path}/#{name}" > + @connection.do_request path, :content => content, :method => :put > + end > + > + def delete! > + @connection.do_request @path, :method => :delete > + true > + end > + > + end > + > + class Bucket > + attr_accessor :name > + > + def initialize(name, connection) > + @name = name > + @connection = connection > + end > + > + def to_s > + "Bucket: #{@name}" > + end > + > + def object_names > + result = @connection.do_request "/#{@name}" > + result.xpath('/objects/object').map do |obj| > + obj.at_xpath('./key/text()').to_s > + end > + end > + > + def objects > + object_names.map do |name| > + object(name) > + end > + end > + > + def object(key) > + BucketObject.new @connection, key, self > + end > + > + def create_object(key, body, attrs) > + BucketObject.create(@connection, key, self, body, attrs) > + end > + > + def include?(key) > + object_names.include?(key) > + end > + end > + > + class Connection > + attr_accessor :uri > + > + def initialize(uri) > + @uri = uri > + end > + > + def do_request(path = '', opts={}) > + opts[:method] ||= :get > + opts[:content] ||= '' > + opts[:plain] ||= false > + opts[:headers] ||= {} > + > + result = RestClient::Request.execute :method => opts[:method], :url => @uri + path, :payload => opts[:content], :headers => opts[:headers] > + > + return Nokogiri::XML result unless opts[:plain] > + return result > + end > + > + end > + > + class Client > + > + def initialize(uri) > + @connection = Connection.new(uri) > + end > + > + def create_bucket(bucket) > + @connection.do_request "/#{bucket}", :method => :put rescue RestClient::InternalServerError > + Bucket.new(bucket, @connection) > + end > + > + def bucket(bucket) > + Bucket.new bucket, @connection > + end > + > + def buckets > + @connection.do_request.xpath('/api/link[@rel="bucket"]').map do |obj| > + obj.at_xpath('./@href').to_s.gsub(/.*\//, '') > + end > + end > + > + def get_iwhd_version > + result = @connection.do_request.at_xpath('/api[@service="image_warehouse"]/@version') > + raise "Response does not contain <api> tag or version information" if result == nil > + return result.value > + end > + > + def query(bucket_name, query_string) > + @connection.do_request "/#{bucket_name}/_query", {:method => :post, :content => query_string} > + end > + end > + end > + end > +end > diff --git a/lib/aeolus_image/model/warehouse/warehouse_model.rb b/lib/aeolus_image/model/warehouse/warehouse_model.rb > new file mode 100644 > index 0000000..2631c5b > --- /dev/null > +++ b/lib/aeolus_image/model/warehouse/warehouse_model.rb > @@ -0,0 +1,162 @@ > +# Copyright 2011 Red Hat, Inc. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > + > +module Aeolus > + module Image > + module Warehouse > + class BucketObjectNotFound < Exception;end > + class BucketNotFound < Exception;end > + > + class WarehouseModel > + > + def ==(other_obj) > + # If the objects have different instance variables defined, they're definitely not == > + return false unless instance_variables.sort == other_obj.instance_variables.sort > + # Otherwise, ensure that they're all the same > + instance_variables.each do |iv| > + return false unless other_obj.instance_variable_get(iv) == instance_variable_get(iv) > + end > + # They have the same instance variables and values, so they're equal > + true > + end > + > + class << self > + attr_accessor :warehouse, :bucket, :bucket_name > + > + def set_warehouse_and_bucket > + begin > + @@config ||= load_config > + self.warehouse = Warehouse::Client.new(@@config[:iwhd][:url]) > + self.bucket = self.warehouse.bucket(@bucket_name) > + rescue > + raise BucketNotFound > + end > + end > + > + def bucket_objects > + self.set_warehouse_and_bucket if self.bucket.nil? > + > + begin > + self.bucket.objects > + rescue RestClient::ResourceNotFound > + [] > + end > + end > + > + def first > + obj = bucket_objects.first > + obj ? self.new(obj.attrs(obj.attr_list)) : nil > + end > + > + def last > + obj = bucket_objects.last > + obj ? self.new(obj.attrs(obj.attr_list)) : nil > + end > + > + def all > + bucket_objects.map do |wh_object| > + self.new(wh_object.attrs(wh_object.attr_list)) > + end > + end > + > + def find(uuid) > + self.set_warehouse_and_bucket if self.bucket.nil? > + begin > + if self.bucket.include?(uuid) > + self.new(self.bucket.object(uuid).attrs(self.bucket.object(uuid).attr_list)) > + else > + nil > + end > + rescue RestClient::ResourceNotFound > + nil > + end > + end > + > + def where(query_string) > + self.set_warehouse_and_bucket if self.bucket.nil? > + self.warehouse.query(@bucket_name, query_string) > + end > + > + def delete(uuid) > + self.set_warehouse_and_bucket if self.bucket.nil? > + begin > + if self.bucket.include?(uuid) > + self.bucket.object(uuid).delete! > + else > + false > + end > + rescue RestClient::ResourceNotFound > + false > + end > + end > + > + protected > + # Copy over entirely too much code to load the config file > + def load_config > + # TODO - Is this always the case? We should probably have /etc/aeolus-cli or something too? > + # Or allow Rails to override this > + @config_location ||= "~/.aeolus-cli" > + begin > + file_str = read_file(@config_location) > + if is_file?(@config_location) && !file_str.include?(":url") > + lines = File.readlines(File.expand_path((a)config_location)).map do |line| > + "#" + line > + end > + File.open(File.expand_path(@config_location), 'w') do |file| > + file.puts lines > + end > + write_file > + end > + write_file unless is_file?(@config_location) > + YAML::load(File.open(File.expand_path(@config_location))) > + rescue Errno::ENOENT > + #TODO: Create a custom exception to wrap CLI Exceptions > + raise "Unable to locate or write configuration file: \"" + @config_location + "\"" > + end > + end > + > + def write_file > + example = File.read(File.expand_path(File.dirname(__FILE__) + "/../../examples/aeolus-cli")) > + File.open(File.expand_path(@config_location), 'a+') do |f| > + f.write(example) > + end > + end > + > + def read_file(path) > + begin > + full_path = File.expand_path(path) > + if is_file?(path) > + File.read(full_path) > + else > + return nil > + end > + rescue > + nil > + end > + end > + > + def is_file?(path) > + full_path = File.expand_path(path) > + if File.exist?(full_path) && !File.directory?(full_path) > + return true > + end > + false > + end > + > + end > + > + end > + end > + end > +end > \ No newline at end of file > diff --git a/lib/aeolus_image/model/warehouse_client.rb b/lib/aeolus_image/model/warehouse_client.rb > deleted file mode 100644 > index f0da7ff..0000000 > --- a/lib/aeolus_image/model/warehouse_client.rb > +++ /dev/null > @@ -1,180 +0,0 @@ > -# Copyright 2011 Red Hat, Inc. > -# > -# Licensed under the Apache License, Version 2.0 (the "License"); > -# you may not use this file except in compliance with the License. > -# You may obtain a copy of the License at > -# > -# http://www.apache.org/licenses/LICENSE-2.0 > -# > -# Unless required by applicable law or agreed to in writing, software > -# distributed under the License is distributed on an "AS IS" BASIS, > -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > -# See the License for the specific language governing permissions and > -# limitations under the License. > - > -require 'rubygems' > - > -require 'rest-client' > -require 'nokogiri' > - > -#TODO: perform iwhd version-dependent URI mapping > -module Aeolus > - module Image > - module Warehouse > - > - class BucketObject > - attr_reader :key > - > - def initialize(connection, key, bucket) > - @connection = connection > - @key = key > - @bucket = bucket > - @path = "/#{@bucket.name}/#{@key}" > - end > - > - def self.create(connection, key, bucket, body, attrs = {}) > - obj = new(connection, key, bucket) > - obj.set_body(body) > - obj.set_attrs(attrs) > - obj > - end > - > - def body > - @connection.do_request @path, :plain => true > - end > - > - def set_body(body) > - @connection.do_request @path, :content => body, :method => :put > - end > - > - def attr_list > - result = @connection.do_request @path, :content => 'op=parts', :method => :post > - return result.xpath('/object/object_attr/@name').to_a.map {|item| item.value} > - end > - > - def attrs(list) > - attrs = {} > - list.each do |att| > - next if att.match('-') > - attrs[att] = (@connection.do_request("#{@path}/#{att}", :plain => true) rescue nil) > - end > - attrs[:body] = body > - attrs > - end > - > - def attr(name) > - attrs([name])[name] > - end > - > - def set_attrs(hash) > - hash.each do |name, content| > - set_attr(name, content) > - end > - end > - > - def set_attr(name, content) > - path = "#{@path}/#{name}" > - @connection.do_request path, :content => content, :method => :put > - end > - > - def delete! > - @connection.do_request @path, :method => :delete > - true > - end > - > - end > - > - class Bucket > - attr_accessor :name > - > - def initialize(name, connection) > - @name = name > - @connection = connection > - end > - > - def to_s > - "Bucket: #{@name}" > - end > - > - def object_names > - result = @connection.do_request "/#{@name}" > - result.xpath('/objects/object').map do |obj| > - obj.at_xpath('./key/text()').to_s > - end > - end > - > - def objects > - object_names.map do |name| > - object(name) > - end > - end > - > - def object(key) > - BucketObject.new @connection, key, self > - end > - > - def create_object(key, body, attrs) > - BucketObject.create(@connection, key, self, body, attrs) > - end > - > - def include?(key) > - object_names.include?(key) > - end > - end > - > - class Connection > - attr_accessor :uri > - > - def initialize(uri) > - @uri = uri > - end > - > - def do_request(path = '', opts={}) > - opts[:method] ||= :get > - opts[:content] ||= '' > - opts[:plain] ||= false > - opts[:headers] ||= {} > - > - result = RestClient::Request.execute :method => opts[:method], :url => @uri + path, :payload => opts[:content], :headers => opts[:headers] > - > - return Nokogiri::XML result unless opts[:plain] > - return result > - end > - > - end > - > - class Client > - > - def initialize(uri) > - @connection = Connection.new(uri) > - end > - > - def create_bucket(bucket) > - @connection.do_request "/#{bucket}", :method => :put rescue RestClient::InternalServerError > - Bucket.new(bucket, @connection) > - end > - > - def bucket(bucket) > - Bucket.new bucket, @connection > - end > - > - def buckets > - @connection.do_request.xpath('/api/link[@rel="bucket"]').map do |obj| > - obj.at_xpath('./@href').to_s.gsub(/.*\//, '') > - end > - end > - > - def get_iwhd_version > - result = @connection.do_request.at_xpath('/api[@service="image_warehouse"]/@version') > - raise "Response does not contain <api> tag or version information" if result == nil > - return result.value > - end > - > - def query(bucket_name, query_string) > - @connection.do_request "/#{bucket_name}/_query", {:method => :post, :content => query_string} > - end > - end > - > - end > - end > -end > diff --git a/lib/aeolus_image/model/warehouse_model.rb b/lib/aeolus_image/model/warehouse_model.rb > deleted file mode 100644 > index 2586f6d..0000000 > --- a/lib/aeolus_image/model/warehouse_model.rb > +++ /dev/null > @@ -1,162 +0,0 @@ > -# Copyright 2011 Red Hat, Inc. > -# > -# Licensed under the Apache License, Version 2.0 (the "License"); > -# you may not use this file except in compliance with the License. > -# You may obtain a copy of the License at > -# > -# http://www.apache.org/licenses/LICENSE-2.0 > -# > -# Unless required by applicable law or agreed to in writing, software > -# distributed under the License is distributed on an "AS IS" BASIS, > -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > -# See the License for the specific language governing permissions and > -# limitations under the License. > - > -module Aeolus > - module Image > - # require 'warehouse_client' > - include Warehouse > - class BucketObjectNotFound < Exception;end > - class BucketNotFound < Exception;end > - > - class WarehouseModel > - > - def ==(other_obj) > - # If the objects have different instance variables defined, they're definitely not == > - return false unless instance_variables.sort == other_obj.instance_variables.sort > - # Otherwise, ensure that they're all the same > - instance_variables.each do |iv| > - return false unless other_obj.instance_variable_get(iv) == instance_variable_get(iv) > - end > - # They have the same instance variables and values, so they're equal > - true > - end > - > - class << self > - attr_accessor :warehouse, :bucket, :bucket_name > - > - def set_warehouse_and_bucket > - begin > - @@config ||= load_config > - self.warehouse = Warehouse::Client.new(@@config[:iwhd][:url]) > - self.bucket = self.warehouse.bucket(@bucket_name) > - rescue > - raise BucketNotFound > - end > - end > - > - def bucket_objects > - self.set_warehouse_and_bucket if self.bucket.nil? > - > - begin > - self.bucket.objects > - rescue RestClient::ResourceNotFound > - [] > - end > - end > - > - def first > - obj = bucket_objects.first > - obj ? self.new(obj.attrs(obj.attr_list)) : nil > - end > - > - def last > - obj = bucket_objects.last > - obj ? self.new(obj.attrs(obj.attr_list)) : nil > - end > - > - def all > - bucket_objects.map do |wh_object| > - self.new(wh_object.attrs(wh_object.attr_list)) > - end > - end > - > - def find(uuid) > - self.set_warehouse_and_bucket if self.bucket.nil? > - begin > - if self.bucket.include?(uuid) > - self.new(self.bucket.object(uuid).attrs(self.bucket.object(uuid).attr_list)) > - else > - nil > - end > - rescue RestClient::ResourceNotFound > - nil > - end > - end > - > - def where(query_string) > - self.set_warehouse_and_bucket if self.bucket.nil? > - self.warehouse.query(@bucket_name, query_string) > - end > - > - def delete(uuid) > - self.set_warehouse_and_bucket if self.bucket.nil? > - begin > - if self.bucket.include?(uuid) > - self.bucket.object(uuid).delete! > - else > - false > - end > - rescue RestClient::ResourceNotFound > - false > - end > - end > - > - protected > - # Copy over entirely too much code to load the config file > - def load_config > - # TODO - Is this always the case? We should probably have /etc/aeolus-cli or something too? > - # Or allow Rails to override this > - @config_location ||= "~/.aeolus-cli" > - begin > - file_str = read_file(@config_location) > - if is_file?(@config_location) && !file_str.include?(":url") > - lines = File.readlines(File.expand_path((a)config_location)).map do |line| > - "#" + line > - end > - File.open(File.expand_path(@config_location), 'w') do |file| > - file.puts lines > - end > - write_file > - end > - write_file unless is_file?(@config_location) > - YAML::load(File.open(File.expand_path(@config_location))) > - rescue Errno::ENOENT > - #TODO: Create a custom exception to wrap CLI Exceptions > - raise "Unable to locate or write configuration file: \"" + @config_location + "\"" > - end > - end > - > - def write_file > - example = File.read(File.expand_path(File.dirname(__FILE__) + "/../../examples/aeolus-cli")) > - File.open(File.expand_path(@config_location), 'a+') do |f| > - f.write(example) > - end > - end > - > - def read_file(path) > - begin > - full_path = File.expand_path(path) > - if is_file?(path) > - File.read(full_path) > - else > - return nil > - end > - rescue > - nil > - end > - end > - > - def is_file?(path) > - full_path = File.expand_path(path) > - if File.exist?(full_path) && !File.directory?(full_path) > - return true > - end > - false > - end > - > - end > - > - end > - end > -end > -- > 1.7.6.2 > Hi Martyn (and Cc'ing the list), You had sent this to me to review prior to sending a finalized version to the list. My understanding is that you sent this about 6 hours ago, but it still hasn't come through the last. (I just got mail sent about 12 hours ago... Yikes.) This evening I had indicated that I had reviewed the code but was waiting for the various fixes to be aggregated and sent to the list with some whitespace errors fixed before I'd give it my official ACK. I believe you sent this several hours ago, but that it's stuck in a queue somewhere. To try to get this thing wrapped up before the weekend, I'm going to go ahead and give a conditional ACK -- conditional on fixing whitespace issues and modifying aeolus_image.rb to include the missing include we discussed on IRC, but otherwise not introducing any new changes. Best, Matt

1 0

[PATCH aeolus-image-rubygem 1/4] Moved warehouse models in Warehouse Module
by Martyn Taylor 29 Sep '11

29 Sep '11

From: Martyn Taylor <mtaylor(a)redhat.com> This will help separate the warehouse and factory models --- lib/aeolus_image.rb | 21 +-- lib/aeolus_image/model/image.rb | 91 ---------- lib/aeolus_image/model/image_build.rb | 68 -------- lib/aeolus_image/model/provider_image.rb | 46 ----- lib/aeolus_image/model/target_image.rb | 56 ------ lib/aeolus_image/model/template.rb | 29 --- lib/aeolus_image/model/warehouse/image.rb | 93 ++++++++++ lib/aeolus_image/model/warehouse/image_build.rb | 70 ++++++++ lib/aeolus_image/model/warehouse/provider_image.rb | 48 +++++ lib/aeolus_image/model/warehouse/target_image.rb | 58 +++++++ lib/aeolus_image/model/warehouse/template.rb | 31 ++++ .../model/warehouse/warehouse_client.rb | 178 +++++++++++++++++++ .../model/warehouse/warehouse_model.rb | 162 ++++++++++++++++++ lib/aeolus_image/model/warehouse_client.rb | 180 -------------------- lib/aeolus_image/model/warehouse_model.rb | 162 ------------------ 15 files changed, 647 insertions(+), 646 deletions(-) delete mode 100644 lib/aeolus_image/model/image.rb delete mode 100644 lib/aeolus_image/model/image_build.rb delete mode 100644 lib/aeolus_image/model/provider_image.rb delete mode 100644 lib/aeolus_image/model/target_image.rb delete mode 100644 lib/aeolus_image/model/template.rb create mode 100644 lib/aeolus_image/model/warehouse/image.rb create mode 100644 lib/aeolus_image/model/warehouse/image_build.rb create mode 100644 lib/aeolus_image/model/warehouse/provider_image.rb create mode 100644 lib/aeolus_image/model/warehouse/target_image.rb create mode 100644 lib/aeolus_image/model/warehouse/template.rb create mode 100644 lib/aeolus_image/model/warehouse/warehouse_client.rb create mode 100644 lib/aeolus_image/model/warehouse/warehouse_model.rb delete mode 100644 lib/aeolus_image/model/warehouse_client.rb delete mode 100644 lib/aeolus_image/model/warehouse_model.rb diff --git a/lib/aeolus_image.rb b/lib/aeolus_image.rb index f17ed66..ce23933 100644 --- a/lib/aeolus_image.rb +++ b/lib/aeolus_image.rb @@ -14,17 +14,10 @@ require 'optparse' require 'logger' -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'base_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'list_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'build_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'push_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'import_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'delete_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'config_parser') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'warehouse_client') # Not sure we need this -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'warehouse_model') # We may be able to factor this out? -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'image') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'image_build') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'provider_image') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'target_image') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'template') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'warehouse_client') # Not sure we need this +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'warehouse_model') # We may be able to factor this out? +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'image') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'image_build') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'provider_image') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'target_image') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'template') diff --git a/lib/aeolus_image/model/image.rb b/lib/aeolus_image/model/image.rb deleted file mode 100644 index 73b004e..0000000 --- a/lib/aeolus_image/model/image.rb +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class Image < WarehouseModel - OS = Struct.new(:name, :version, :arch) - - @bucket_name = 'images' - - def initialize(attrs) - attrs.each do |k,v| - if k.to_sym == :latest_build - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - @xml_body = Nokogiri::XML @body - end - - def template_xml - unless @template_xml - begin - @template_xml = Nokogiri::XML image_builds.first.target_images.first.target_template.body - rescue - @template_xml = Nokogiri::XML "<template></template>" - end - end - @template_xml - end - - def latest_pushed_build - ImageBuild.find(@latest_build) if @latest_build - end - - def image_builds - ImageBuild.find_all_by_image_uuid(@uuid) - end - - #TODO: We should get the image fields from the object body once we have it defined. - def name - unless @name - @name = @xml_body.xpath("/image/name").text - if @name.empty? - @name = template_xml.xpath("/template/name").text - end - end - @name - end - - def os - unless @os - @os = OS.new(template_xml.xpath("/template/os/name").text, template_xml.xpath("/template/os/version").text, template_xml.xpath("/template/os/arch").text) - end - @os - end - - def description - unless @description - @description = template_xml.xpath("/template/description").text - end - @description - end - - # Delete this image and all child objects - def delete! - begin - image_builds.each do |build| - build.delete! - end - rescue NoMethodError - end - Image.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/image_build.rb b/lib/aeolus_image/model/image_build.rb deleted file mode 100644 index b751117..0000000 --- a/lib/aeolus_image/model/image_build.rb +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class ImageBuild < WarehouseModel - @bucket_name = 'builds' - - def initialize(attrs) - attrs.each do |k,v| - if k.to_sym == :image - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - - def self.find_all_by_image_uuid(uuid) - self.set_warehouse_and_bucket if self.bucket.nil? - self.bucket.objects.map do |wh_object| - if wh_object.attr('image') == uuid - ImageBuild.new(wh_object.attrs(wh_object.attr_list)) - end - end.compact - end - - def image - Image.find(@image) if @image - end - - def target_images - TargetImage.all.select {|ti| ti.build and (ti.build.uuid == self.uuid)} - end - - def provider_images - targets = target_images - ProviderImage.all.select do |pi| - targets.include?(pi.target_image) - end - end - - # Deletes this image and all child objects - def delete! - begin - target_images.each do |ti| - ti.delete! - end - rescue NoMethodError - end - ImageBuild.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/provider_image.rb b/lib/aeolus_image/model/provider_image.rb deleted file mode 100644 index a5f319d..0000000 --- a/lib/aeolus_image/model/provider_image.rb +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class ProviderImage < WarehouseModel - @bucket_name = 'provider_images' - - def initialize(attrs) - attrs.each do |k,v| - if [:provider, :target_image].include?(k.to_sym) - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - - def target_image - TargetImage.find(@target_image) if @target_image - end - - def provider_name - @provider - end - - # Deletes this provider image - def delete! - ProviderImage.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/target_image.rb b/lib/aeolus_image/model/target_image.rb deleted file mode 100644 index c029430..0000000 --- a/lib/aeolus_image/model/target_image.rb +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class TargetImage < WarehouseModel - @bucket_name = 'target_images' - - def initialize(attrs) - attrs.each do |k,v| - if k.to_sym == :build - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - - def build - ImageBuild.find(@build) if @build - end - - def provider_images - ProviderImage.all.select{|pi| pi.target_image and (pi.target_image.uuid == self.uuid)} - end - - def target_template - Template.find(@template) if @template - end - - # Deletes this targetimage and all child objects - def delete! - begin - provider_images.each do |pi| - pi.delete! - end - rescue NoMethodError - end - TargetImage.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/template.rb b/lib/aeolus_image/model/template.rb deleted file mode 100644 index e1ac3cb..0000000 --- a/lib/aeolus_image/model/template.rb +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class Template < WarehouseModel - @bucket_name = 'templates' - - def initialize(attrs) - attrs.each do |k,v| - sym = :attr_accessor - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - end - end -end diff --git a/lib/aeolus_image/model/warehouse/image.rb b/lib/aeolus_image/model/warehouse/image.rb new file mode 100644 index 0000000..7a7a4f3 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/image.rb @@ -0,0 +1,93 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class Image < WarehouseModel + OS = Struct.new(:name, :version, :arch) + + @bucket_name = 'images' + + def initialize(attrs) + attrs.each do |k,v| + if k.to_sym == :latest_build + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + @xml_body = Nokogiri::XML @body + end + + def template_xml + unless @template_xml + begin + @template_xml = Nokogiri::XML image_builds.first.target_images.first.target_template.body + rescue + @template_xml = Nokogiri::XML "<template></template>" + end + end + @template_xml + end + + def latest_pushed_build + ImageBuild.find(@latest_build) if @latest_build + end + + def image_builds + ImageBuild.find_all_by_image_uuid(@uuid) + end + + #TODO: We should get the image fields from the object body once we have it defined. + def name + unless @name + @name = @xml_body.xpath("/image/name").text + if @name.empty? + @name = template_xml.xpath("/template/name").text + end + end + @name + end + + def os + unless @os + @os = OS.new(template_xml.xpath("/template/os/name").text, template_xml.xpath("/template/os/version").text, template_xml.xpath("/template/os/arch").text) + end + @os + end + + def description + unless @description + @description = template_xml.xpath("/template/description").text + end + @description + end + + # Delete this image and all child objects + def delete! + begin + image_builds.each do |build| + build.delete! + end + rescue NoMethodError + end + Image.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/image_build.rb b/lib/aeolus_image/model/warehouse/image_build.rb new file mode 100644 index 0000000..d99069d --- /dev/null +++ b/lib/aeolus_image/model/warehouse/image_build.rb @@ -0,0 +1,70 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class ImageBuild < WarehouseModel + @bucket_name = 'builds' + + def initialize(attrs) + attrs.each do |k,v| + if k.to_sym == :image + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + + def self.find_all_by_image_uuid(uuid) + self.set_warehouse_and_bucket if self.bucket.nil? + self.bucket.objects.map do |wh_object| + if wh_object.attr('image') == uuid + ImageBuild.new(wh_object.attrs(wh_object.attr_list)) + end + end.compact + end + + def image + Image.find(@image) if @image + end + + def target_images + TargetImage.all.select {|ti| ti.build and (ti.build.uuid == self.uuid)} + end + + def provider_images + targets = target_images + ProviderImage.all.select do |pi| + targets.include?(pi.target_image) + end + end + + # Deletes this image and all child objects + def delete! + begin + target_images.each do |ti| + ti.delete! + end + rescue NoMethodError + end + ImageBuild.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/provider_image.rb b/lib/aeolus_image/model/warehouse/provider_image.rb new file mode 100644 index 0000000..acd0386 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/provider_image.rb @@ -0,0 +1,48 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class ProviderImage < WarehouseModel + @bucket_name = 'provider_images' + + def initialize(attrs) + attrs.each do |k,v| + if [:provider, :target_image].include?(k.to_sym) + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + + def target_image + TargetImage.find(@target_image) if @target_image + end + + def provider_name + @provider + end + + # Deletes this provider image + def delete! + ProviderImage.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/target_image.rb b/lib/aeolus_image/model/warehouse/target_image.rb new file mode 100644 index 0000000..8636694 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/target_image.rb @@ -0,0 +1,58 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class TargetImage < WarehouseModel + @bucket_name = 'target_images' + + def initialize(attrs) + attrs.each do |k,v| + if k.to_sym == :build + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + + def build + ImageBuild.find(@build) if @build + end + + def provider_images + ProviderImage.all.select{|pi| pi.target_image and (pi.target_image.uuid == self.uuid)} + end + + def target_template + Template.find(@template) if @template + end + + # Deletes this targetimage and all child objects + def delete! + begin + provider_images.each do |pi| + pi.delete! + end + rescue NoMethodError + end + TargetImage.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/template.rb b/lib/aeolus_image/model/warehouse/template.rb new file mode 100644 index 0000000..a3b9ec5 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/template.rb @@ -0,0 +1,31 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class Template < WarehouseModel + @bucket_name = 'templates' + + def initialize(attrs) + attrs.each do |k,v| + sym = :attr_accessor + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/warehouse_client.rb b/lib/aeolus_image/model/warehouse/warehouse_client.rb new file mode 100644 index 0000000..4df83a1 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/warehouse_client.rb @@ -0,0 +1,178 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +require 'rubygems' + +require 'rest-client' +require 'nokogiri' + +#TODO: perform iwhd version-dependent URI mapping +module Aeolus + module Image + module Warehouse + class BucketObject + attr_reader :key + + def initialize(connection, key, bucket) + @connection = connection + @key = key + @bucket = bucket + @path = "/#{@bucket.name}/#{@key}" + end + + def self.create(connection, key, bucket, body, attrs = {}) + obj = new(connection, key, bucket) + obj.set_body(body) + obj.set_attrs(attrs) + obj + end + + def body + @connection.do_request @path, :plain => true + end + + def set_body(body) + @connection.do_request @path, :content => body, :method => :put + end + + def attr_list + result = @connection.do_request @path, :content => 'op=parts', :method => :post + return result.xpath('/object/object_attr/@name').to_a.map {|item| item.value} + end + + def attrs(list) + attrs = {} + list.each do |att| + next if att.match('-') + attrs[att] = (@connection.do_request("#{@path}/#{att}", :plain => true) rescue nil) + end + attrs[:body] = body + attrs + end + + def attr(name) + attrs([name])[name] + end + + def set_attrs(hash) + hash.each do |name, content| + set_attr(name, content) + end + end + + def set_attr(name, content) + path = "#{@path}/#{name}" + @connection.do_request path, :content => content, :method => :put + end + + def delete! + @connection.do_request @path, :method => :delete + true + end + + end + + class Bucket + attr_accessor :name + + def initialize(name, connection) + @name = name + @connection = connection + end + + def to_s + "Bucket: #{@name}" + end + + def object_names + result = @connection.do_request "/#{@name}" + result.xpath('/objects/object').map do |obj| + obj.at_xpath('./key/text()').to_s + end + end + + def objects + object_names.map do |name| + object(name) + end + end + + def object(key) + BucketObject.new @connection, key, self + end + + def create_object(key, body, attrs) + BucketObject.create(@connection, key, self, body, attrs) + end + + def include?(key) + object_names.include?(key) + end + end + + class Connection + attr_accessor :uri + + def initialize(uri) + @uri = uri + end + + def do_request(path = '', opts={}) + opts[:method] ||= :get + opts[:content] ||= '' + opts[:plain] ||= false + opts[:headers] ||= {} + + result = RestClient::Request.execute :method => opts[:method], :url => @uri + path, :payload => opts[:content], :headers => opts[:headers] + + return Nokogiri::XML result unless opts[:plain] + return result + end + + end + + class Client + + def initialize(uri) + @connection = Connection.new(uri) + end + + def create_bucket(bucket) + @connection.do_request "/#{bucket}", :method => :put rescue RestClient::InternalServerError + Bucket.new(bucket, @connection) + end + + def bucket(bucket) + Bucket.new bucket, @connection + end + + def buckets + @connection.do_request.xpath('/api/link[@rel="bucket"]').map do |obj| + obj.at_xpath('./@href').to_s.gsub(/.*\//, '') + end + end + + def get_iwhd_version + result = @connection.do_request.at_xpath('/api[@service="image_warehouse"]/@version') + raise "Response does not contain <api> tag or version information" if result == nil + return result.value + end + + def query(bucket_name, query_string) + @connection.do_request "/#{bucket_name}/_query", {:method => :post, :content => query_string} + end + end + end + end +end diff --git a/lib/aeolus_image/model/warehouse/warehouse_model.rb b/lib/aeolus_image/model/warehouse/warehouse_model.rb new file mode 100644 index 0000000..2631c5b --- /dev/null +++ b/lib/aeolus_image/model/warehouse/warehouse_model.rb @@ -0,0 +1,162 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class BucketObjectNotFound < Exception;end + class BucketNotFound < Exception;end + + class WarehouseModel + + def ==(other_obj) + # If the objects have different instance variables defined, they're definitely not == + return false unless instance_variables.sort == other_obj.instance_variables.sort + # Otherwise, ensure that they're all the same + instance_variables.each do |iv| + return false unless other_obj.instance_variable_get(iv) == instance_variable_get(iv) + end + # They have the same instance variables and values, so they're equal + true + end + + class << self + attr_accessor :warehouse, :bucket, :bucket_name + + def set_warehouse_and_bucket + begin + @@config ||= load_config + self.warehouse = Warehouse::Client.new(@@config[:iwhd][:url]) + self.bucket = self.warehouse.bucket(@bucket_name) + rescue + raise BucketNotFound + end + end + + def bucket_objects + self.set_warehouse_and_bucket if self.bucket.nil? + + begin + self.bucket.objects + rescue RestClient::ResourceNotFound + [] + end + end + + def first + obj = bucket_objects.first + obj ? self.new(obj.attrs(obj.attr_list)) : nil + end + + def last + obj = bucket_objects.last + obj ? self.new(obj.attrs(obj.attr_list)) : nil + end + + def all + bucket_objects.map do |wh_object| + self.new(wh_object.attrs(wh_object.attr_list)) + end + end + + def find(uuid) + self.set_warehouse_and_bucket if self.bucket.nil? + begin + if self.bucket.include?(uuid) + self.new(self.bucket.object(uuid).attrs(self.bucket.object(uuid).attr_list)) + else + nil + end + rescue RestClient::ResourceNotFound + nil + end + end + + def where(query_string) + self.set_warehouse_and_bucket if self.bucket.nil? + self.warehouse.query(@bucket_name, query_string) + end + + def delete(uuid) + self.set_warehouse_and_bucket if self.bucket.nil? + begin + if self.bucket.include?(uuid) + self.bucket.object(uuid).delete! + else + false + end + rescue RestClient::ResourceNotFound + false + end + end + + protected + # Copy over entirely too much code to load the config file + def load_config + # TODO - Is this always the case? We should probably have /etc/aeolus-cli or something too? + # Or allow Rails to override this + @config_location ||= "~/.aeolus-cli" + begin + file_str = read_file(@config_location) + if is_file?(@config_location) && !file_str.include?(":url") + lines = File.readlines(File.expand_path((a)config_location)).map do |line| + "#" + line + end + File.open(File.expand_path(@config_location), 'w') do |file| + file.puts lines + end + write_file + end + write_file unless is_file?(@config_location) + YAML::load(File.open(File.expand_path(@config_location))) + rescue Errno::ENOENT + #TODO: Create a custom exception to wrap CLI Exceptions + raise "Unable to locate or write configuration file: \"" + @config_location + "\"" + end + end + + def write_file + example = File.read(File.expand_path(File.dirname(__FILE__) + "/../../examples/aeolus-cli")) + File.open(File.expand_path(@config_location), 'a+') do |f| + f.write(example) + end + end + + def read_file(path) + begin + full_path = File.expand_path(path) + if is_file?(path) + File.read(full_path) + else + return nil + end + rescue + nil + end + end + + def is_file?(path) + full_path = File.expand_path(path) + if File.exist?(full_path) && !File.directory?(full_path) + return true + end + false + end + + end + + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse_client.rb b/lib/aeolus_image/model/warehouse_client.rb deleted file mode 100644 index f0da7ff..0000000 --- a/lib/aeolus_image/model/warehouse_client.rb +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -require 'rubygems' - -require 'rest-client' -require 'nokogiri' - -#TODO: perform iwhd version-dependent URI mapping -module Aeolus - module Image - module Warehouse - - class BucketObject - attr_reader :key - - def initialize(connection, key, bucket) - @connection = connection - @key = key - @bucket = bucket - @path = "/#{@bucket.name}/#{@key}" - end - - def self.create(connection, key, bucket, body, attrs = {}) - obj = new(connection, key, bucket) - obj.set_body(body) - obj.set_attrs(attrs) - obj - end - - def body - @connection.do_request @path, :plain => true - end - - def set_body(body) - @connection.do_request @path, :content => body, :method => :put - end - - def attr_list - result = @connection.do_request @path, :content => 'op=parts', :method => :post - return result.xpath('/object/object_attr/@name').to_a.map {|item| item.value} - end - - def attrs(list) - attrs = {} - list.each do |att| - next if att.match('-') - attrs[att] = (@connection.do_request("#{@path}/#{att}", :plain => true) rescue nil) - end - attrs[:body] = body - attrs - end - - def attr(name) - attrs([name])[name] - end - - def set_attrs(hash) - hash.each do |name, content| - set_attr(name, content) - end - end - - def set_attr(name, content) - path = "#{@path}/#{name}" - @connection.do_request path, :content => content, :method => :put - end - - def delete! - @connection.do_request @path, :method => :delete - true - end - - end - - class Bucket - attr_accessor :name - - def initialize(name, connection) - @name = name - @connection = connection - end - - def to_s - "Bucket: #{@name}" - end - - def object_names - result = @connection.do_request "/#{@name}" - result.xpath('/objects/object').map do |obj| - obj.at_xpath('./key/text()').to_s - end - end - - def objects - object_names.map do |name| - object(name) - end - end - - def object(key) - BucketObject.new @connection, key, self - end - - def create_object(key, body, attrs) - BucketObject.create(@connection, key, self, body, attrs) - end - - def include?(key) - object_names.include?(key) - end - end - - class Connection - attr_accessor :uri - - def initialize(uri) - @uri = uri - end - - def do_request(path = '', opts={}) - opts[:method] ||= :get - opts[:content] ||= '' - opts[:plain] ||= false - opts[:headers] ||= {} - - result = RestClient::Request.execute :method => opts[:method], :url => @uri + path, :payload => opts[:content], :headers => opts[:headers] - - return Nokogiri::XML result unless opts[:plain] - return result - end - - end - - class Client - - def initialize(uri) - @connection = Connection.new(uri) - end - - def create_bucket(bucket) - @connection.do_request "/#{bucket}", :method => :put rescue RestClient::InternalServerError - Bucket.new(bucket, @connection) - end - - def bucket(bucket) - Bucket.new bucket, @connection - end - - def buckets - @connection.do_request.xpath('/api/link[@rel="bucket"]').map do |obj| - obj.at_xpath('./@href').to_s.gsub(/.*\//, '') - end - end - - def get_iwhd_version - result = @connection.do_request.at_xpath('/api[@service="image_warehouse"]/@version') - raise "Response does not contain <api> tag or version information" if result == nil - return result.value - end - - def query(bucket_name, query_string) - @connection.do_request "/#{bucket_name}/_query", {:method => :post, :content => query_string} - end - end - - end - end -end diff --git a/lib/aeolus_image/model/warehouse_model.rb b/lib/aeolus_image/model/warehouse_model.rb deleted file mode 100644 index 2586f6d..0000000 --- a/lib/aeolus_image/model/warehouse_model.rb +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - # require 'warehouse_client' - include Warehouse - class BucketObjectNotFound < Exception;end - class BucketNotFound < Exception;end - - class WarehouseModel - - def ==(other_obj) - # If the objects have different instance variables defined, they're definitely not == - return false unless instance_variables.sort == other_obj.instance_variables.sort - # Otherwise, ensure that they're all the same - instance_variables.each do |iv| - return false unless other_obj.instance_variable_get(iv) == instance_variable_get(iv) - end - # They have the same instance variables and values, so they're equal - true - end - - class << self - attr_accessor :warehouse, :bucket, :bucket_name - - def set_warehouse_and_bucket - begin - @@config ||= load_config - self.warehouse = Warehouse::Client.new(@@config[:iwhd][:url]) - self.bucket = self.warehouse.bucket(@bucket_name) - rescue - raise BucketNotFound - end - end - - def bucket_objects - self.set_warehouse_and_bucket if self.bucket.nil? - - begin - self.bucket.objects - rescue RestClient::ResourceNotFound - [] - end - end - - def first - obj = bucket_objects.first - obj ? self.new(obj.attrs(obj.attr_list)) : nil - end - - def last - obj = bucket_objects.last - obj ? self.new(obj.attrs(obj.attr_list)) : nil - end - - def all - bucket_objects.map do |wh_object| - self.new(wh_object.attrs(wh_object.attr_list)) - end - end - - def find(uuid) - self.set_warehouse_and_bucket if self.bucket.nil? - begin - if self.bucket.include?(uuid) - self.new(self.bucket.object(uuid).attrs(self.bucket.object(uuid).attr_list)) - else - nil - end - rescue RestClient::ResourceNotFound - nil - end - end - - def where(query_string) - self.set_warehouse_and_bucket if self.bucket.nil? - self.warehouse.query(@bucket_name, query_string) - end - - def delete(uuid) - self.set_warehouse_and_bucket if self.bucket.nil? - begin - if self.bucket.include?(uuid) - self.bucket.object(uuid).delete! - else - false - end - rescue RestClient::ResourceNotFound - false - end - end - - protected - # Copy over entirely too much code to load the config file - def load_config - # TODO - Is this always the case? We should probably have /etc/aeolus-cli or something too? - # Or allow Rails to override this - @config_location ||= "~/.aeolus-cli" - begin - file_str = read_file(@config_location) - if is_file?(@config_location) && !file_str.include?(":url") - lines = File.readlines(File.expand_path((a)config_location)).map do |line| - "#" + line - end - File.open(File.expand_path(@config_location), 'w') do |file| - file.puts lines - end - write_file - end - write_file unless is_file?(@config_location) - YAML::load(File.open(File.expand_path(@config_location))) - rescue Errno::ENOENT - #TODO: Create a custom exception to wrap CLI Exceptions - raise "Unable to locate or write configuration file: \"" + @config_location + "\"" - end - end - - def write_file - example = File.read(File.expand_path(File.dirname(__FILE__) + "/../../examples/aeolus-cli")) - File.open(File.expand_path(@config_location), 'a+') do |f| - f.write(example) - end - end - - def read_file(path) - begin - full_path = File.expand_path(path) - if is_file?(path) - File.read(full_path) - else - return nil - end - rescue - nil - end - end - - def is_file?(path) - full_path = File.expand_path(path) - if File.exist?(full_path) && !File.directory?(full_path) - return true - end - false - end - - end - - end - end -end -- 1.7.6.2

1 3

[PATCH conductor] Update lockfile for new restful_submit version.
by Jason Guiditta 29 Sep '11

29 Sep '11

--- src/Gemfile.lock | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Gemfile.lock b/src/Gemfile.lock index 122990b..5c0b601 100644 --- a/src/Gemfile.lock +++ b/src/Gemfile.lock @@ -90,8 +90,8 @@ GEM rack-mount (0.7.1) rack (>= 1.0.0) regin (>= 0.3.7) - rack-restful_submit (1.1.2) - rack (~> 1.1) + rack-restful_submit (1.2.1) + rack (~> 1.3.0) rack-test (0.6.0) rack (>= 1.0) rails (3.0.9) -- 1.7.6.2

1 0

Migrating running instances from EC2 -> RHEV with Aeolus (and other cross cloud migrations/scaling) - draft1
by Mo Morsi 29 Sep '11

29 Sep '11

This patchset adds support for cross-cloud migrations, or moving a running instance from one cloud provider to another. This also can easily be expanded to support cross-cloud scaling which is the same as cross-cloud migrations, but will leaving the original instance untouched This makes use of snap [1] (my Masters project from 2008), a Python bases system snapshot and restoration utility that uses the native package management system (eg rpm/yum on Fedora, deb/apt-get on Ubuntu, etc) to record which packages are installed on the system, the files not tracked by the package management system, and the files which have been changed since installation by the package manager This is a draft revision as this feature is in progress. Most of the code is now inplace though and most of what is left from here on out is debugging. If I can get the cycles, I can fully realize a working implementation of this feature in the upcoming weeks -Mo [1] http://sourceforge.net/projects/snapshotter/ (will be moving this to github at some point soon)

2 9

Urgent bug
by Matt Wagner 29 Sep '11

29 Sep '11

Hi all, I was asked to look at this bug: https://bugzilla.redhat.com/show_bug.cgi?id=741939 For some reason, we're not properly generating instance keys on EC2 (at least), preventing any sort of end-to-end testing there. I spent about 90 minutes trying to set this up, but was sidetracked by a comical number of unrelated problems and never even got this to the point that I could reproduce it, much less begin any serious debugging. So I'm hoping someone else can pick this up, as it's marked as urgent in BZ since I assume it's blocking QE. For extra fun, you'll probably run into an issue where you can't push to EC2; the instance can't be terminated. That's outlined in https://bugzilla.redhat.com/show_bug.cgi?id=741790 -- basically you'll want to edit /usr/lib/python2.7/site-packages/imgfac/builders/Fedora_ec2_Builder.py and change all instances of "instance.stop()" to "instance.terminate()" instead. I'm afraid I've got to head out now, but given that this is a blocker, I hoped someone would be able to pick up where I left off. -- Matt

4 3

Conductor Image Management API - Initial Design
by Martyn Taylor 29 Sep '11

29 Sep '11

All, I have put down an initial design for the Image Management API to be exposed on conductor and used via aeolus-image CLI and Katello. It's in the wiki, and can be found here: https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Conductor_Image_… Thanks Martyn

2 1

Provider Accounts Quota Alerts for Providers
by Jirka Tomasek 29 Sep '11

29 Sep '11

This patch fixes BZ725682 and implemets alerts for provider accounts diplayed in related provider page. Alerts are displayed when running instances exceed the quota (eg by lowering the quota by admin) and when 70% of quota or more are reached.

2 2

[PATCH conductor 0/2] #2121 - Implements OAuth client (v2)
by Matt Wagner 29 Sep '11

29 Sep '11

Hi all, This patch adds a generic OAuthClient library to consume OAuth resources. It leverages the OAuth gem for heavy-lifting[1], but is designed to make it very easy to create new clients. (Unfortunately, the resources we wish to consume don't have OAuth support just yet, so it'sa little vague. This will work Katello, however.) This version adds tests, and lacks some of the ambiguity in the cover message that my first revision had. [1] Although this is a new dependency, it's already being carried in our repo, and is also used by Katello. -- Matt

2 5

[PATCH conductor] 0/1 BZ#740476 Successful login is not getting updated in login
by Chris Alfonso 29 Sep '11

29 Sep '11

Both basic and ldap based authentication were not incrementing the login count for the successfully authenticated user.

2 2

[PATCH 0/2] Admin UI Bugfixes
by Jirka Tomasek 29 Sep '11

29 Sep '11

Patchset fixes provider failed validation bug and replaces link_to in delete buttons with button_to

2 6

[PATCH configure 2/2] BZ 739091 - ability to run multiple profiles in a single execution - v2
by Richard Su 29 Sep '11

29 Sep '11

v2 - rebased Example: aeolus-configure -p rhevm,vsphere,ec2 --- bin/aeolus-configure | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/aeolus-configure b/bin/aeolus-configure index 4fc9c5a..8f65d37 100644 --- a/bin/aeolus-configure +++ b/bin/aeolus-configure @@ -67,9 +67,14 @@ echo "Launching aeolus configuration recipe..." export FACTER_AEOLUS_ENABLE_HTTPS=true export FACTER_AEOLUS_ENABLE_SECURITY=false -puppet /usr/share/aeolus-configure/modules/aeolus/aeolus.pp \ + +NODE_ARRAY=(`echo $PUPPET_NODE | tr "," "\n"`) +for x in "${NODE_ARRAY[@]}" +do + puppet /usr/share/aeolus-configure/modules/aeolus/aeolus.pp \ --modulepath=/usr/share/aeolus-configure/modules/ \ - --external_nodes "/bin/sh /usr/share/aeolus-configure/modules/aeolus/aeolus-node $PUPPET_NODE" --node_terminus exec \ + --external_nodes "/bin/sh /usr/share/aeolus-configure/modules/aeolus/aeolus-node $x" --node_terminus exec \ --logdest=/var/log/aeolus-configure/aeolus-configure.log \ --logdest=console \ $LOGLEVEL +done \ No newline at end of file -- 1.7.6.2

2 1

[PATCH conductor] Updated key creation
by Jan Provazník 29 Sep '11

29 Sep '11

From: Jan Provaznik <jprovazn(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=741939 changed key generation accroding to changes in new deltacloud-client lib --- src/app/models/instance.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb index 735f7d7..e6bb17a 100644 --- a/src/app/models/instance.rb +++ b/src/app/models/instance.rb @@ -247,7 +247,7 @@ class Instance < ActiveRecord::Base client = self.provider_account.connect return nil unless client && client.feature?(:instances, :authentication_key) if key = client.create_key(:name => key_name) - self.instance_key = InstanceKey.create!(:pem => key.pem.first, :name => key.id, :instance => self) + self.instance_key = InstanceKey.create!(:pem => key.pem, :name => key.id, :instance => self) self.save! end end -- 1.7.6

1 0

Error build template
by Julio Alberto Carrillo 29 Sep '11

29 Sep '11

Hi, I have errors whit i try run this command for build a template. aeolus-image build --target rhev --template f14.xml f14.xml <template> <name>f14jeos</name> <os> <name>Fedora</name> <version>14</version> <arch>x86_64</arch> <install type='url'> <url>http://download.fedoraproject.org/pub/fedora/linux/releases/14/Fedora /x86_64/os/</url> </install> </os> <description>Fedora 14</description> </template> Error i get is : 2011-09-28 17:21:54,200 DEBUG imagefactory.ImageWarehouse.ImageWarehouse pid(2176) Message: Created Image Warehouse instance http://localhost:9090 - buckets(target_images, templates, icicles, provider_images) 2011-09-28 17:21:54,208 INFO imagefactory.ImageWarehouse.ImageWarehouse pid(2176) Message: Creating a bucket returned status 500. 2011-09-28 17:21:54,214 DEBUG imagefactory.ImageWarehouse.ImageWarehouse pid(2176) Message: Setting metadata ({'object_type': 'image', 'uuid': '96d588f7-817d-43eb-bcc1-e116d443b727'}) for http://localhost:9090/images/96d588f7-817d-43eb-bcc1-e116d443b727 2011-09-28 17:21:54,261 INFO imagefactory.ImageWarehouse.ImageWarehouse pid(2176) Message: Creating a bucket returned status 500. 2011-09-28 17:21:54,264 DEBUG imagefactory.ImageWarehouse.ImageWarehouse pid(2176) Message: Setting metadata ({'image': '96d588f7-817d-43eb-bcc1-e116d443b727', 'object_type': 'build', 'uuid': '92917154-a3e3-4e35-8a3c-85f85ab4ec4e'}) for http://localhost:9090/builds/92917154-a3e3-4e35-8a3c-85f85ab4ec4e 2011-09-28 17:21:54,355 DEBUG imagefactory.ImageWarehouse.ImageWarehouse pid(2176) Message: Created Image Warehouse instance http://localhost:9090 - buckets(target_images, templates, icicles, provider_images) 2011-09-28 17:21:54,359 DEBUG imagefactory.builders.BaseBuilder.FedoraBuilder pid(2176) Message: Exception caught in ImageFactory 2011-09-28 17:21:54,360 DEBUG imagefactory.builders.BaseBuilder.FedoraBuilder pid(2176) Message: Traceback (most recent call last): File "/usr/lib/python2.6/site-packages/imagefactory/builders/FedoraBuilder.py", line 129, in build_image raise ImageFactoryException("Invalid build target (%s) passed to build_image()" % (self.target)) ImageFactoryException: Invalid build target (rhev) passed to build_image() 2011-09-28 17:21:54,363 DEBUG imagefactory.BuildJob.BuildAdaptor pid(2176) Message: Raising event with agent handler (<ImageFactoryAgent(Thread-1, initial)>), changed status from NEW to FAILED

2 1

[PATCH configure 1/2] Move ec2 and mock out of default configure and into their own profiles v3
by Richard Su 28 Sep '11

28 Sep '11

v3 - rebased v2 - removed nil cpu from hwp1, was not compatible with rhev Their profiles are activated by running "aeolus-configure -p ec2" and "aeolus-configure -p mock". Ensure all provider profiles create a default bucket. Remove whitespaces. --- conf/ec2 | 13 ++++++ conf/mock | 12 ++++++ recipes/aeolus/manifests/profiles/default.pp | 41 +------------------- recipes/aeolus/manifests/profiles/ec2.pp | 52 ++++++++++++++++++++++++++ recipes/aeolus/manifests/profiles/mock.pp | 51 +++++++++++++++++++++++++ recipes/aeolus/manifests/profiles/rhevm.pp | 4 +- recipes/aeolus/manifests/profiles/vsphere.pp | 4 +- 7 files changed, 135 insertions(+), 42 deletions(-) create mode 100644 conf/ec2 create mode 100644 conf/mock create mode 100644 recipes/aeolus/manifests/profiles/ec2.pp create mode 100644 recipes/aeolus/manifests/profiles/mock.pp diff --git a/conf/ec2 b/conf/ec2 new file mode 100644 index 0000000..142887f --- /dev/null +++ b/conf/ec2 @@ -0,0 +1,13 @@ +# ec2 setup configuration. +--- +parameters: + enable_https: true + enable_security: false + package_provider: rpm +classes: +- aeolus::conductor +- aeolus::image-factory +- aeolus::iwhd +- aeolus::deltacloud::core +- aeolus::deltacloud::ec2 +- aeolus::profiles::ec2 diff --git a/conf/mock b/conf/mock new file mode 100644 index 0000000..087c329 --- /dev/null +++ b/conf/mock @@ -0,0 +1,12 @@ +# mock setup configuration. +--- +parameters: + enable_https: true + enable_security: false + package_provider: rpm +classes: +- aeolus::conductor +- aeolus::image-factory +- aeolus::iwhd +- aeolus::deltacloud::core +- aeolus::profiles::mock diff --git a/recipes/aeolus/manifests/profiles/default.pp b/recipes/aeolus/manifests/profiles/default.pp index 8bbfb7f..c3a58cd 100644 --- a/recipes/aeolus/manifests/profiles/default.pp +++ b/recipes/aeolus/manifests/profiles/default.pp @@ -13,7 +13,6 @@ # limitations under the License. class aeolus::profiles::default { - include aeolus::deltacloud::ec2 aeolus::create_bucket{"aeolus":} @@ -25,31 +24,7 @@ class aeolus::profiles::default { aeolus::conductor::login{"admin": password => "password", require => Aeolus::Conductor::Site_admin['admin']} - - aeolus::conductor::provider{"mock": - deltacloud_driver => 'mock', - url => 'http://localhost:3002/api', - require => Aeolus::Conductor::Login["admin"] } - - aeolus::conductor::provider::account{"mockuser": - provider => 'mock', - type => 'mock', - username => 'mockuser', - password => 'mockpassword', - require => Aeolus::Conductor::Provider["mock"] } - - aeolus::conductor::provider{"ec2-us-east-1": - deltacloud_driver => 'ec2', - deltacloud_provider => 'us-east-1', - url => 'http://localhost:3002/api', - require => Aeolus::Conductor::Login["admin"] } - - aeolus::conductor::provider{"ec2-us-west-1": - deltacloud_driver => 'ec2', - deltacloud_provider => 'us-west-1', - url => 'http://localhost:3002/api', - require => Aeolus::Conductor::Login["admin"] } - + aeolus::conductor::hwp{"hwp1": memory => "512", cpu => "1", @@ -57,17 +32,7 @@ class aeolus::profiles::default { architecture => "x86_64", require => Aeolus::Conductor::Login["admin"] } - aeolus::conductor::hwp{"hwp2": - memory => "1", - cpu => "", - storage => "1", - architecture => "x86_64", - require => Aeolus::Conductor::Login["admin"] } - aeolus::conductor::logout{"admin": - require => [Aeolus::Conductor::Provider['mock'], - Aeolus::Conductor::Provider::Account['mockuser'], - Aeolus::Conductor::Provider['ec2-us-east-1'], - Aeolus::Conductor::Provider['ec2-us-west-1'], - Aeolus::Conductor::Hwp['hwp1', 'hwp2']] } + require => Aeolus::Conductor::Hwp['hwp1']} + } diff --git a/recipes/aeolus/manifests/profiles/ec2.pp b/recipes/aeolus/manifests/profiles/ec2.pp new file mode 100644 index 0000000..3dd96e0 --- /dev/null +++ b/recipes/aeolus/manifests/profiles/ec2.pp @@ -0,0 +1,52 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +class aeolus::profiles::ec2 { + include aeolus::deltacloud::ec2 + + aeolus::create_bucket{"aeolus":} + + aeolus::conductor::site_admin{"admin": + email => 'dcuser(a)aeolusproject.org', + password => "password", + first_name => 'aeolus', + last_name => 'user'} + + aeolus::conductor::login{"admin": password => "password", + require => Aeolus::Conductor::Site_admin['admin']} + + aeolus::conductor::provider{"ec2-us-east-1": + deltacloud_driver => 'ec2', + deltacloud_provider => 'us-east-1', + url => 'http://localhost:3002/api', + require => Aeolus::Conductor::Login["admin"] } + + aeolus::conductor::provider{"ec2-us-west-1": + deltacloud_driver => 'ec2', + deltacloud_provider => 'us-west-1', + url => 'http://localhost:3002/api', + require => Aeolus::Conductor::Login["admin"] } + + aeolus::conductor::hwp{"hwp1": + memory => "512", + cpu => "1", + storage => "", + architecture => "x86_64", + require => Aeolus::Conductor::Login["admin"] } + + aeolus::conductor::logout{"admin": + require => [Aeolus::Conductor::Provider['ec2-us-east-1'], + Aeolus::Conductor::Provider['ec2-us-west-1'], + Aeolus::Conductor::Hwp['hwp1']] } +} diff --git a/recipes/aeolus/manifests/profiles/mock.pp b/recipes/aeolus/manifests/profiles/mock.pp new file mode 100644 index 0000000..1656815 --- /dev/null +++ b/recipes/aeolus/manifests/profiles/mock.pp @@ -0,0 +1,51 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +class aeolus::profiles::mock { + + aeolus::create_bucket{"aeolus":} + + aeolus::conductor::site_admin{"admin": + email => 'dcuser(a)aeolusproject.org', + password => "password", + first_name => 'aeolus', + last_name => 'user'} + + aeolus::conductor::login{"admin": password => "password", + require => Aeolus::Conductor::Site_admin['admin']} + + aeolus::conductor::provider{"mock": + deltacloud_driver => 'mock', + url => 'http://localhost:3002/api', + require => Aeolus::Conductor::Login["admin"] } + + aeolus::conductor::provider::account{"mockuser": + provider => 'mock', + type => 'mock', + username => 'mockuser', + password => 'mockpassword', + require => Aeolus::Conductor::Provider["mock"] } + + aeolus::conductor::hwp{"hwp1": + memory => "512", + cpu => "1", + storage => "", + architecture => "x86_64", + require => Aeolus::Conductor::Login["admin"] } + + aeolus::conductor::logout{"admin": + require => [Aeolus::Conductor::Provider['mock'], + Aeolus::Conductor::Provider::Account['mockuser'], + Aeolus::Conductor::Hwp['hwp1']] } +} diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp index 03fef5b..93d8bad 100644 --- a/recipes/aeolus/manifests/profiles/rhevm.pp +++ b/recipes/aeolus/manifests/profiles/rhevm.pp @@ -57,14 +57,14 @@ class aeolus::profiles::rhevm { url => "http://localhost:3002/api", deltacloud_provider => "$rhevm_deltacloud_provider", require => Aeolus::Conductor::Login["admin"] } - + aeolus::conductor::provider::account{"rhevm": provider => 'rhevm', type => 'rhevm', username => '$rhevm_deltacloud_username', password => '$rhevm_deltacloud_password', require => Aeolus::Conductor::Provider["rhevm"] } - + aeolus::conductor::hwp{"hwp1": memory => "512", cpu => "1", diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp index 72a3e59..1715181 100644 --- a/recipes/aeolus/manifests/profiles/vsphere.pp +++ b/recipes/aeolus/manifests/profiles/vsphere.pp @@ -34,14 +34,14 @@ class aeolus::profiles::vsphere { url => "http://localhost:3002/api", deltacloud_provider => "$vsphere_deltacloud_provider", require => [Aeolus::Conductor::Login["admin"]] } - + aeolus::conductor::provider::account{"vsphere": provider => 'vsphere', type => 'vsphere', username => '$vsphere_username', password => '$vsphere_password', require => Aeolus::Conductor::Provider["vsphere"] } - + aeolus::conductor::hwp{"hwp1": memory => "512", cpu => "1", -- 1.7.6.2

1 0

[PATCH conductor] BZ#719375 hide stopped instances filter not working
by Chris Alfonso 28 Sep '11

28 Sep '11

BZ#719375 hide stopped instances filter not working The 'hide stopped' filter link was not working. The show method now looks at the instance state and removes it from the display if the state is stopped.

2 2

ImageFactory REST API support
by Martyn Taylor 28 Sep '11

28 Sep '11

This patch set will allow building and importing images in factory via the rest api. To build: i = Aeolus::Image::Factory::Image.new(:targets => targets, :template => template) i.save! To import: i = Aeolus::Image::Factory::Image.new(:target_identifier => "ami-1234567", :provider_name => "ec2-us-east-1", :target_name => "ec2", :image_descriptor => "<image><name>MyImage</name><image>") i.save!

1 2

[PATCH aeolus-image-rubygem] Added imagefactory REST API support
by Martyn Taylor 28 Sep '11

28 Sep '11

From: Martyn Taylor <mtaylor(a)redhat.com> --- lib/aeolus_image/model/factory/base.rb | 63 ++++++++++++++++++++++ lib/aeolus_image/model/factory/build.rb | 8 +++ lib/aeolus_image/model/factory/builder.rb | 8 +++ lib/aeolus_image/model/factory/image.rb | 8 +++ lib/aeolus_image/model/factory/provider_image.rb | 11 ++++ lib/aeolus_image/model/factory/target_image.rb | 11 ++++ 6 files changed, 109 insertions(+), 0 deletions(-) create mode 100644 lib/aeolus_image/model/factory/base.rb create mode 100644 lib/aeolus_image/model/factory/build.rb create mode 100644 lib/aeolus_image/model/factory/builder.rb create mode 100644 lib/aeolus_image/model/factory/image.rb create mode 100644 lib/aeolus_image/model/factory/provider_image.rb create mode 100644 lib/aeolus_image/model/factory/target_image.rb diff --git a/lib/aeolus_image/model/factory/base.rb b/lib/aeolus_image/model/factory/base.rb new file mode 100644 index 0000000..614a25f --- /dev/null +++ b/lib/aeolus_image/model/factory/base.rb @@ -0,0 +1,63 @@ +module Aeolus + module Image + module Factory + class Base < ActiveResource::Base + self.format = :json + + class << self + ## Remove format from the url for resources + def element_path(id, prefix_options = {}, query_options = nil) + prefix_options, query_options = split_options(prefix_options) if query_options.nil? + "#{prefix(prefix_options)}#{collection_name}/#{id}#{query_string(query_options)}" + end + + ## Remove format from the url for collections + def collection_path(prefix_options = {}, query_options = nil) + prefix_options, query_options = split_options(prefix_options) if query_options.nil? + "#{prefix(prefix_options)}#{collection_name}#{query_string(query_options)}" + end + + ## For a collection call, ActiveResource formatting is not + ## compliant with Factory's output. + def instantiate_collection(collection, prefix_options = {}) + unless collection.kind_of? Array + [instantiate_record(collection, prefix_options)] + else + collection.collect! { |record| instantiate_record(record, prefix_options) } + end + end + + ## The objects returned from this method are not automatically converted into ActiveResource instances - they are ordinary Hashes. + ## Modifications below ensures that you get ActiveResource instances. + def get(method_name, options = {}) + object_array = connection.get(custom_method_collection_url(method_name, options), headers) + if object_array.class.to_s=="Array" + object_array.collect! {|record| self.class.new.load(record)} + else + self.class.new.load(object_array) + end + end + end + + ## Instance Methods: (modifying the ActiveRecord::CustomMethods). + ## This modification is same as defined in above method + def get(method_name, options = {}) + self.class.new.load(connection.get(custom_method_element_url(method_name, options), self.class.headers)) + end + + # Modifying the url formations to make them Factory compliant + def custom_method_element_url(method_name, options = {}) + "#{self.class.prefix(prefix_options)}#{self.class.collection_name}/#{id}/" + + "#{method_name}#{self.class.send!(:query_string, options)}" + end + + # Modifying the url formations to make them Factory compliant + def self.custom_method_collection_url(method_name, options = {}) + prefix_options, query_options = split_options(options) + url = "#{prefix(prefix_options)}#{collection_name}/#{method_name}#{query_string(query_options)}" + url + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/factory/build.rb b/lib/aeolus_image/model/factory/build.rb new file mode 100644 index 0000000..b238cea --- /dev/null +++ b/lib/aeolus_image/model/factory/build.rb @@ -0,0 +1,8 @@ +module Aeolus + module Image + module Factory + class Build < Base + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/factory/builder.rb b/lib/aeolus_image/model/factory/builder.rb new file mode 100644 index 0000000..5476456 --- /dev/null +++ b/lib/aeolus_image/model/factory/builder.rb @@ -0,0 +1,8 @@ +module Aeolus + module Image + module Factory + class Builder < Base + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/factory/image.rb b/lib/aeolus_image/model/factory/image.rb new file mode 100644 index 0000000..712457f --- /dev/null +++ b/lib/aeolus_image/model/factory/image.rb @@ -0,0 +1,8 @@ +module Aeolus + module Image + module Factory + class Image < Base + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/factory/provider_image.rb b/lib/aeolus_image/model/factory/provider_image.rb new file mode 100644 index 0000000..9022c06 --- /dev/null +++ b/lib/aeolus_image/model/factory/provider_image.rb @@ -0,0 +1,11 @@ +module Aeolus + module Image + module Factory + class ProviderImage < Base + def self.status(id) + Aeolus::Image::Factory::Builder.find(id).status + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/factory/target_image.rb b/lib/aeolus_image/model/factory/target_image.rb new file mode 100644 index 0000000..4c87006 --- /dev/null +++ b/lib/aeolus_image/model/factory/target_image.rb @@ -0,0 +1,11 @@ +module Aeolus + module Image + module Factory + class TargetImage < Base + def self.status(id) + Aeolus::Image::Factory::Builder.find(id).status + end + end + end + end +end \ No newline at end of file -- 1.7.6.2

1 0

Moved warehouse models in Warehouse
by Martyn Taylor 28 Sep '11

28 Sep '11

Resent with fix

1 1

[PATCH aeolus-image-rubygem] Moved warehouse models in Warehouse Module
by Martyn Taylor 28 Sep '11

28 Sep '11

From: Martyn Taylor <mtaylor(a)redhat.com> This will help separate the warehouse and factory models --- lib/aeolus_image.rb | 21 +-- lib/aeolus_image/model/image.rb | 91 ---------- lib/aeolus_image/model/image_build.rb | 68 -------- lib/aeolus_image/model/provider_image.rb | 46 ----- lib/aeolus_image/model/target_image.rb | 56 ------ lib/aeolus_image/model/template.rb | 29 --- lib/aeolus_image/model/warehouse/image.rb | 93 ++++++++++ lib/aeolus_image/model/warehouse/image_build.rb | 70 ++++++++ lib/aeolus_image/model/warehouse/provider_image.rb | 48 +++++ lib/aeolus_image/model/warehouse/target_image.rb | 58 +++++++ lib/aeolus_image/model/warehouse/template.rb | 31 ++++ .../model/warehouse/warehouse_client.rb | 178 +++++++++++++++++++ .../model/warehouse/warehouse_model.rb | 162 ++++++++++++++++++ lib/aeolus_image/model/warehouse_client.rb | 180 -------------------- lib/aeolus_image/model/warehouse_model.rb | 162 ------------------ 15 files changed, 647 insertions(+), 646 deletions(-) delete mode 100644 lib/aeolus_image/model/image.rb delete mode 100644 lib/aeolus_image/model/image_build.rb delete mode 100644 lib/aeolus_image/model/provider_image.rb delete mode 100644 lib/aeolus_image/model/target_image.rb delete mode 100644 lib/aeolus_image/model/template.rb create mode 100644 lib/aeolus_image/model/warehouse/image.rb create mode 100644 lib/aeolus_image/model/warehouse/image_build.rb create mode 100644 lib/aeolus_image/model/warehouse/provider_image.rb create mode 100644 lib/aeolus_image/model/warehouse/target_image.rb create mode 100644 lib/aeolus_image/model/warehouse/template.rb create mode 100644 lib/aeolus_image/model/warehouse/warehouse_client.rb create mode 100644 lib/aeolus_image/model/warehouse/warehouse_model.rb delete mode 100644 lib/aeolus_image/model/warehouse_client.rb delete mode 100644 lib/aeolus_image/model/warehouse_model.rb diff --git a/lib/aeolus_image.rb b/lib/aeolus_image.rb index f17ed66..ce23933 100644 --- a/lib/aeolus_image.rb +++ b/lib/aeolus_image.rb @@ -14,17 +14,10 @@ require 'optparse' require 'logger' -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'base_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'list_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'build_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'push_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'import_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'delete_command') -require File.join(File.dirname(__FILE__), 'aeolus_image/command', 'config_parser') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'warehouse_client') # Not sure we need this -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'warehouse_model') # We may be able to factor this out? -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'image') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'image_build') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'provider_image') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'target_image') -require File.join(File.dirname(__FILE__), 'aeolus_image/model', 'template') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'warehouse_client') # Not sure we need this +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'warehouse_model') # We may be able to factor this out? +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'image') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'image_build') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'provider_image') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'target_image') +require File.join(File.dirname(__FILE__), 'aeolus_image/model/warehouse', 'template') diff --git a/lib/aeolus_image/model/image.rb b/lib/aeolus_image/model/image.rb deleted file mode 100644 index 73b004e..0000000 --- a/lib/aeolus_image/model/image.rb +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class Image < WarehouseModel - OS = Struct.new(:name, :version, :arch) - - @bucket_name = 'images' - - def initialize(attrs) - attrs.each do |k,v| - if k.to_sym == :latest_build - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - @xml_body = Nokogiri::XML @body - end - - def template_xml - unless @template_xml - begin - @template_xml = Nokogiri::XML image_builds.first.target_images.first.target_template.body - rescue - @template_xml = Nokogiri::XML "<template></template>" - end - end - @template_xml - end - - def latest_pushed_build - ImageBuild.find(@latest_build) if @latest_build - end - - def image_builds - ImageBuild.find_all_by_image_uuid(@uuid) - end - - #TODO: We should get the image fields from the object body once we have it defined. - def name - unless @name - @name = @xml_body.xpath("/image/name").text - if @name.empty? - @name = template_xml.xpath("/template/name").text - end - end - @name - end - - def os - unless @os - @os = OS.new(template_xml.xpath("/template/os/name").text, template_xml.xpath("/template/os/version").text, template_xml.xpath("/template/os/arch").text) - end - @os - end - - def description - unless @description - @description = template_xml.xpath("/template/description").text - end - @description - end - - # Delete this image and all child objects - def delete! - begin - image_builds.each do |build| - build.delete! - end - rescue NoMethodError - end - Image.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/image_build.rb b/lib/aeolus_image/model/image_build.rb deleted file mode 100644 index b751117..0000000 --- a/lib/aeolus_image/model/image_build.rb +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class ImageBuild < WarehouseModel - @bucket_name = 'builds' - - def initialize(attrs) - attrs.each do |k,v| - if k.to_sym == :image - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - - def self.find_all_by_image_uuid(uuid) - self.set_warehouse_and_bucket if self.bucket.nil? - self.bucket.objects.map do |wh_object| - if wh_object.attr('image') == uuid - ImageBuild.new(wh_object.attrs(wh_object.attr_list)) - end - end.compact - end - - def image - Image.find(@image) if @image - end - - def target_images - TargetImage.all.select {|ti| ti.build and (ti.build.uuid == self.uuid)} - end - - def provider_images - targets = target_images - ProviderImage.all.select do |pi| - targets.include?(pi.target_image) - end - end - - # Deletes this image and all child objects - def delete! - begin - target_images.each do |ti| - ti.delete! - end - rescue NoMethodError - end - ImageBuild.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/provider_image.rb b/lib/aeolus_image/model/provider_image.rb deleted file mode 100644 index a5f319d..0000000 --- a/lib/aeolus_image/model/provider_image.rb +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class ProviderImage < WarehouseModel - @bucket_name = 'provider_images' - - def initialize(attrs) - attrs.each do |k,v| - if [:provider, :target_image].include?(k.to_sym) - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - - def target_image - TargetImage.find(@target_image) if @target_image - end - - def provider_name - @provider - end - - # Deletes this provider image - def delete! - ProviderImage.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/target_image.rb b/lib/aeolus_image/model/target_image.rb deleted file mode 100644 index c029430..0000000 --- a/lib/aeolus_image/model/target_image.rb +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class TargetImage < WarehouseModel - @bucket_name = 'target_images' - - def initialize(attrs) - attrs.each do |k,v| - if k.to_sym == :build - sym = :attr_writer - else - sym = :attr_accessor - end - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - - def build - ImageBuild.find(@build) if @build - end - - def provider_images - ProviderImage.all.select{|pi| pi.target_image and (pi.target_image.uuid == self.uuid)} - end - - def target_template - Template.find(@template) if @template - end - - # Deletes this targetimage and all child objects - def delete! - begin - provider_images.each do |pi| - pi.delete! - end - rescue NoMethodError - end - TargetImage.delete(@uuid) - end - end - end -end diff --git a/lib/aeolus_image/model/template.rb b/lib/aeolus_image/model/template.rb deleted file mode 100644 index e1ac3cb..0000000 --- a/lib/aeolus_image/model/template.rb +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - class Template < WarehouseModel - @bucket_name = 'templates' - - def initialize(attrs) - attrs.each do |k,v| - sym = :attr_accessor - self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") - send(:"#{k}=", v) - end - end - end - end -end diff --git a/lib/aeolus_image/model/warehouse/image.rb b/lib/aeolus_image/model/warehouse/image.rb new file mode 100644 index 0000000..7a7a4f3 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/image.rb @@ -0,0 +1,93 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class Image < WarehouseModel + OS = Struct.new(:name, :version, :arch) + + @bucket_name = 'images' + + def initialize(attrs) + attrs.each do |k,v| + if k.to_sym == :latest_build + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + @xml_body = Nokogiri::XML @body + end + + def template_xml + unless @template_xml + begin + @template_xml = Nokogiri::XML image_builds.first.target_images.first.target_template.body + rescue + @template_xml = Nokogiri::XML "<template></template>" + end + end + @template_xml + end + + def latest_pushed_build + ImageBuild.find(@latest_build) if @latest_build + end + + def image_builds + ImageBuild.find_all_by_image_uuid(@uuid) + end + + #TODO: We should get the image fields from the object body once we have it defined. + def name + unless @name + @name = @xml_body.xpath("/image/name").text + if @name.empty? + @name = template_xml.xpath("/template/name").text + end + end + @name + end + + def os + unless @os + @os = OS.new(template_xml.xpath("/template/os/name").text, template_xml.xpath("/template/os/version").text, template_xml.xpath("/template/os/arch").text) + end + @os + end + + def description + unless @description + @description = template_xml.xpath("/template/description").text + end + @description + end + + # Delete this image and all child objects + def delete! + begin + image_builds.each do |build| + build.delete! + end + rescue NoMethodError + end + Image.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/image_build.rb b/lib/aeolus_image/model/warehouse/image_build.rb new file mode 100644 index 0000000..d99069d --- /dev/null +++ b/lib/aeolus_image/model/warehouse/image_build.rb @@ -0,0 +1,70 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class ImageBuild < WarehouseModel + @bucket_name = 'builds' + + def initialize(attrs) + attrs.each do |k,v| + if k.to_sym == :image + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + + def self.find_all_by_image_uuid(uuid) + self.set_warehouse_and_bucket if self.bucket.nil? + self.bucket.objects.map do |wh_object| + if wh_object.attr('image') == uuid + ImageBuild.new(wh_object.attrs(wh_object.attr_list)) + end + end.compact + end + + def image + Image.find(@image) if @image + end + + def target_images + TargetImage.all.select {|ti| ti.build and (ti.build.uuid == self.uuid)} + end + + def provider_images + targets = target_images + ProviderImage.all.select do |pi| + targets.include?(pi.target_image) + end + end + + # Deletes this image and all child objects + def delete! + begin + target_images.each do |ti| + ti.delete! + end + rescue NoMethodError + end + ImageBuild.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/provider_image.rb b/lib/aeolus_image/model/warehouse/provider_image.rb new file mode 100644 index 0000000..acd0386 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/provider_image.rb @@ -0,0 +1,48 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class ProviderImage < WarehouseModel + @bucket_name = 'provider_images' + + def initialize(attrs) + attrs.each do |k,v| + if [:provider, :target_image].include?(k.to_sym) + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + + def target_image + TargetImage.find(@target_image) if @target_image + end + + def provider_name + @provider + end + + # Deletes this provider image + def delete! + ProviderImage.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/target_image.rb b/lib/aeolus_image/model/warehouse/target_image.rb new file mode 100644 index 0000000..8636694 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/target_image.rb @@ -0,0 +1,58 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class TargetImage < WarehouseModel + @bucket_name = 'target_images' + + def initialize(attrs) + attrs.each do |k,v| + if k.to_sym == :build + sym = :attr_writer + else + sym = :attr_accessor + end + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + + def build + ImageBuild.find(@build) if @build + end + + def provider_images + ProviderImage.all.select{|pi| pi.target_image and (pi.target_image.uuid == self.uuid)} + end + + def target_template + Template.find(@template) if @template + end + + # Deletes this targetimage and all child objects + def delete! + begin + provider_images.each do |pi| + pi.delete! + end + rescue NoMethodError + end + TargetImage.delete(@uuid) + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/template.rb b/lib/aeolus_image/model/warehouse/template.rb new file mode 100644 index 0000000..a3b9ec5 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/template.rb @@ -0,0 +1,31 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class Template < WarehouseModel + @bucket_name = 'templates' + + def initialize(attrs) + attrs.each do |k,v| + sym = :attr_accessor + self.class.send(sym, k.to_sym) unless respond_to?(:"#{k}=") + send(:"#{k}=", v) + end + end + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse/warehouse_client.rb b/lib/aeolus_image/model/warehouse/warehouse_client.rb new file mode 100644 index 0000000..4df83a1 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/warehouse_client.rb @@ -0,0 +1,178 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +require 'rubygems' + +require 'rest-client' +require 'nokogiri' + +#TODO: perform iwhd version-dependent URI mapping +module Aeolus + module Image + module Warehouse + class BucketObject + attr_reader :key + + def initialize(connection, key, bucket) + @connection = connection + @key = key + @bucket = bucket + @path = "/#{@bucket.name}/#{@key}" + end + + def self.create(connection, key, bucket, body, attrs = {}) + obj = new(connection, key, bucket) + obj.set_body(body) + obj.set_attrs(attrs) + obj + end + + def body + @connection.do_request @path, :plain => true + end + + def set_body(body) + @connection.do_request @path, :content => body, :method => :put + end + + def attr_list + result = @connection.do_request @path, :content => 'op=parts', :method => :post + return result.xpath('/object/object_attr/@name').to_a.map {|item| item.value} + end + + def attrs(list) + attrs = {} + list.each do |att| + next if att.match('-') + attrs[att] = (@connection.do_request("#{@path}/#{att}", :plain => true) rescue nil) + end + attrs[:body] = body + attrs + end + + def attr(name) + attrs([name])[name] + end + + def set_attrs(hash) + hash.each do |name, content| + set_attr(name, content) + end + end + + def set_attr(name, content) + path = "#{@path}/#{name}" + @connection.do_request path, :content => content, :method => :put + end + + def delete! + @connection.do_request @path, :method => :delete + true + end + + end + + class Bucket + attr_accessor :name + + def initialize(name, connection) + @name = name + @connection = connection + end + + def to_s + "Bucket: #{@name}" + end + + def object_names + result = @connection.do_request "/#{@name}" + result.xpath('/objects/object').map do |obj| + obj.at_xpath('./key/text()').to_s + end + end + + def objects + object_names.map do |name| + object(name) + end + end + + def object(key) + BucketObject.new @connection, key, self + end + + def create_object(key, body, attrs) + BucketObject.create(@connection, key, self, body, attrs) + end + + def include?(key) + object_names.include?(key) + end + end + + class Connection + attr_accessor :uri + + def initialize(uri) + @uri = uri + end + + def do_request(path = '', opts={}) + opts[:method] ||= :get + opts[:content] ||= '' + opts[:plain] ||= false + opts[:headers] ||= {} + + result = RestClient::Request.execute :method => opts[:method], :url => @uri + path, :payload => opts[:content], :headers => opts[:headers] + + return Nokogiri::XML result unless opts[:plain] + return result + end + + end + + class Client + + def initialize(uri) + @connection = Connection.new(uri) + end + + def create_bucket(bucket) + @connection.do_request "/#{bucket}", :method => :put rescue RestClient::InternalServerError + Bucket.new(bucket, @connection) + end + + def bucket(bucket) + Bucket.new bucket, @connection + end + + def buckets + @connection.do_request.xpath('/api/link[@rel="bucket"]').map do |obj| + obj.at_xpath('./@href').to_s.gsub(/.*\//, '') + end + end + + def get_iwhd_version + result = @connection.do_request.at_xpath('/api[@service="image_warehouse"]/@version') + raise "Response does not contain <api> tag or version information" if result == nil + return result.value + end + + def query(bucket_name, query_string) + @connection.do_request "/#{bucket_name}/_query", {:method => :post, :content => query_string} + end + end + end + end +end diff --git a/lib/aeolus_image/model/warehouse/warehouse_model.rb b/lib/aeolus_image/model/warehouse/warehouse_model.rb new file mode 100644 index 0000000..3a07230 --- /dev/null +++ b/lib/aeolus_image/model/warehouse/warehouse_model.rb @@ -0,0 +1,162 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +module Aeolus + module Image + module Warehouse + class BucketObjectNotFound < Exception;end + class BucketNotFound < Exception;end + + class WarehouseModel < ActiveResource::Base + + def ==(other_obj) + # If the objects have different instance variables defined, they're definitely not == + return false unless instance_variables.sort == other_obj.instance_variables.sort + # Otherwise, ensure that they're all the same + instance_variables.each do |iv| + return false unless other_obj.instance_variable_get(iv) == instance_variable_get(iv) + end + # They have the same instance variables and values, so they're equal + true + end + + class << self + attr_accessor :warehouse, :bucket, :bucket_name + + def set_warehouse_and_bucket + begin + @@config ||= load_config + self.warehouse = Warehouse::Client.new(@@config[:iwhd][:url]) + self.bucket = self.warehouse.bucket(@bucket_name) + rescue + raise BucketNotFound + end + end + + def bucket_objects + self.set_warehouse_and_bucket if self.bucket.nil? + + begin + self.bucket.objects + rescue RestClient::ResourceNotFound + [] + end + end + + def first + obj = bucket_objects.first + obj ? self.new(obj.attrs(obj.attr_list)) : nil + end + + def last + obj = bucket_objects.last + obj ? self.new(obj.attrs(obj.attr_list)) : nil + end + + def all + bucket_objects.map do |wh_object| + self.new(wh_object.attrs(wh_object.attr_list)) + end + end + + def find(uuid) + self.set_warehouse_and_bucket if self.bucket.nil? + begin + if self.bucket.include?(uuid) + self.new(self.bucket.object(uuid).attrs(self.bucket.object(uuid).attr_list)) + else + nil + end + rescue RestClient::ResourceNotFound + nil + end + end + + def where(query_string) + self.set_warehouse_and_bucket if self.bucket.nil? + self.warehouse.query(@bucket_name, query_string) + end + + def delete(uuid) + self.set_warehouse_and_bucket if self.bucket.nil? + begin + if self.bucket.include?(uuid) + self.bucket.object(uuid).delete! + else + false + end + rescue RestClient::ResourceNotFound + false + end + end + + protected + # Copy over entirely too much code to load the config file + def load_config + # TODO - Is this always the case? We should probably have /etc/aeolus-cli or something too? + # Or allow Rails to override this + @config_location ||= "~/.aeolus-cli" + begin + file_str = read_file(@config_location) + if is_file?(@config_location) && !file_str.include?(":url") + lines = File.readlines(File.expand_path((a)config_location)).map do |line| + "#" + line + end + File.open(File.expand_path(@config_location), 'w') do |file| + file.puts lines + end + write_file + end + write_file unless is_file?(@config_location) + YAML::load(File.open(File.expand_path(@config_location))) + rescue Errno::ENOENT + #TODO: Create a custom exception to wrap CLI Exceptions + raise "Unable to locate or write configuration file: \"" + @config_location + "\"" + end + end + + def write_file + example = File.read(File.expand_path(File.dirname(__FILE__) + "/../../examples/aeolus-cli")) + File.open(File.expand_path(@config_location), 'a+') do |f| + f.write(example) + end + end + + def read_file(path) + begin + full_path = File.expand_path(path) + if is_file?(path) + File.read(full_path) + else + return nil + end + rescue + nil + end + end + + def is_file?(path) + full_path = File.expand_path(path) + if File.exist?(full_path) && !File.directory?(full_path) + return true + end + false + end + + end + + end + end + end +end \ No newline at end of file diff --git a/lib/aeolus_image/model/warehouse_client.rb b/lib/aeolus_image/model/warehouse_client.rb deleted file mode 100644 index f0da7ff..0000000 --- a/lib/aeolus_image/model/warehouse_client.rb +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -require 'rubygems' - -require 'rest-client' -require 'nokogiri' - -#TODO: perform iwhd version-dependent URI mapping -module Aeolus - module Image - module Warehouse - - class BucketObject - attr_reader :key - - def initialize(connection, key, bucket) - @connection = connection - @key = key - @bucket = bucket - @path = "/#{@bucket.name}/#{@key}" - end - - def self.create(connection, key, bucket, body, attrs = {}) - obj = new(connection, key, bucket) - obj.set_body(body) - obj.set_attrs(attrs) - obj - end - - def body - @connection.do_request @path, :plain => true - end - - def set_body(body) - @connection.do_request @path, :content => body, :method => :put - end - - def attr_list - result = @connection.do_request @path, :content => 'op=parts', :method => :post - return result.xpath('/object/object_attr/@name').to_a.map {|item| item.value} - end - - def attrs(list) - attrs = {} - list.each do |att| - next if att.match('-') - attrs[att] = (@connection.do_request("#{@path}/#{att}", :plain => true) rescue nil) - end - attrs[:body] = body - attrs - end - - def attr(name) - attrs([name])[name] - end - - def set_attrs(hash) - hash.each do |name, content| - set_attr(name, content) - end - end - - def set_attr(name, content) - path = "#{@path}/#{name}" - @connection.do_request path, :content => content, :method => :put - end - - def delete! - @connection.do_request @path, :method => :delete - true - end - - end - - class Bucket - attr_accessor :name - - def initialize(name, connection) - @name = name - @connection = connection - end - - def to_s - "Bucket: #{@name}" - end - - def object_names - result = @connection.do_request "/#{@name}" - result.xpath('/objects/object').map do |obj| - obj.at_xpath('./key/text()').to_s - end - end - - def objects - object_names.map do |name| - object(name) - end - end - - def object(key) - BucketObject.new @connection, key, self - end - - def create_object(key, body, attrs) - BucketObject.create(@connection, key, self, body, attrs) - end - - def include?(key) - object_names.include?(key) - end - end - - class Connection - attr_accessor :uri - - def initialize(uri) - @uri = uri - end - - def do_request(path = '', opts={}) - opts[:method] ||= :get - opts[:content] ||= '' - opts[:plain] ||= false - opts[:headers] ||= {} - - result = RestClient::Request.execute :method => opts[:method], :url => @uri + path, :payload => opts[:content], :headers => opts[:headers] - - return Nokogiri::XML result unless opts[:plain] - return result - end - - end - - class Client - - def initialize(uri) - @connection = Connection.new(uri) - end - - def create_bucket(bucket) - @connection.do_request "/#{bucket}", :method => :put rescue RestClient::InternalServerError - Bucket.new(bucket, @connection) - end - - def bucket(bucket) - Bucket.new bucket, @connection - end - - def buckets - @connection.do_request.xpath('/api/link[@rel="bucket"]').map do |obj| - obj.at_xpath('./@href').to_s.gsub(/.*\//, '') - end - end - - def get_iwhd_version - result = @connection.do_request.at_xpath('/api[@service="image_warehouse"]/@version') - raise "Response does not contain <api> tag or version information" if result == nil - return result.value - end - - def query(bucket_name, query_string) - @connection.do_request "/#{bucket_name}/_query", {:method => :post, :content => query_string} - end - end - - end - end -end diff --git a/lib/aeolus_image/model/warehouse_model.rb b/lib/aeolus_image/model/warehouse_model.rb deleted file mode 100644 index 2586f6d..0000000 --- a/lib/aeolus_image/model/warehouse_model.rb +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 2011 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -module Aeolus - module Image - # require 'warehouse_client' - include Warehouse - class BucketObjectNotFound < Exception;end - class BucketNotFound < Exception;end - - class WarehouseModel - - def ==(other_obj) - # If the objects have different instance variables defined, they're definitely not == - return false unless instance_variables.sort == other_obj.instance_variables.sort - # Otherwise, ensure that they're all the same - instance_variables.each do |iv| - return false unless other_obj.instance_variable_get(iv) == instance_variable_get(iv) - end - # They have the same instance variables and values, so they're equal - true - end - - class << self - attr_accessor :warehouse, :bucket, :bucket_name - - def set_warehouse_and_bucket - begin - @@config ||= load_config - self.warehouse = Warehouse::Client.new(@@config[:iwhd][:url]) - self.bucket = self.warehouse.bucket(@bucket_name) - rescue - raise BucketNotFound - end - end - - def bucket_objects - self.set_warehouse_and_bucket if self.bucket.nil? - - begin - self.bucket.objects - rescue RestClient::ResourceNotFound - [] - end - end - - def first - obj = bucket_objects.first - obj ? self.new(obj.attrs(obj.attr_list)) : nil - end - - def last - obj = bucket_objects.last - obj ? self.new(obj.attrs(obj.attr_list)) : nil - end - - def all - bucket_objects.map do |wh_object| - self.new(wh_object.attrs(wh_object.attr_list)) - end - end - - def find(uuid) - self.set_warehouse_and_bucket if self.bucket.nil? - begin - if self.bucket.include?(uuid) - self.new(self.bucket.object(uuid).attrs(self.bucket.object(uuid).attr_list)) - else - nil - end - rescue RestClient::ResourceNotFound - nil - end - end - - def where(query_string) - self.set_warehouse_and_bucket if self.bucket.nil? - self.warehouse.query(@bucket_name, query_string) - end - - def delete(uuid) - self.set_warehouse_and_bucket if self.bucket.nil? - begin - if self.bucket.include?(uuid) - self.bucket.object(uuid).delete! - else - false - end - rescue RestClient::ResourceNotFound - false - end - end - - protected - # Copy over entirely too much code to load the config file - def load_config - # TODO - Is this always the case? We should probably have /etc/aeolus-cli or something too? - # Or allow Rails to override this - @config_location ||= "~/.aeolus-cli" - begin - file_str = read_file(@config_location) - if is_file?(@config_location) && !file_str.include?(":url") - lines = File.readlines(File.expand_path((a)config_location)).map do |line| - "#" + line - end - File.open(File.expand_path(@config_location), 'w') do |file| - file.puts lines - end - write_file - end - write_file unless is_file?(@config_location) - YAML::load(File.open(File.expand_path(@config_location))) - rescue Errno::ENOENT - #TODO: Create a custom exception to wrap CLI Exceptions - raise "Unable to locate or write configuration file: \"" + @config_location + "\"" - end - end - - def write_file - example = File.read(File.expand_path(File.dirname(__FILE__) + "/../../examples/aeolus-cli")) - File.open(File.expand_path(@config_location), 'a+') do |f| - f.write(example) - end - end - - def read_file(path) - begin - full_path = File.expand_path(path) - if is_file?(path) - File.read(full_path) - else - return nil - end - rescue - nil - end - end - - def is_file?(path) - full_path = File.expand_path(path) - if File.exist?(full_path) && !File.directory?(full_path) - return true - end - false - end - - end - - end - end -end -- 1.7.6.2

1 0

[mspevack@fedoraproject.org: Re: Fedora Test AMI]
by Hugh O. Brock 27 Sep '11

27 Sep '11

Cloud-init is going into Fedora. I know it's only useful for EC2 at the moment, but should we be looking at leveraging it? --Hugh -- == Hugh Brock, hbrock(a)redhat.com == == Engineering Manager, Cloud BU == == Aeolus Project: Manage virtual infrastructure across clouds. == == http://aeolusproject.org == "I know that you believe you understand what you think I said, but I’m not sure you realize that what you heard is not what I meant." --Robert McCloskey

4 6

RSpec test failures
by Matt Wagner 27 Sep '11

27 Sep '11

Is anyone else seeing 12 failing specs on master? I filed https://www.aeolusproject.org/redmine/issues/2412 for this. I'm going to take a look now, but suspect someone more familiar could make short work of these. -- Matt

1 0

[PATCH conductor 0/1] BZ741711 - Fix HWP CPU bug
by Matt Wagner 27 Sep '11

27 Sep '11

Wes hit a bug with Hardware Profile matching. It turns out that HardwareProfile.generate_override_property_values was returning the front-end value for HWPs if the provider value was a range. This meant that if you designed a front-end profile with, say, nil CPUs (meaning "no prerefence"), and it matched onto a provider HWP with a range (1-4 for VMware), we'd end up passing the "nil CPUs" parameter to deltacloud when trying to start an instance. This also adds a test case for this to try to keep us from having so many regressions here. -- Matt

1 2

Re: [PATCH] BZ#741388 Adding directions to install aeolus-conductor-devel
by Chris Lalancette 27 Sep '11

27 Sep '11

On 09/26/11 - 06:03:02PM, Christopher Alfonso wrote: > > > On Sep 26, 2011, at 4:31 PM, Chris Lalancette <clalance(a)redhat.com> wrote: > > > On 09/26/11 - 01:30:47PM, Chris Alfonso wrote: > >> rubygem-rspec is installed by aeolus-conductor-devel, which is required > >> before rake tasks can be run. I've added documentation to the README > >> to direct the user to install the aeolus-conductor-devel package before > >> running rake rpms. > >> --- > >> README | 4 ++-- > >> 1 files changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/README b/README > >> index 1a596ff..e96cf2b 100644 > >> --- a/README > >> +++ b/README > >> @@ -12,8 +12,8 @@ to install and configure aeolus components. To make use > >> of this recipe, drop it into your puppet module path or > >> alternatively build and install the aeolus-configure rpm > >> which contains the recipe and some wrapper scripts to configure > >> -the aeolus components. > >> - > >> +the aeolus components. Before executing the rake rpms task, you > >> +will need to install the aeolus-conductor-devel package. > > > > That seems a bit...self-referential. I would change this to just reference > > the package directly: > > > > "Before executing the rake rpms task, will need to install the rspec gem" > > > > I thought about that, but I think that will require us to update the readme each time we add a dependency to the Rakefile. From what I gathered, we expect developers to install the devel package as a prerequisite to building. Since the configure project doesn't have the aeolus-conductor-devel spec, I didn't see it as self-referential. Agree/Disagree? Ah, I missed it was for configure and not conductor. In any case, I think I would still reference the package directly. We shouldn't be adding new dependencies to the Rakefile often; if we do, that is a sign that we are adding too many dependencies. -- Chris Lalancette

2 1

[PATCH configure] BZ#741388 Adding directions to install
by Chris Alfonso 26 Sep '11

26 Sep '11

rubygem-rspec is installed by aeolus-conductor-devel, which is required before rake tasks can be run. I've added documentation to the README to direct the user to install the aeolus-conductor-devel package before running rake rpms.

2 2

cloudsh - a single command to deploy, migrate, etc cloud instances
by Mo Morsi 26 Sep '11

26 Sep '11

Am continuing to work on a single unified command to leverage aeolus to perform many cloud operations in a high level manner. This is the command line interface analogous to the conductor web interface This was originally intended to go into the interactive installer in configure [1], but it really doesn't belong there. I've uploaded the initial codebase to my github account [2]. The end user simply needs to $ sudo yum install cloudsh (the only command that requires super user access) # configure providers on a system wide basis via /etc/cloud.yml or on an individual user basis via ~/.cloud.yml # deploy a new instance to a cloud $ /usr/bin/cloudsh --deploy --cloud ec2 --os fedora.15.x86_64 --repo http://my.custom.yum.repo --package mediawiki --package wordpress # migrate an instance from on cloud to another $ /usr/bin/cloudsh --migrate --from-cloud ec2 --to-cloud rhev --instance my.custom.instance.id # scale instance across clouds $ /usr/bin/cloudsh --scale --from-cloud rackspace --to-cloud rhev --instance another.instance Still a work in progress. Stay tuned for more updates, -Mo [1] https://fedorahosted.org/pipermail/aeolus-devel/2011-September/004821.html [2] http://github.com/movitto/cloudsh

2 1

[PATCH aeolus-website 0/1] Update news on website
by Matt Wagner 26 Sep '11

26 Sep '11

This patch updates news.html to link to our accounts on Twitter, Identi.ca, and Youtube. It also has a second news blurb for the presentation lutter gave at Puppetconf with a link to the slides. The homepage is also updated to include these news blurbs. We should probably think about using a CMS some day...

2 2

[PATCH conductor] Instance key may be nil for non ec2 and mock providers
by Richard Su 26 Sep '11

26 Sep '11

This would be the case for rhev and vpshere. --- src/app/util/taskomatic.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/app/util/taskomatic.rb b/src/app/util/taskomatic.rb index 84dabd0..155abe6 100644 --- a/src/app/util/taskomatic.rb +++ b/src/app/util/taskomatic.rb @@ -157,7 +157,7 @@ module Taskomatic :hwp_cpu => overrides[:cpu], :hwp_storage => overrides[:storage], :realm_id => (match.realm.external_key rescue nil), - :keyname => (instance.instance_key.name)) + :keyname => (instance.instance_key.name rescue nil)) end def self.matches(instance) -- 1.7.6.2

3 4

Problem with new Admin UI stylesheets
by Jirka Tomasek 26 Sep '11

26 Sep '11

If you pull latest Admin UI changes from master you will probably need to recompile stylesheets because the compiled stylesheets are in .gitignore. From src folder run sass --watch app/stylesheets:public/stylesheets/compiled There are also a few bugs in Cloud Providers section which I am working on to get fixed. Jirka

1 0

[PATCH conductor] BZ#740939 Rename button-to css class to button_to, aligns
by Chris Alfonso 26 Sep '11

26 Sep '11

https://bugzilla.redhat.com/show_bug.cgi?id=740939 Rails button-to ActionView::HelperUrlHelper has a method called button_to. The button_to method automatically renders a style class on the element called button_to. This patch changes the stylesheet class name to button_to. This patch has been pushed to master as it's a very minor css change.

1 1

[PATCH conductor] Added permissions checking when listing hw profiles
by Jan Provazník 26 Sep '11

26 Sep '11

From: Jan Provaznik <jprovazn(a)redhat.com> BZ 739912 https://www.aeolusproject.org/redmine/issues/2386 --- .../controllers/hardware_profiles_controller.rb | 12 ++++---- .../hardware_profiles_controller_spec.rb | 28 +++++++++++++------ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb index 2463697..0e7249d 100644 --- a/src/app/controllers/hardware_profiles_controller.rb +++ b/src/app/controllers/hardware_profiles_controller.rb @@ -33,7 +33,7 @@ class HardwareProfilesController < ApplicationController save_breadcrumb(hardware_profiles_path) @params = params respond_to do |format| - format.html { load_hardware_profiles } + format.html format.js do build_hardware_profile(params[:hardware_profile]) matching_provider_hardware_profiles @@ -213,13 +213,13 @@ class HardwareProfilesController < ApplicationController end def load_hardware_profiles - sort_field = params[:order_field].nil? ? "name" : params[:order_field] - sort_order = params[:order_dir] == "asc" || params[:order_dir].nil? ? "" : "desc" + sort_field = params[:order_field].blank? ? "name" : params[:order_field] + sort_order = params[:order_dir].to_s == "desc" ? "desc" : "asc" if sort_field == "name" - @hardware_profiles = HardwareProfile.all(:order => sort_field + " " + sort_order, :conditions => 'provider_id IS NULL') + @hardware_profiles = HardwareProfile.list_for_user(current_user, Privilege::VIEW, :order => "hardware_profiles.name #{sort_order}", :conditions => ['provider_id IS NULL', {}]) else - @hardware_profiles = HardwareProfile.all(:conditions => 'provider_id IS NULL') - if sort_order == "" + @hardware_profiles = HardwareProfile.list_for_user(current_user, Privilege::VIEW, :conditions => ['provider_id IS NULL', {}]) + if sort_order == "asc" @hardware_profiles.sort! {|x,y| x.get_property_map[sort_field].sort_value(true) <=> y.get_property_map[sort_field].sort_value(true)} else @hardware_profiles.sort! {|x,y| y.get_property_map[sort_field].sort_value(false) <=> x.get_property_map[sort_field].sort_value(false)} diff --git a/src/spec/controllers/hardware_profiles_controller_spec.rb b/src/spec/controllers/hardware_profiles_controller_spec.rb index ef2db46..cd5cb6d 100644 --- a/src/spec/controllers/hardware_profiles_controller_spec.rb +++ b/src/spec/controllers/hardware_profiles_controller_spec.rb @@ -26,18 +26,18 @@ describe HardwareProfilesController do @admin = @admin_permission.user end - it "should provide ui to view all hardware profiles" do - mock_warden(@admin) - @request.accept = "text/html" - get :index - response.should be_success - assigns[:hardware_profiles].size.should == HardwareProfile.count - response.should render_template("index") - end - describe "Authorization" do context "Admin" do + it "should provide ui to view all hardware profiles" do + mock_warden(@admin) + @request.accept = "text/html" + get :index + response.should be_success + assigns[:hardware_profiles].size.should == HardwareProfile.count + response.should render_template("index") + end + it "should be able to create hardware profiles" do mock_warden(@admin) lambda do @@ -86,6 +86,16 @@ describe HardwareProfilesController do @user = @user_permission.user end + it "should not list hw profiles which I'm not allowed to see" do + hardware_profile = Factory.create :hardware_profile + mock_warden(@user) + @request.accept = "text/html" + get :index + response.should be_success + assigns[:hardware_profiles].find {|p| p.name == hardware_profile.name}.should be_nil + response.should render_template("index") + end + it "should not be able to create hardware profiles" do mock_warden(@user) lambda do -- 1.7.6

2 1

[PATCH conductor] BZ#740939 Rename button-to css class to button_to, aligns
by Chris.Alfonso＠redhat.com 26 Sep '11

26 Sep '11

https://bugzilla.redhat.com/show_bug.cgi?id=740939 Rails button-to ActionView::HelperUrlHelper has a method called button_to. The button_to method automatically renders a style class on the element called button_to. This patch changes the stylesheet class name to button_to. I already pushed this patch to master since it's so trivial.

1 1

[PATCH 0/12] New Admin UI
by Jirka Tomasek 26 Sep '11

26 Sep '11

This patchset implements all nessesary changes to merge admin_ui branch to master. Cloud Providers section is complete, realms and hardware profile tabs under Provider shows list of related realms/hwp's, the routes for realms and hwp's remained the same to enable direct listing for now. Users and Groups section has Users implemented. All other sections have adapted new admin ui style and work. This patchset implements redmine #2333, 2384, 2378 and 2236

2 14

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

aeolus-devel September 2011