Merge branch 'master' into sqlalchemy

Conflicts:
	config/default_config.xml
	sfa.spec

Removed:
	sfa/server/sfa-clean-peer-records.py
	sfa/storage/record.py

diff --cc config/default_config.xml
index 7eeb1c7,5ce430e..eeca137
--- 1/config/default_config.xml
--- 2/config/default_config.xml
+++ b/config/default_config.xml
@@@ -309,7 -277,31 +309,30 @@@ Thierry Parmentela
        </variablelist>
      </category>
  
--
+     <!-- ======================================== -->
+     <category id="sfa_nova">
+       <name>SFA Flash Policy</name>
+       <description>The settings that affect how SFA connects to 
+                    the Nova/EC2 API</description>
+       <variablelist>
+         <variable id="user" type="string">
+           <name>Sfa nova user</name>
+           <value>novaadmin</value>
+           <description>Account/context to use when performing 
+                        administrative nova operations</description>
+         </variable>
+         <variable id="api_url" type="string">
+           <name>Nova API url</name>
+           <value>127.0.0.1</value>
+           <description>The Nova/EC2 API url </description>
+         </variable>
+         <variable id="api_port" type="int">
+           <name>Nova API Port</name>
+           <value>8773</value>
+           <description>The Nova/EC2 API port.</description>
+         </variable>
+       </variablelist>
+     </category>
  
    </variables>
  

diff --cc setup.py
index e3bca57,8ec10e0..4c20cee
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -13,11 -13,10 +13,10 @@@ scripts = glob("sfa/clientbin/*.py") + 
      [ 
      'config/sfa-config-tty',
      'config/gen-sfa-cm-config.py',
 -    'sfa/importer/sfa-import-plc.py', 
 -    'sfa/importer/sfa-nuke-plc.py', 
 +    'sfa/importer/sfa-import.py', 
 +    'sfa/importer/sfa-nuke.py', 
      'sfa/server/sfa-ca.py', 
      'sfa/server/sfa-start.py', 
-     'sfa/server/sfa-clean-peer-records.py', 
      'sfa/server/sfa_component_setup.py', 
      'sfatables/sfatables',
      'keyconvert/keyconvert.py',

diff --cc sfa.spec
index 678a1f7,eed9409..4cbed11
--- 1/sfa.spec
--- 2/sfa.spec
+++ b/sfa.spec
@@@ -166,9 -161,8 +166,8 @@@ rm -rf $RPM_BUILD_ROO
  /etc/sfa/xml.xsd
  /etc/sfa/protogeni-rspec-common.xsd
  /etc/sfa/topology
 -%{_bindir}/sfa-import-plc.py*
 -%{_bindir}/sfa-nuke-plc.py*
 +%{_bindir}/sfa-import.py*
 +%{_bindir}/sfa-nuke.py*
- %{_bindir}/sfa-clean-peer-records.py*
  %{_bindir}/gen-sfa-cm-config.py*
  %{_bindir}/sfa-ca.py*
  

diff --cc sfa/managers/registry_manager.py
index 2de4875,04daa48..331a0f9
--- 1/sfa/managers/registry_manager.py
--- 2/sfa/managers/registry_manager.py
+++ b/sfa/managers/registry_manager.py
@@@ -104,13 -105,12 +104,13 @@@ class RegistryManager
              # try to infer type if not set and we get a single input
              if not type:
                  type = Xrn(xrns).get_type()
+             xrns = [xrns]
          hrns = [urn_to_hrn(xrn)[0] for xrn in xrns] 
 +
          # load all known registry names into a prefix tree and attempt to find
          # the longest matching prefix
 -        # create a dict where key is a registry hrn and its value is a
 -        # hrns at that registry (determined by the known prefix tree).  
 +        # create a dict where key is a registry hrn and its value is a list
 +        # of hrns at that registry (determined by the known prefix tree).  
          xrn_dict = {}
          registries = api.registries
          tree = prefixTree()

diff --cc sfa/openstack/nova_driver.py
Simple merge