server.py/version.py shouldn't be executable while cli tools should

16 files changed, 579 insertions, 565 deletions

diff --git a/keystone/server.py b/keystone/server.py
index 59a3f8e3..59a3f8e3 100755..100644
--- a/keystone/server.py
+++ b/keystone/server.py
diff --git a/keystone/version.py b/keystone/version.py
index 770259b4..770259b4 100755..100644
--- a/keystone/version.py
+++ b/keystone/version.py
diff --git a/management/delgroup.py b/management/delgroup.py
index 9ef2d733..f1593635 100644..100755
--- a/management/delgroup.py
+++ b/management/delgroup.py
@@ -1,42 +1,43 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog group_id"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 1:

-        parser.error("Incorrect number of arguments")

-    else:

-        index = args[0]

-

-        try:

-            o = db_api.group_get(index)

-            if o == None:

-                raise IndexError("Group %s not found", index)

-            else:

-                db_api.group_delete(index)

-            print 'Group', index, 'deleted.'

-

-        except Exception, e:

-            print 'Error deleting group', index, str(e)

-

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog group_id"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error("Incorrect number of arguments")
+    else:
+        index = args[0]
+
+        try:
+            o = db_api.group_get(index)
+            if o == None:
+                raise IndexError("Group %s not found", index)
+            else:
+                db_api.group_delete(index)
+            print 'Group', index, 'deleted.'
+
+        except Exception, e:
+            print 'Error deleting group', index, str(e)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/management/getgroup.py b/management/getgroup.py
index 38a6b8f2..62c6d824 100644..100755
--- a/management/getgroup.py
+++ b/management/getgroup.py
@@ -1,40 +1,41 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog group_id"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 1:

-        parser.error("Incorrect number of arguments")

-    else:

-        index = args[0]

-

-        try:

-            o = db_api.group_get(index)

-            if o == None:

-                raise IndexError("Group %s not found", index)

-

-            print o.id, o.desc

-        except Exception, e:

-            print 'Error getting group', index, str(e)

-

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog group_id"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error("Incorrect number of arguments")
+    else:
+        index = args[0]
+
+        try:
+            o = db_api.group_get(index)
+            if o == None:
+                raise IndexError("Group %s not found", index)
+
+            print o.id, o.desc
+        except Exception, e:
+            print 'Error getting group', index, str(e)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/management/getgroups.py b/management/getgroups.py
index 501d948f..14f6069d 100644..100755
--- a/management/getgroups.py
+++ b/management/getgroups.py
@@ -1,37 +1,38 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog "

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 0:

-        parser.error("Incorrect number of arguments")

-    else:

-        try:

-            u = db_api.group_get_all()

-            if u == None:

-                raise IndexError("Groups not found")

-            for row in u:

-                print row.id

-        except Exception, e:

-            print 'Error getting groups:', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog "
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 0:
+        parser.error("Incorrect number of arguments")
+    else:
+        try:
+            u = db_api.group_get_all()
+            if u == None:
+                raise IndexError("Groups not found")
+            for row in u:
+                print row.id
+        except Exception, e:
+            print 'Error getting groups:', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/getgroupusers.py b/management/getgroupusers.py
index 0fc7d231..0f8022be 100644..100755
--- a/management/getgroupusers.py
+++ b/management/getgroupusers.py
@@ -1,39 +1,40 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog group_id"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 1:

-        parser.error("Incorrect number of arguments")

-    else:

-        group_id = args[0]

-

-        try:

-            g = db_api.group_users(group_id)

-            if g == None:

-                raise IndexError("Group users not found")

-            for row in g:

-                print row

-        except Exception, e:

