Merge "LBAAS config generation on controller"

Juniper · Apr 20, 2016 · da19d43 · da19d43
2 parents 4c639ea + 6711a11
commit da19d43
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_healthmonitor.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_healthmonitor.py
@@ -42,6 +42,7 @@ def make_properties(self, healthmonitor):
 
     def make_dict(self, healthmonitor, fields=None):
         res = {'id': healthmonitor.uuid,
+               'name': healthmonitor.name,
                'tenant_id': healthmonitor.parent_uuid.replace('-', ''),
                'status': self._get_object_status(healthmonitor)}
 

diff --git a/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_member.py b/neutron_plugin_contrail/plugins/opencontrail/loadbalancer/v2/loadbalancer_member.py
@@ -44,6 +44,7 @@ def _get_member_pool_id(self, member):
 
     def make_dict(self, member, fields=None):
         res = {'id': member.uuid,
+               'name': member.name,
                'pool_id': member.parent_uuid,
                'status': self._get_object_status(member)}