Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Side by Side Diff: boto/rds/__init__.py

Issue 8669001: Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55 (Closed) Base URL: svn://svn.chromium.org/boto
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « boto/mturk/connection.py ('k') | boto/s3/bucket.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 Mitch Garnaat http://garnaat.org/ 1 # Copyright (c) 2009 Mitch Garnaat http://garnaat.org/
2 # 2 #
3 # Permission is hereby granted, free of charge, to any person obtaining a 3 # Permission is hereby granted, free of charge, to any person obtaining a
4 # copy of this software and associated documentation files (the 4 # copy of this software and associated documentation files (the
5 # "Software"), to deal in the Software without restriction, including 5 # "Software"), to deal in the Software without restriction, including
6 # without limitation the rights to use, copy, modify, merge, publish, dis- 6 # without limitation the rights to use, copy, modify, merge, publish, dis-
7 # tribute, sublicense, and/or sell copies of the Software, and to permit 7 # tribute, sublicense, and/or sell copies of the Software, and to permit
8 # persons to whom the Software is furnished to do so, subject to the fol- 8 # persons to whom the Software is furnished to do so, subject to the fol-
9 # lowing conditions: 9 # lowing conditions:
10 # 10 #
(...skipping 25 matching lines...) Expand all
36 36
37 :rtype: list 37 :rtype: list
38 :return: A list of :class:`boto.rds.regioninfo.RDSRegionInfo` 38 :return: A list of :class:`boto.rds.regioninfo.RDSRegionInfo`
39 """ 39 """
40 return [RDSRegionInfo(name='us-east-1', 40 return [RDSRegionInfo(name='us-east-1',
41 endpoint='rds.us-east-1.amazonaws.com'), 41 endpoint='rds.us-east-1.amazonaws.com'),
42 RDSRegionInfo(name='eu-west-1', 42 RDSRegionInfo(name='eu-west-1',
43 endpoint='rds.eu-west-1.amazonaws.com'), 43 endpoint='rds.eu-west-1.amazonaws.com'),
44 RDSRegionInfo(name='us-west-1', 44 RDSRegionInfo(name='us-west-1',
45 endpoint='rds.us-west-1.amazonaws.com'), 45 endpoint='rds.us-west-1.amazonaws.com'),
46 RDSRegionInfo(name='us-west-2',
47 endpoint='rds.us-west-2.amazonaws.com'),
46 RDSRegionInfo(name='ap-northeast-1', 48 RDSRegionInfo(name='ap-northeast-1',
47 endpoint='rds.ap-northeast-1.amazonaws.com'), 49 endpoint='rds.ap-northeast-1.amazonaws.com'),
48 RDSRegionInfo(name='ap-southeast-1', 50 RDSRegionInfo(name='ap-southeast-1',
49 endpoint='rds.ap-southeast-1.amazonaws.com') 51 endpoint='rds.ap-southeast-1.amazonaws.com')
50 ] 52 ]
51 53
52 def connect_to_region(region_name, **kw_params): 54 def connect_to_region(region_name, **kw_params):
53 """ 55 """
54 Given a valid region name, return a 56 Given a valid region name, return a
55 :class:`boto.ec2.connection.EC2Connection`. 57 :class:`boto.ec2.connection.EC2Connection`.
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 return pg 551 return pg
550 552
551 def create_parameter_group(self, name, engine='MySQL5.1', description=''): 553 def create_parameter_group(self, name, engine='MySQL5.1', description=''):
552 """ 554 """
553 Create a new dbparameter group for your account. 555 Create a new dbparameter group for your account.
554 556
555 :type name: string 557 :type name: string
556 :param name: The name of the new dbparameter group 558 :param name: The name of the new dbparameter group
557 559
558 :type engine: str 560 :type engine: str
559 :param engine: Name of database engine. Must be MySQL5.1 for now. 561 :param engine: Name of database engine.
560 562
561 :type description: string 563 :type description: string
562 :param description: The description of the new security group 564 :param description: The description of the new security group
563 565
564 :rtype: :class:`boto.rds.dbsecuritygroup.DBSecurityGroup` 566 :rtype: :class:`boto.rds.dbsecuritygroup.DBSecurityGroup`
565 :return: The newly created DBSecurityGroup 567 :return: The newly created DBSecurityGroup
566 """ 568 """
567 params = {'DBParameterGroupName': name, 569 params = {'DBParameterGroupName': name,
568 'Engine': engine, 570 'DBParameterGroupFamily': engine,
569 'Description' : description} 571 'Description' : description}
570 return self.get_object('CreateDBParameterGroup', params, ParameterGroup) 572 return self.get_object('CreateDBParameterGroup', params, ParameterGroup)
571 573
572 def modify_parameter_group(self, name, parameters=None): 574 def modify_parameter_group(self, name, parameters=None):
573 """ 575 """
574 Modify a parameter group for your account. 576 Modify a parameter group for your account.
575 577
576 :type name: string 578 :type name: string
577 :param name: The name of the new parameter group 579 :param name: The name of the new parameter group
578 580
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 params['StartTime'] = start_time.isoformat() 991 params['StartTime'] = start_time.isoformat()
990 if end_time: 992 if end_time:
991 params['EndTime'] = end_time.isoformat() 993 params['EndTime'] = end_time.isoformat()
992 if max_records: 994 if max_records:
993 params['MaxRecords'] = max_records 995 params['MaxRecords'] = max_records
994 if marker: 996 if marker:
995 params['Marker'] = marker 997 params['Marker'] = marker
996 return self.get_list('DescribeEvents', params, [('Event', Event)]) 998 return self.get_list('DescribeEvents', params, [('Event', Event)])
997 999
998 1000
OLDNEW
« no previous file with comments | « boto/mturk/connection.py ('k') | boto/s3/bucket.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698