Fix incorrect network roles usage in system tests

Move unused network roles to separate section in networking
template.
Add service 'swift-replication' and check that correct
network is used by Swift for replication.

Change-Id: Iedde7ca2cc3dd760d79b3f9444e2ddaefac9336a
Closes-bug: #1493603

fuelweb_test/network_templates/cinder.yaml

@@ -76,10 +76,6 @@ adv_net_template:
           ep: br-cinderiscsi
         swift-replication:
           ep: br-swiftrepl
-        ceph-replication:
-          ep: br-cephrepl
-        ceph-radosgw:
-          ep: br-cephrados
     network_scheme:
       storage:
         transformations:
@@ -311,5 +307,21 @@ adv_net_template:
           mgmt/database: br-database
           cinder/iscsi: br-cinderiscsi
           swift/replication: br-swiftrepl
+      unused:
+        transformations:
+          - action: add-br
+            name: br-cephrepl
+          - action: add-port
+            bridge: br-cephrepl
+            name: <% if4 %>.221
+          - action: add-br
+            name: br-cephrados
+          - action: add-port
+            bridge: br-cephrados
+            name: <% if4 %>.222
+        endpoints:
+          - br-cephrepl
+          - br-cephrados
+        roles:
           ceph/replication: br-cephrepl
           ceph/radosgw: br-cephrados

fuelweb_test/tests/test_net_templates_base.py

@@ -220,7 +220,14 @@ class TestNetworkTemplatesBase(TestBasic):
             {
                 'name': 'swift-api',
                 'network_roles': ['swift/api'],
-                'tcp_ports': [6000, 6001, 6002, 8080],
+                'tcp_ports': [8080],
+                'udp_ports': [],
+                'enabled': True
+            },
+            {
+                'name': 'swift-replication',
+                'network_roles': ['swift/replication'],
+                'tcp_ports': [6000, 6001, 6002],
                 'udp_ports': [],
                 'enabled': True
             },