Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 22 files changed
  • 0 commit comments
  • 1 contributor
View
3 .idea/misc.xml
@@ -26,9 +26,6 @@
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
- <component name="ProjectResources">
- <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
- </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
View
3 cumulus/cb/pycb/__init__.py
@@ -13,6 +13,7 @@
from optparse import OptionParser
import hmac
from pycb.cbRedirector import *
+import boto.provider
try:
from hashlib import sha1 as sha
@@ -245,7 +246,7 @@ def get_auth_hash(key, method, path, headers, uri):
path = path + sr
myhmac = hmac.new(key, digestmod=sha)
- c_string = boto.utils.canonical_string(method, path, headers)
+ c_string = boto.utils.canonical_string(method, path, headers, provider=boto.provider.get_default())
myhmac.update(c_string)
auth_hash = base64.encodestring(myhmac.digest()).strip()
return auth_hash
View
2 cumulus/cb/setup.py
@@ -43,5 +43,5 @@
needed.
""",
license="Apache2",
- install_requires = ["Twisted", "boto == 1.9b", "pyOpenSSL", "pynimbusauthz"],
+ install_requires = ["Twisted", "boto > 1.9", "pyOpenSSL", "pynimbusauthz"],
)
View
1 cumulus/reqs.txt
@@ -1,4 +1,5 @@
deps/boto-1.9b.tar.gz
+deps/boto-2.0b3.tar.gz
deps/pyOpenSSL-0.10.tar.gz
deps/zope.interface-3.6.1.tar.gz
deps/Twisted-10.0.0.tar.bz2
View
2 cumulus/tests/client/auth_tests.py
@@ -50,7 +50,7 @@ def clean_all(self, id, pw):
pass
def cb_random_bucketname(self, len):
- chars = string.letters + string.digits
+ chars = string.lowercase + string.digits
newpasswd = ""
for i in range(len):
newpasswd = newpasswd + random.choice(chars)
View
2 cumulus/tests/client/buckets_test.py
@@ -41,7 +41,7 @@ def clean_all(self):
b.delete()
def cb_random_bucketname(self, len):
- chars = string.letters + string.digits
+ chars = string.lowercase + string.digits
newpasswd = ""
for i in range(len):
newpasswd = newpasswd + random.choice(chars)
View
2 cumulus/tests/client/copy_object_tests.py
@@ -50,7 +50,7 @@ def clean_all(self, id, pw):
pass
def cb_random_bucketname(self, len):
- chars = string.letters + string.digits
+ chars = string.lowercase + string.digits
newpasswd = ""
for i in range(len):
newpasswd = newpasswd + random.choice(chars)
View
2 cumulus/tests/client/pub_auth_tests.py
@@ -50,7 +50,7 @@ def clean_all(self, id, pw):
pass
def cb_random_bucketname(self, len):
- chars = string.letters + string.digits
+ chars = string.lowercase + string.digits
newpasswd = ""
for i in range(len):
newpasswd = newpasswd + random.choice(chars)
View
2 cumulus/tests/client/quota_test.py
@@ -53,7 +53,7 @@ def clean_all(self, id, pw):
pass
def cb_random_bucketname(self, len):
- chars = string.letters + string.digits
+ chars = string.lowercase + string.digits
newpasswd = ""
for i in range(len):
newpasswd = newpasswd + random.choice(chars)
View
2 cumulus/tests/client/simple_auth.py
@@ -51,7 +51,7 @@ def clean_all(self, id, pw):
pass
def cb_random_bucketname(self, len):
- chars = string.letters + string.digits
+ chars = string.lowercase + string.digits
newpasswd = ""
for i in range(len):
newpasswd = newpasswd + random.choice(chars)
View
2 cumulus/tests/client/simple_test.py
@@ -42,7 +42,7 @@ def clean_all(self):
# pass
def cb_random_bucketname(self, len):
- chars = string.letters + string.digits
+ chars = string.lowercase + string.digits
newpasswd = ""
for i in range(len):
newpasswd = newpasswd + random.choice(chars)
View
10 docs/src/changelog.html
@@ -46,6 +46,16 @@
</li>
<li>
<p>
+ Converted to boto 2.0 API
+ </p>
+ </li>
+ <li>
+ <p>
+ Converted common repository to not contain an uppercase letter
+ </p>
+ </li>
+ <li>
+ <p>
There are also numerous bug fixes and minor enhancements.
</p>
</li>
View
6 docs/src/elclients.html
@@ -31,7 +31,7 @@
</p>
<ol>
<li>The repository bucket name</li>By default this is
- <tt class="literal">Repo</tt>
+ <tt class="literal">repo</tt>
<li>The image name prefix</li>By default this is
<tt class="literal">VMS</tt>
<li>Your canonical ID</li>The site admin must provide this to you at
@@ -62,7 +62,7 @@
cf = OrdinaryCallingFormat()
s3conn = S3Connection(s3id, s3pw, host=host, port=port, is_secure=False, calling_format=cf)
-bucket = s3conn.get_bucket("Repo")
+bucket = s3conn.get_bucket("repo")
k = Key(bucket)
k.key = "VMS/" + canonical_id + "/" + image_name
k.set_contents_from_filename(path_to_image)
@@ -144,7 +144,7 @@
s3conn = S3Connection(access_id, access_secret, host=host, port=cumulusport, is_secure=False, calling_format=cf)
# upload the file according to the Nimbus naming convention
-bucket = s3conn.get_bucket("Repo")
+bucket = s3conn.get_bucket("repo")
k = boto.s3.key.Key(bucket)
k.key = "VMS/%s/%s" % (canonical_id, "my_image_name")
k.set_contents_from_filename(&lt;path to image file&gt;)
View
2 home/libexec/nimbus_public_image.py
@@ -51,7 +51,7 @@ def setup_options(argv):
get your configuration information.
"""
(parser, all_opts) = pynimbusauthz.get_default_options(u)
- opt = cbOpts("repo", "r", "The bucket where cloud client images are stored", "Repo")
+ opt = cbOpts("repo", "r", "The bucket where cloud client images are stored", "repo")
all_opts.append(opt)
opt = cbOpts("prefix", "p", "The prefix used for images in the cloud client bucket", "VMS")
all_opts.append(opt)
View
2 home/libexec/nimbusconfigure.py
@@ -538,7 +538,7 @@ def get_hostname_no_asking(self):
def get_repobucket_no_asking(self):
# at least get this to one exact place, can determine dynamically later
- return "Repo"
+ return "repo"
def perform_setup(self):
# first, set up CA and host cert/key
View
2 home/var/cloud.properties.in
@@ -60,7 +60,7 @@ vws.factory.identity=@FACTORY_DN@
vws.repository.type=cumulus
vws.repository.s3basekey=VMS
-vws.repository.s3bucket=Repo
+vws.repository.s3bucket=repo
vws.repository.s3https=false
vws.repository.s3acceptallcerts=false
View
2 service/service/java/source/etc/workspace-service/cumulus.conf
@@ -4,6 +4,6 @@
cumulus.authz.db=$NIMBUS_HOME/cumulus/etc/authz.db
cumulus.repo.dir=$NIMBUS_HOME/cumulus/posixdata
cumulus.host=
-cumulus.repo.bucket=Repo
+cumulus.repo.bucket=repo
cumulus.repo.prefix=VMS
cumulus.publicuser=CumulusPublicUser
View
2 ...e/java/tests/suites/spotinstances/home/services/etc/nimbus/workspace-service/cumulus.conf
@@ -4,6 +4,6 @@
cumulus.authz.db=$NIMBUS_HOME/cumulus/etc/authz.db
cumulus.repo.dir=$NIMBUS_HOME/cumulus/posixdata
cumulus.host=
-cumulus.repo.bucket=Repo
+cumulus.repo.bucket=repo
cumulus.repo.prefix=VMS
cumulus.publicuser=CumulusPublicUser
View
6 tests/cc-unprop-md5test.py
@@ -49,7 +49,7 @@
sys.exit(1)
# down load the new name with s3cmd
- cmd="s3cmd get s3://Repo/VMS/%s/%s %s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name, localfile)
+ cmd="s3cmd get s3://repo/VMS/%s/%s %s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name, localfile)
print cmd
(x, rc)=pexpect.run(cmd, withexitstatus=1, logfile=logfile)
print x
@@ -62,7 +62,7 @@
print "files differ"
sys.exit(1)
- cmd="s3cmd info s3://Repo/VMS/%s/%s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], newname)
+ cmd="s3cmd info s3://repo/VMS/%s/%s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], newname)
print cmd
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('MD5 sum:')
@@ -74,7 +74,7 @@
if rc != 0:
print "s3 info failed"
sys.exit(1)
- cmd="s3cmd info s3://Repo/VMS/%s/%s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name)
+ cmd="s3cmd info s3://repo/VMS/%s/%s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name)
print cmd
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('MD5 sum:')
View
2 tests/ec2_repo_tests.py
@@ -73,7 +73,7 @@ def test_ec2_list_empty(self):
def test_ec2_list_upload(self):
# obviously this will not work if the default name changes
- bucket = self.s3conn.get_bucket("Repo")
+ bucket = self.s3conn.get_bucket("repo")
k = boto.s3.key.Key(bucket)
image_id = self.cb_random_bucketname(25)
k.key = "VMS/" + self.can_user.get_id() + "/" + image_id
View
6 tests/ec2_si_tests.py
@@ -93,7 +93,7 @@ def test_error(self):
self.assertRaises(BotoServerError, self.ec2conn.request_spot_instances, '2.0', 'nil', 1, None, None, None, None, None, None, None, None, None, 'm1.large')
def test_simple_requestSI(self):
- bucket_name = "Repo"
+ bucket_name = "repo"
bucket = self.s3conn.get_bucket(bucket_name)
k = boto.s3.key.Key(bucket)
image_name = self.cb_random_bucketname(10)
@@ -150,7 +150,7 @@ def test_simple_requestSI(self):
assert not request.instance_id, 'there shouldnt be an instance id'
def test_persistent_requestSI(self):
- bucket_name = "Repo"
+ bucket_name = "repo"
bucket = self.s3conn.get_bucket(bucket_name)
k = boto.s3.key.Key(bucket)
image_name = self.cb_random_bucketname(10)
@@ -230,7 +230,7 @@ def test_persistent_requestSI(self):
assert len(allReservations) == 0, 'incorrect result size'
def test_multiple_requestSI(self):
- bucket_name = "Repo"
+ bucket_name = "repo"
bucket = self.s3conn.get_bucket(bucket_name)
k = boto.s3.key.Key(bucket)
image_name = self.cb_random_bucketname(10)
View
4 tests/ec2_submit_tests.py
@@ -53,7 +53,7 @@ def cb_random_bucketname(self, len):
return newpasswd
def store_new_image(self):
- bucket = self.s3conn.get_bucket("Repo")
+ bucket = self.s3conn.get_bucket("repo")
k = boto.s3.key.Key(bucket)
image_name = self.cb_random_bucketname(10)
k.key = "VMS/" + self.can_user.get_id() + "/" + image_name
@@ -107,7 +107,7 @@ def test_ec2_submit_name_format(self):
res = image.run()
def test_ec2_submit_url(self):
- bucket_name = "Repo"
+ bucket_name = "repo"
bucket = self.s3conn.get_bucket(bucket_name)
k = boto.s3.key.Key(bucket)
image_name = self.cb_random_bucketname(10)

No commit comments for this range

Something went wrong with that request. Please try again.