diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index f46148c22..0a4c3a427 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -43,6 +43,7 @@ Bugs fixed
 - Bug 1997 - Fix PlotProbe() documentation and usage for GnuplotHelper and FileHelper
 - Bug 2011 - Default Speed attribute in ConstantSpeedPropagationDelayModel
 - Bug 2016 - Radvd do not consider the SendAdvert option and don't reply to RS
+- Bug 2021 - Missing const qualifier in TopologyReader::Link::Attributes{Begin,End}()
 
 Known issues
 ------------
diff --git a/src/topology-read/bindings/modulegen__gcc_ILP32.py b/src/topology-read/bindings/modulegen__gcc_ILP32.py
index 121cd6b04..aa38f9899 100644
--- a/src/topology-read/bindings/modulegen__gcc_ILP32.py
+++ b/src/topology-read/bindings/modulegen__gcc_ILP32.py
@@ -1754,14 +1754,16 @@ def register_Ns3TopologyReaderLink_methods(root_module, cls):
     cls.add_constructor([param('ns3::TopologyReader::Link const &', 'arg0')])
     ## topology-reader.h (module 'topology-read'): ns3::TopologyReader::Link::Link(ns3::Ptr<ns3::Node> fromPtr, std::string const & fromName, ns3::Ptr<ns3::Node> toPtr, std::string const & toName) [constructor]
     cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'fromPtr'), param('std::string const &', 'fromName'), param('ns3::Ptr< ns3::Node >', 'toPtr'), param('std::string const &', 'toName')])
-    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesBegin() [member function]
+    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesBegin() const [member function]
     cls.add_method('AttributesBegin', 
                    'std::_Rb_tree_const_iterator< std::pair< std::basic_string< char, std::char_traits< char >, std::allocator< char > > const, std::basic_string< char, std::char_traits< char >, std::allocator< char > > > >', 
-                   [])
-    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesEnd() [member function]
+                   [], 
+                   is_const=True)
+    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesEnd() const [member function]
     cls.add_method('AttributesEnd', 
                    'std::_Rb_tree_const_iterator< std::pair< std::basic_string< char, std::char_traits< char >, std::allocator< char > > const, std::basic_string< char, std::char_traits< char >, std::allocator< char > > > >', 
-                   [])
+                   [], 
+                   is_const=True)
     ## topology-reader.h (module 'topology-read'): std::string ns3::TopologyReader::Link::GetAttribute(std::string const & name) const [member function]
     cls.add_method('GetAttribute', 
                    'std::string', 
diff --git a/src/topology-read/bindings/modulegen__gcc_LP64.py b/src/topology-read/bindings/modulegen__gcc_LP64.py
index 121cd6b04..aa38f9899 100644
--- a/src/topology-read/bindings/modulegen__gcc_LP64.py
+++ b/src/topology-read/bindings/modulegen__gcc_LP64.py
@@ -1754,14 +1754,16 @@ def register_Ns3TopologyReaderLink_methods(root_module, cls):
     cls.add_constructor([param('ns3::TopologyReader::Link const &', 'arg0')])
     ## topology-reader.h (module 'topology-read'): ns3::TopologyReader::Link::Link(ns3::Ptr<ns3::Node> fromPtr, std::string const & fromName, ns3::Ptr<ns3::Node> toPtr, std::string const & toName) [constructor]
     cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'fromPtr'), param('std::string const &', 'fromName'), param('ns3::Ptr< ns3::Node >', 'toPtr'), param('std::string const &', 'toName')])
-    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesBegin() [member function]
+    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesBegin() const [member function]
     cls.add_method('AttributesBegin', 
                    'std::_Rb_tree_const_iterator< std::pair< std::basic_string< char, std::char_traits< char >, std::allocator< char > > const, std::basic_string< char, std::char_traits< char >, std::allocator< char > > > >', 
-                   [])
-    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesEnd() [member function]
+                   [], 
+                   is_const=True)
+    ## topology-reader.h (module 'topology-read'): std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > ns3::TopologyReader::Link::AttributesEnd() const [member function]
     cls.add_method('AttributesEnd', 
                    'std::_Rb_tree_const_iterator< std::pair< std::basic_string< char, std::char_traits< char >, std::allocator< char > > const, std::basic_string< char, std::char_traits< char >, std::allocator< char > > > >', 
-                   [])
+                   [], 
+                   is_const=True)
     ## topology-reader.h (module 'topology-read'): std::string ns3::TopologyReader::Link::GetAttribute(std::string const & name) const [member function]
     cls.add_method('GetAttribute', 
                    'std::string', 
diff --git a/src/topology-read/model/topology-reader.cc b/src/topology-read/model/topology-reader.cc
index b531a6d98..ff5e736de 100644
--- a/src/topology-read/model/topology-reader.cc
+++ b/src/topology-read/model/topology-reader.cc
@@ -155,12 +155,12 @@ TopologyReader::Link::SetAttribute (const std::string &name, const std::string &
 }
 
 TopologyReader::Link::ConstAttributesIterator
-TopologyReader::Link::AttributesBegin (void)
+TopologyReader::Link::AttributesBegin (void) const
 {
   return m_linkAttr.begin ();
 }
 TopologyReader::Link::ConstAttributesIterator
-TopologyReader::Link::AttributesEnd (void)
+TopologyReader::Link::AttributesEnd (void) const
 {
   return m_linkAttr.end ();
 }
diff --git a/src/topology-read/model/topology-reader.h b/src/topology-read/model/topology-reader.h
index 3707e1548..0e1e046ae 100644
--- a/src/topology-read/model/topology-reader.h
+++ b/src/topology-read/model/topology-reader.h
@@ -114,12 +114,12 @@ public:
      * \brief Returns an iterator to the begin of the attributes.
      * \return a const iterator to the first attribute of a link.
      */
-    ConstAttributesIterator AttributesBegin (void);
+    ConstAttributesIterator AttributesBegin (void) const;
     /**
      * \brief Returns an iterator to the end of the attributes.
      * \return a const iterator to the last attribute of a link.
      */
-    ConstAttributesIterator AttributesEnd (void);
+    ConstAttributesIterator AttributesEnd (void) const;
 
 private:
     Link ();