From 8d948325fe9cb5b9bf4b344de7e2a2f78524125f Mon Sep 17 00:00:00 2001
From: TerryHowe <terrylhowe@gmail.com>
Date: Thu, 23 Apr 2015 12:34:22 -0600
Subject: [PATCH] Move jenkins create and delete in their onw files

Move jenkins create and delete functions into their own files
so we don't need to look at the argument to determine if we are
creating or deleting a file.

Also removes duplicate imageRef from server create.

Change-Id: Iab6d723d792a6670cc9a5156be890779f4e7f415
---
 examples/{jenkins.py => jenkins/create.py} | 22 +--------
 examples/jenkins/delete.py                 | 53 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 21 deletions(-)
 rename examples/{jenkins.py => jenkins/create.py} (80%)
 create mode 100644 examples/jenkins/delete.py

diff --git a/examples/jenkins.py b/examples/jenkins/create.py
similarity index 80%
rename from examples/jenkins.py
rename to examples/jenkins/create.py
index b4b624c5..4f44ae0d 100644
--- a/examples/jenkins.py
+++ b/examples/jenkins/create.py
@@ -16,7 +16,7 @@ Example Create a jenkins server
 Create all the pieces parts to get a jenkins server up and running.
 
 To run:
-    python examples/jenkins.py
+    python examples/jenkins/create.py
 """
 
 import base64
@@ -44,7 +44,6 @@ def create_jenkins(conn, name, opts):
             "name": name,
             "flavorRef": flavor,
             "imageRef": image,
-            "imageRef": image,
             "key_name": name,
             "networks": [{"uuid": net.id}],
             "user_data": b64str,
@@ -72,28 +71,9 @@ def create_jenkins(conn, name, opts):
     return
 
 
-def delete_jenkins(conn, name, opts):
-    server = conn.compute.find_server(name)
-    if server is not None:
-        server = conn.get(server)
-        print(str(server))
-        ips = server.get_floating_ips()
-        for ip in ips:
-            print(str(ip))
-            ip = conn.network.find_ip(ip)
-            conn.network.remove_ip_from_port(ip)
-            conn.delete(ip)
-        conn.delete(server)
-
-    network.delete(conn, name)
-
-
 def run_jenkins(opts):
-    argument = opts.argument
     conn = connection.make_connection(opts)
     name = opts.data.pop('name', 'jenkins')
-    if argument == "delete":
-        return(delete_jenkins(conn, name, opts))
     return(create_jenkins(conn, name, opts))
 
 
diff --git a/examples/jenkins/delete.py b/examples/jenkins/delete.py
new file mode 100644
index 00000000..69086d84
--- /dev/null
+++ b/examples/jenkins/delete.py
@@ -0,0 +1,53 @@
+# 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.
+
+"""
+Example Delete a jenkins server
+
+Delete all the pieces parts to your jenkins server.
+
+To run:
+    python examples/jenkins/delete.py
+"""
+
+import sys
+
+from examples import common
+from examples import connection
+from examples import network
+
+
+def delete_jenkins(conn, name, opts):
+    server = conn.compute.find_server(name)
+    if server is not None:
+        server = conn.get(server)
+        print(str(server))
+        ips = server.get_floating_ips()
+        for ip in ips:
+            print(str(ip))
+            ip = conn.network.find_ip(ip)
+            conn.network.remove_ip_from_port(ip)
+            conn.delete(ip)
+        conn.delete(server)
+
+    network.delete(conn, name)
+
+
+def run_jenkins(opts):
+    conn = connection.make_connection(opts)
+    name = opts.data.pop('name', 'jenkins')
+    return(delete_jenkins(conn, name, opts))
+
+
+if __name__ == "__main__":
+    opts = common.setup()
+    sys.exit(common.main(opts, run_jenkins))