Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

GUI-450 #242

Merged
merged 1 commit into from Feb 28, 2014

Conversation

Projects
None yet
2 participants
Member

dkavanagh commented Feb 27, 2014

implemented code and checks per 3.4 efforts. The services team is working on EUCA-8774 which should complete this. Suggest merging this while tracking the service dependency in Jira and testing once that is complete.

GUI-450
implemented code and checks per 3.4 efforts, but waiting on services team to answer about changes to API response for ELB calls in 4.0

dkavanagh added a commit that referenced this pull request Feb 28, 2014

@dkavanagh dkavanagh merged commit 69871cb into develop Feb 28, 2014

1 check passed

default The Travis CI build passed
Details

@dkavanagh dkavanagh deleted the GUI-450 branch Feb 28, 2014

@kamalgill kamalgill commented on the diff Feb 28, 2014

koala/forms/__init__.py
- choices.append(BLANK_CHOICE)
- # Note: self.conn is an ELBConnection
- if not load_balancers and self.conn is not None:
- load_balancers = self.conn.get_all_load_balancers()
- for load_balancer in load_balancers:
- choices.append((load_balancer.name, load_balancer.name))
+ try:
+ load_balancers = load_balancers or []
+ if add_blank:
+ choices.append(BLANK_CHOICE)
+ # Note: self.conn is an ELBConnection
+ if not load_balancers and self.conn is not None:
+ load_balancers = self.get_all_load_balancers()
+ for load_balancer in load_balancers:
+ choices.append((load_balancer.name, load_balancer.name))
+ except Exception as ex:
@kamalgill

kamalgill Feb 28, 2014

Member

This exception clause is too broad. What exception are we trying to catch here? BotoServerError?

@dkavanagh

dkavanagh Feb 28, 2014

Member

yes, perhaps. Once we get a 4.0 back end that responds properly, I'll revisit.

@kamalgill kamalgill commented on the diff Feb 28, 2014

koala/forms/__init__.py
+ self.conn.server_name())
+ http_request.params['Action'] = 'DescribeLoadBalancers'
+ http_request.params['Version'] = self.conn.APIVersion
+ response = self.conn._mexe(http_request, override_num_retries=2)
+ body = response.read()
+ boto.log.debug(body)
+ if not body:
+ boto.log.error('Null body %s' % body)
+ raise self.conn.ResponseError(response.status, response.reason, body)
+ elif response.status == 200:
+ obj = boto.resultset.ResultSet([('member', boto.ec2.elb.loadbalancer.LoadBalancer)])
+ h = boto.handler.XmlHandler(obj, self.conn)
+ import xml.sax;
+
+ xml.sax.parseString(body, h)
+ if self.saveclcdata:
@kamalgill

kamalgill Feb 28, 2014

Member

Don't need this for 4.0

@dkavanagh

dkavanagh Feb 28, 2014

Member

ah, forgot abt the mock data.. will remove.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment