T849: move BGP peer-group node to ipv4 address family

To have a consitent IPv4/IPv6 CLI a lot of BGP neighbor nodes have been
migrated. The IPv4 peer-group has been forgotten, leaving a non consistent CLI.

Previously:
-----------

neighbor 2001:DB8:FFFF::1 {
     address-family {
         ipv6-unicast {
             peer-group iBGP
         }
     }
     peer-group iBGP
}

Now:
----

neighbor 2001:DB8:FFFF::1 {
     address-family {
         ipv6-unicast {
             peer-group iBGP
         }
     }
     address-family {
         ipv4-unicast {
             peer-group iBGP
         }
     }
}

1 files changed, 6 insertions, 6 deletions

diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 2a3ca514..331f41ed 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -575,11 +575,6 @@ my %qcom = (
       set => 'router bgp #3 ; neighbor #5 password #7',
       del => 'router bgp #3 ; no neighbor #5 password',
   },
-  'protocols bgp var neighbor var peer-group' => {
-      set => 'router bgp #3 ; neighbor #5 peer-group #7',
-      del => 'router bgp #3 ; no neighbor #5 peer-group #7',
-      noerr => 'del',
-  },
   'protocols bgp var neighbor var port' => {
       set => 'router bgp #3 ; neighbor #5 port #7',
       del => 'router bgp #3 ; no neighbor #5 port',
@@ -949,7 +944,7 @@ my %qcom = (
       set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 capability orf prefix-list send',
       del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 capability orf prefix-list send',
   },
-  ## Note that the activate will need to be moved when we migrate to 
+  ## Note that the activate will need to be moved when we migrate to
   ## supporting a single IP version in a peering session.
   'protocols bgp var peer-group var address-family ipv4-unicast default-originate' => {
       set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 activate ; neighbor #5 default-originate',
@@ -959,6 +954,11 @@ my %qcom = (
       set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 activate ; neighbor #5 default-originate route-map #10',
       del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 default-originate route-map #10',
   },
+  'protocols bgp var peer-group var address-family ipv4-unicast peer-group' => {
+      set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 peer-group #7',
+      del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 peer-group #7',
+      noerr => 'del',
+  },
   'protocols bgp var peer-group var address-family ipv4-unicast disable-send-community' => {
       set => undef,
       del => undef,