-            print 'Error getting group users for group', group_id, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog group_id"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error("Incorrect number of arguments")
+    else:
+        group_id = args[0]
+
+        try:
+            g = db_api.group_users(group_id)
+            if g == None:
+                raise IndexError("Group users not found")
+            for row in g:
+                print row
+        except Exception, e:
+            print 'Error getting group users for group', group_id, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/getuser.py b/management/getuser.py
index 036f10f4..e248f3a6 100644..100755
--- a/management/getuser.py
+++ b/management/getuser.py
@@ -1,37 +1,38 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog username"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 1:

-        parser.error("Incorrect number of arguments")

-    else:

-        username = args[0]

-        try:

-            u = db_api.user_get(username)

-            if u == None:

-                raise IndexError("User not found")

-            print u.id, u.email, u.enabled

-        except Exception, e:

-            print 'Error finding user', username, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog username"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error("Incorrect number of arguments")
+    else:
+        username = args[0]
+        try:
+            u = db_api.user_get(username)
+            if u == None:
+                raise IndexError("User not found")
+            print u.id, u.email, u.enabled
+        except Exception, e:
+            print 'Error finding user', username, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/getusergroups.py b/management/getusergroups.py
index 3fd7d3f9..0e477db0 100644..100755
--- a/management/getusergroups.py
+++ b/management/getusergroups.py
@@ -1,38 +1,39 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog user_id"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 1:

-        parser.error("Incorrect number of arguments")

-    else:

-        username = args[0]

-        try:

-            g = db_api.user_groups(username)

-            if g == None:

-                raise IndexError("User groups not found")

-            for row in g:

-                print row

-        except Exception, e:

-            print 'Error getting user groups for user', user_id, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog user_id"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error("Incorrect number of arguments")
+    else:
+        username = args[0]
+        try:
+            g = db_api.user_groups(username)
+            if g == None:
+                raise IndexError("User groups not found")
+            for row in g:
+                print row
+        except Exception, e:
+            print 'Error getting user groups for user', user_id, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/getusers.py b/management/getusers.py
index 18a5de56..a33fcc5a 100644..100755
--- a/management/getusers.py
+++ b/management/getusers.py
@@ -1,38 +1,39 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog tenant_id"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 1:

-        parser.error("Incorrect number of arguments")

-    else:

-        tenant_id = args[0]

-        try:

-            u = db_api.user_get_by_tenant(tenant_id)

-            if u == None:

-                raise IndexError("Users not found")

-            for row in u:

-                print row

-        except Exception, e:

-            print 'Error getting users for tenant', tenant_id, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog tenant_id"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error("Incorrect number of arguments")
+    else:
+        tenant_id = args[0]
+        try:
+            u = db_api.user_get_by_tenant(tenant_id)
+            if u == None:
+                raise IndexError("Users not found")
+            for row in u:
+                print row
+        except Exception, e:
+            print 'Error getting users for tenant', tenant_id, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/groupadd.py b/management/groupadd.py
index adec58dc..1a02801a 100644..100755
--- a/management/groupadd.py
+++ b/management/groupadd.py
@@ -1,40 +1,41 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-from keystone.db.sqlalchemy import models

-

-

-def main():

-    usage = "usage: %prog group_id group_desc"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 2:

-        parser.error("Incorrect number of arguments")

-    else:

-        group_id = args[0]

-        group_desc = args[1]

-        try:

-            g = models.Group()

-            g.id = group_id

-            g.desc = group_desc

-            db_api.group_create(g)

-            print 'Group', g.id, 'created.'

-        except Exception, e:

-            print 'Error creating group', group_id, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+from keystone.db.sqlalchemy import models
+
+
+def main():
+    usage = "usage: %prog group_id group_desc"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error("Incorrect number of arguments")
+    else:
+        group_id = args[0]
+        group_desc = args[1]
+        try:
+            g = models.Group()
+            g.id = group_id
+            g.desc = group_desc
+            db_api.group_create(g)
+            print 'Group', g.id, 'created.'
+        except Exception, e:
+            print 'Error creating group', group_id, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/setuserlock.py b/management/setuserlock.py
index 622d876b..9effc451 100644..100755
--- a/management/setuserlock.py
+++ b/management/setuserlock.py
@@ -1,49 +1,50 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog username enabled"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 2:

