Merge "Closes-Bug: #1554100. Adding an extention to fetch and show DN…

…S server address in neutron subnet-show"

src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py

@@ -1413,6 +1413,7 @@ def _subnet_neutron_to_vnc(self, subnet_q):
 
     def _subnet_vnc_to_neutron(self, subnet_vnc, net_obj, ipam_fq_name):
         sn_q_dict = {}
+        extra_dict = {}
         sn_name = subnet_vnc.get_subnet_name()
         if sn_name is not None:
             sn_q_dict['name'] = sn_name
@@ -1472,6 +1473,15 @@ def _subnet_vnc_to_neutron(self, subnet_vnc, net_obj, ipam_fq_name):
                                             'subnet_id': sn_id}
                         nameserver_dict_list.append(nameserver_entry)
         sn_q_dict['dns_nameservers'] = nameserver_dict_list
+        # dhcp_option_list could have other options.
+        # Check explicitly if dns_nameservers are
+        # provided in the dhcp_options by the user.
+        # If it is NOT, then report the dns server
+        # allocated by contrail.
+        if not nameserver_dict_list:
+           extra_dict['contrail:dns_server_address'] = subnet_vnc.dns_server_address
+        if self._contrail_extensions_enabled:
+           sn_q_dict.update(extra_dict)
 
         host_route_dict_list = list()
         host_routes = subnet_vnc.get_host_routes()

src/config/vnc_openstack/vnc_openstack/neutron_plugin_interface.py

@@ -253,6 +253,7 @@ def _make_subnet_dict(self, subnet):
                'ipv6_address_mode': subnet['ipv6_address_mode'],
                'dns_nameservers': [dns['address']
                                    for dns in subnet['dns_nameservers']],
+               'contrail:dns_server_address':subnet['contrail:dns_server_address'],
                'host_routes': [{'destination': route['destination'],
                                 'nexthop': route['nexthop']}
                                for route in subnet['routes']],