Merge branch 'master' into develop

6 files changed, 20 insertions, 14 deletions

diff --git a/.version b/.version
index a602fc9..b0bb878 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.9.4
+0.9.5
diff --git a/debian/changelog b/debian/changelog
index e5600e0..8f9cb3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fapi (0.9.5) stable; urgency=low
+
+  * Fixes the -a argument, didn't really work
+
+ -- Paul Buetow <paul@buetow.org>  Mon, 07 Jul 2014 18:43:09 +0200
+
 fapi (0.9.4) stable; urgency=low
 
   * Fix fapi.buetow.org HP (Synopsis text)
diff --git a/debian/files b/debian/files
index 6d9b871..ef8f2ed 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-fapi_0.9.4_all.deb utils optional
+fapi_0.9.5_all.deb utils optional
diff --git a/docs/extended-synopsis.txt b/docs/extended-synopsis.txt
index 96180f2..8374b06 100644
--- a/docs/extended-synopsis.txt
+++ b/docs/extended-synopsis.txt
@@ -4,7 +4,7 @@ The following partially needs admininstrator privileges on / and /Common:
     -f Common -b balancer.example.com selfip
     -f Common -b balancer.example.com selfip NAME create NETMASK VLANNAME [TGROUP]
     -f Common -b balancer.example.com selfip NAME delete
-    -f Common -b balancer.example.com selfip NAME get detail|tgroup
+    -f Common -b balancer.example.com selfip NAME get address|detail|tgroup
     -f Common -b balancer.example.com selfip NAME set tgroup TGROUP
     -f Common -b balancer.example.com vlan
     -f Common -b balancer.example.com vlan NAME create tagged VLANID internal|external|...
diff --git a/docs/fapi.1 b/docs/fapi.1
index d742ef5..2c7ff0b 100644
--- a/docs/fapi.1
+++ b/docs/fapi.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FAPI 1"
-.TH FAPI 1 "2014-05-27" "fapi 0.9.4" "User Commands"
+.TH FAPI 1 "2014-06-18" "fapi 0.9.5" "User Commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/src/fapi b/src/fapi
index e5b7312..89283e1 100755
--- a/src/fapi
+++ b/src/fapi
@@ -122,7 +122,7 @@ class FapiBase(object):
                 '    -f Common -b balancer.example.com selfip',
                 '    -f Common -b balancer.example.com selfip NAME create NETMASK VLANNAME [TGROUP]',
                 '    -f Common -b balancer.example.com selfip NAME delete',
-                '    -f Common -b balancer.example.com selfip NAME get detail|tgroup',
+                '    -f Common -b balancer.example.com selfip NAME get address|detail|tgroup',
                 '    -f Common -b balancer.example.com selfip NAME set tgroup TGROUP',
                 '    -f Common -b balancer.example.com vlan',
                 '    -f Common -b balancer.example.com vlan NAME create tagged VLANID internal|external|...',
@@ -420,17 +420,17 @@ class Fapi(FapiBase):
         a = self._args
         if not a.name:
             return lambda: f5().get_list()
-        # Check for Pattern like /partition/foo-bar.example.com_443
-        m = re.match('^(.*)_(\d+)$', a.name)
-        if m:
-          fqdn_or_ip = m.group(1)
-          port = m.group(2)
-          _, ip, _ = self.lookup(fqdn_or_ip)
-        else:
-          fqdn_or_ip, ip, port = self.lookup(a.name)
         if a.a:
-            name = fqdn_or_ip 
+            name = a.name
         else:
+            # Check for Pattern like /partition/foo-bar.example.com_443
+            m = re.match('^(.*)_(\d+)$', a.name)
+            if m:
+                fqdn_or_ip = m.group(1)
+                port = m.group(2)
+                _, ip, _ = self.lookup(fqdn_or_ip)
+            else:
+                fqdn_or_ip, ip, port = self.lookup(a.name)
             name = fqdn_or_ip + '_' + port
         if a.sub == 'get':
             if a.sub2 == 'detail':