-        parser.error("Incorrect number of arguments")

-    else:

-        username = args[0]

-        enabled = args[1].capitalize().strip()

-

-        if enabled == 'True' or enabled == '1':

-            enabled = 1

-        elif enabled == 'False' or enabled == '0':

-            enabled = 0

-        else:

-            parser.error("Incorrect arguments value")

-

-        try:

-            u = db_api.user_get(username)

-            if u == None:

-                raise IndexError("User not found")

-            else:

-                values = {'enabled': enabled}

-                db_api.user_update(username, values)

-            print 'User', u.id, 'updated. Enabled =', enabled

-        except Exception, e:

-            print 'Error updating user', username, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog username enabled"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error("Incorrect number of arguments")
+    else:
+        username = args[0]
+        enabled = args[1].capitalize().strip()
+
+        if enabled == 'True' or enabled == '1':
+            enabled = 1
+        elif enabled == 'False' or enabled == '0':
+            enabled = 0
+        else:
+            parser.error("Incorrect arguments value")
+
+        try:
+            u = db_api.user_get(username)
+            if u == None:
+                raise IndexError("User not found")
+            else:
+                values = {'enabled': enabled}
+                db_api.user_update(username, values)
+            print 'User', u.id, 'updated. Enabled =', enabled
+        except Exception, e:
+            print 'Error updating user', username, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/setuserpswd.py b/management/setuserpswd.py
index 6283bf73..9f0abe77 100644..100755
--- a/management/setuserpswd.py
+++ b/management/setuserpswd.py
@@ -1,41 +1,42 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog username password"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 2:

-        parser.error("Incorrect number of arguments")

-    else:

-        username = args[0]

-        password = args[1]

-        try:

-            u = db_api.user_get(username)

-            if u == None:

-                raise IndexError("User not found")

-            else:

-                values = {'password': password}

-                db_api.user_update(username, values)

-            print 'User', u.id, 'updated.'

-        except Exception, e:

-            print 'Error updating user', username, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog username password"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error("Incorrect number of arguments")
+    else:
+        username = args[0]
+        password = args[1]
+        try:
+            u = db_api.user_get(username)
+            if u == None:
+                raise IndexError("User not found")
+            else:
+                values = {'password': password}
+                db_api.user_update(username, values)
+            print 'User', u.id, 'updated.'
+        except Exception, e:
+            print 'Error updating user', username, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/updategroup.py b/management/updategroup.py
index 598d38ef..0ae64765 100644..100755
--- a/management/updategroup.py
+++ b/management/updategroup.py
@@ -1,42 +1,43 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-from keystone.db.sqlalchemy import models

-

-

-def main():

-    usage = "usage: %prog group_id group_desc"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 2:

-        parser.error("Incorrect number of arguments")

-    else:

-        group = args[0]

-        desc = args[1]

-        try:

-            g = db_api.group_get(group)

-            if g == None:

-                raise IndexError("Group not found")

-            else:

-                values = {'desc': desc}

-                db_api.group_update(group, values)

-            print 'Group', g.id, 'updated.'

-        except Exception, e:

-            print 'Error updating user', group, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+from keystone.db.sqlalchemy import models
+
+
+def main():
+    usage = "usage: %prog group_id group_desc"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error("Incorrect number of arguments")
+    else:
+        group = args[0]
+        desc = args[1]
+        try:
+            g = db_api.group_get(group)
+            if g == None:
+                raise IndexError("Group not found")
+            else:
+                values = {'desc': desc}
+                db_api.group_update(group, values)
+            print 'Group', g.id, 'updated.'
+        except Exception, e:
+            print 'Error updating user', group, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/useradd.py b/management/useradd.py
index fc3fc8b6..4f04a05f 100644..100755
--- a/management/useradd.py
+++ b/management/useradd.py
@@ -1,42 +1,43 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-from keystone.db.sqlalchemy import models

