From 480fdd5d07abe7cf6185cac40a215e8cc7aa6b39 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Sun, 15 Apr 2018 16:09:54 +0300 Subject: [PATCH] NSX-V3: Add agent config to FWaaSV1 callbacks Commit I8982523dbb94a7c5b8a4db88a196fabc4dd2873f added the need for agent_config values for the routerInfo structure creation. The NSX FWaaS does not use the agent at all, so this patch only adds a dummy implementation to allow to code to continue working Change-Id: Ib6dde4f7880fa45d01142792da17b68e719cada8 --- vmware_nsx/services/fwaas/common/fwaas_callbacks_v1.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vmware_nsx/services/fwaas/common/fwaas_callbacks_v1.py b/vmware_nsx/services/fwaas/common/fwaas_callbacks_v1.py index a9f247dbf7..d0132e82d2 100644 --- a/vmware_nsx/services/fwaas/common/fwaas_callbacks_v1.py +++ b/vmware_nsx/services/fwaas/common/fwaas_callbacks_v1.py @@ -92,10 +92,12 @@ class NsxFwaasCallbacks(firewall_l3_agent.L3WithFWaaS): filters={'project_id': [project_id]}) def _router_dict_to_obj(self, r): - # The callbacks expect a router-info object + # The callbacks expect a router-info object with an agent config + agent_conf = cfg.CONF + agent_conf.metadata_access_mark = '0x1' return router_info.RouterInfo( None, r['id'], router=r, - agent_conf=None, + agent_conf=agent_conf, interface_driver=None, use_ipv6=False)