updated properties to match updated keys in ims.py; removed redundant function

inventory_provider/db/ims_data.py

 import re
+from collections import OrderedDict
 
 from inventory_provider.db import ims
 from inventory_provider.db.ims import InventoryStatus
@@ -45,6 +46,7 @@ def lookup_lg_routers(ds):
         for node in nodes:
             if not _matching_node(node):
                 continue
+
             site = ds.get_entity_by_id('Site', node['SiteId'], site_nav_props,
                                        True)
             city = site['City']
@@ -76,9 +78,9 @@ def lookup_lg_routers(ds):
 
 def lookup_pop_info(ds, hostname):
     site_nav_props = [
-        ims.SITE_PROPERTIES['aliases'],
-        ims.SITE_PROPERTIES['city'],
-        ims.SITE_PROPERTIES['country']
+        ims.SITE_PROPERTIES['City'],
+        ims.SITE_PROPERTIES['SiteAliases'],
+        ims.SITE_PROPERTIES['Country']
     ]
 
     node = ds.get_entity_by_name('Node', hostname)
@@ -104,8 +106,3 @@ def lookup_pop_info(ds, hostname):
             }
         }
     return eq
-
-
-def get_interface_info(ds):
-    yield from ds.get_all_entities('InternalPort')
-    yield from ds.get_all_entities('Port')