removed windows newline characters from management folder

15 files changed, 767 insertions, 767 deletions

diff --git a/LICENSE b/LICENSE
index 75b52484..d6456956 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,202 +1,202 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

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

+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/management/delgroup.py b/management/delgroup.py
index 9ef2d733..1deb9639 100644
--- a/management/delgroup.py
+++ b/management/delgroup.py
@@ -1,42 +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 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()

+# 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..2e871fa1 100644
--- a/management/getgroup.py
+++ b/management/getgroup.py
@@ -1,40 +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:

-        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()

+# 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..d0e53c9e 100644
--- a/management/getgroups.py
+++ b/management/getgroups.py
@@ -1,37 +1,37 @@
-# 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()

+# 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..6fbef182 100644
--- a/management/getgroupusers.py
+++ b/management/getgroupusers.py
@@ -1,39 +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 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()

+# 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..f39b022e 100644
--- a/management/getuser.py
+++ b/management/getuser.py
@@ -1,37 +1,37 @@
-# 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()

+# 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..7b0a9f9b 100644
--- a/management/getusergroups.py
+++ b/management/getusergroups.py
@@ -1,38 +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 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()

+# 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..ab3370dd 100644
--- a/management/getusers.py
+++ b/management/getusers.py
@@ -1,38 +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 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()

+# 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..0e60d400 100644
--- a/management/groupadd.py
+++ b/management/groupadd.py
@@ -1,40 +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

-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()

+# 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..4c4baaf2 100644
--- a/management/setuserlock.py
+++ b/management/setuserlock.py
@@ -1,49 +1,49 @@
-# 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()

+# 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..8b09b110 100644
--- a/management/setuserpswd.py
+++ b/management/setuserpswd.py
@@ -1,41 +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 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()

+# 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..e144616e 100644
--- a/management/updategroup.py
+++ b/management/updategroup.py
@@ -1,42 +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

-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()

+# 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..0c2082ca 100644
--- a/management/useradd.py
+++ b/management/useradd.py
@@ -1,42 +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

-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()

+# 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..b18b491e 100644
--- a/management/userdel.py
+++ b/management/userdel.py
@@ -1,39 +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 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()

+# 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..d2916cc0 100644
--- a/management/userupdate.py
+++ b/management/userupdate.py
@@ -1,41 +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 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()

+# 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()