-

-

-def main():

-    usage = "usage: %prog username password"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 2:

-        parser.error("Incorrect number of arguments")

-    else:

-        username = args[0]

-        password = args[1]

-        try:

-            u = models.User()

-            u.id = username

-            u.email = username

-            u.password = password

-            u.enabled = True

-            db_api.user_create(u)

-            print 'User', u.id, 'created.'

-        except Exception, e:

-            print 'Error creating user', username, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+from keystone.db.sqlalchemy import models
+
+
+def main():
+    usage = "usage: %prog username password"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error("Incorrect number of arguments")
+    else:
+        username = args[0]
+        password = args[1]
+        try:
+            u = models.User()
+            u.id = username
+            u.email = username
+            u.password = password
+            u.enabled = True
+            db_api.user_create(u)
+            print 'User', u.id, 'created.'
+        except Exception, e:
+            print 'Error creating user', username, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/userdel.py b/management/userdel.py
index 928dfc55..62dab47f 100644..100755
--- a/management/userdel.py
+++ b/management/userdel.py
@@ -1,39 +1,40 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog username"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 1:

-        parser.error("Incorrect number of arguments")

-    else:

-        username = args[0]

-        try:

-            u = db_api.user_get(username)

-            if u == None:

-                raise IndexError("User not found")

-            else:

-                db_api.user_delete(username)

-            print 'User', username, 'deleted.'

-        except Exception, e:

-            print 'Error deleting user', username, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog username"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 1:
+        parser.error("Incorrect number of arguments")
+    else:
+        username = args[0]
+        try:
+            u = db_api.user_get(username)
+            if u == None:
+                raise IndexError("User not found")
+            else:
+                db_api.user_delete(username)
+            print 'User', username, 'deleted.'
+        except Exception, e:
+            print 'Error deleting user', username, ':', str(e)
+
+if __name__ == '__main__':
+    main()
diff --git a/management/userupdate.py b/management/userupdate.py
index 89174d04..a3ff21f2 100644..100755
--- a/management/userupdate.py
+++ b/management/userupdate.py
@@ -1,41 +1,42 @@
-# Copyright (c) 2010-2011 OpenStack, LLC.

-#

-# 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.

-

-import optparse

-import keystone.db.sqlalchemy.api as db_api

-

-

-def main():

-    usage = "usage: %prog username email"

-    parser = optparse.OptionParser(usage)

-    options, args = parser.parse_args()

-    if len(args) != 2:

-        parser.error("Incorrect number of arguments")

-    else:

-        username = args[0]

-        email = args[1]

-        try:

-            u = db_api.user_get(username)

-            if u == None:

-                raise IndexError("User not found")

-            else:

-                values = {'email': email}

-                db_api.user_update(username, values)

-            print 'User', u.id, 'updated.'

-        except Exception, e:

-            print 'Error updating user', username, ':', str(e)

-

-if __name__ == '__main__':

-    main()

+#!/usr/bin/env python
+# Copyright (c) 2010-2011 OpenStack, LLC.
+#
+# 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.
+
+import optparse
+import keystone.db.sqlalchemy.api as db_api
+
+
+def main():
+    usage = "usage: %prog username email"
+    parser = optparse.OptionParser(usage)
+    options, args = parser.parse_args()
+    if len(args) != 2:
+        parser.error("Incorrect number of arguments")
+    else:
+        username = args[0]
+        email = args[1]
+        try:
+            u = db_api.user_get(username)
+            if u == None:
+                raise IndexError("User not found")
+            else:
+                values = {'email': email}
+                db_api.user_update(username, values)
+            print 'User', u.id, 'updated.'
+        except Exception, e:
+            print 'Error updating user', username, ':', str(e)
+
+if __name__ == '__main__':
+    main()