Merge pull request #194 from fabric-testbed/br_193_194

only update IFS for NICs and increase waitress threads

Author: kthare10

fabric_cf/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.2.5"
+__VERSION__ = "1.2.6"

fabric_cf/actor/fim/fim_helper.py

@@ -289,14 +289,16 @@ def update_node(*, graph_id: str, sliver: BaseSliver):
                                                               capacity_allocations=component.capacity_allocations,
                                                               node_map=component.node_map)
                         # Update Mac address
-                        for ns in component.network_service_info.network_services.values():
-                            if ns.interface_info is None or ns.interface_info.interfaces is None:
-                                continue
-
-                            for ifs in ns.interface_info.interfaces.values():
-                                topo_component = node.components[cname]
-                                topo_ifs = topo_component.interfaces[ifs.get_name()]
-                                topo_ifs.set_properties(label_allocations=ifs.label_allocations)
+                        if component.network_service_info is not None and \
+                                component.network_service_info.network_services is not None:
+                            for ns in component.network_service_info.network_services.values():
+                                if ns.interface_info is None or ns.interface_info.interfaces is None:
+                                    continue
+
+                                for ifs in ns.interface_info.interfaces.values():
+                                    topo_component = node.components[cname]
+                                    topo_ifs = topo_component.interfaces[ifs.get_name()]
+                                    topo_ifs.set_properties(label_allocations=ifs.label_allocations)
 
             elif isinstance(sliver, NetworkServiceSliver):
                 node = neo4j_topo.network_services[node_name]

fabric_cf/authority/docker-compose.yml

@@ -50,7 +50,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-auth
-    image: authority:1.2
+    image: authority:1.2.6
     container_name: site1-am
     restart: always
     depends_on:

fabric_cf/broker/docker-compose.yml

@@ -53,7 +53,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-broker
-    image: broker:1.2
+    image: broker:1.2.6
     container_name: broker
     restart: always
     networks:

fabric_cf/orchestrator/__main__.py

@@ -72,7 +72,7 @@ def main():
             app.add_api('swagger.yaml', arguments={'title': 'Fabric Orchestrator API'}, pythonic_params=True)
 
             # Start up the server to expose the metrics.
-            waitress.serve(app, port=int(rest_port_str))
+            waitress.serve(app, port=int(rest_port_str), threads=8)
             while True:
                 time.sleep(0.0001)
                 if h.interrupted:

fabric_cf/orchestrator/docker-compose.yml

@@ -67,7 +67,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-orchestrator
-    image: orchestrator:1.2
+    image: orchestrator:1.2.6
     container_name: orchestrator
     restart: always
     depends_on: