From d0c9bd95e63066d4a70f4166effadb91224664eb Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chousekn@redhat.com>
Date: Tue, 3 Jul 2018 09:55:15 -0400
Subject: [PATCH] Fix APB name parse

---
 galaxy/importer/loaders/apb.py           | 4 ++--
 galaxy/importer/tests/test_apb_loader.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/galaxy/importer/loaders/apb.py b/galaxy/importer/loaders/apb.py
index 9978f03ce..fd1f86aef 100644
--- a/galaxy/importer/loaders/apb.py
+++ b/galaxy/importer/loaders/apb.py
@@ -150,7 +150,7 @@ def _check_async(self):
 
     def parse_name(self):
         fieldname = 'name'
-        name = self._get_key(fieldname)
+        name = sanitize_content_name(self._get_key(fieldname))
         if not re.match('^[a-z0-9_]+$', name):
             raise exc.APBContentLoadError(
                 'Invalid "{0}" value in metadata. Must contain only lowercase '
@@ -190,7 +190,7 @@ def load(self):
         self.log.info('Loading metadata file: {0}'.format(self.metadata_file))
         metadata = self._load_metadata()
         meta_parser = APBMetaParser(metadata, logger=self.log)
-        name = sanitize_content_name(meta_parser.parse_name())
+        name = meta_parser.parse_name()
         description = meta_parser.parse_description()
         meta_parser.check_data()
         data = {'tags': meta_parser.parse_tags()}
diff --git a/galaxy/importer/tests/test_apb_loader.py b/galaxy/importer/tests/test_apb_loader.py
index c14d2c848..5ac4df832 100644
--- a/galaxy/importer/tests/test_apb_loader.py
+++ b/galaxy/importer/tests/test_apb_loader.py
@@ -248,7 +248,7 @@ def test_invalid_tags(self):
     def test_parse_name(self):
         parser = apb_loader.APBMetaParser(self.data, self.log)
         name = parser.parse_name()
-        assert name == 'mssql-apb'
+        assert name == 'mssql_apb'
 
     def test_parse_description(self):
         parser = apb_loader.APBMetaParser(self.data, self.log)
@@ -354,7 +354,7 @@ def test_load_role(self, load_metadata_mock):
         role_meta = apb.role_meta
         metadata = apb.metadata['apb_metadata']
 
-        assert apb.name == 'mssql-apb'
+        assert apb.name == 'mssql_apb'
         assert len(metadata['metadata']['dependencies']) == 1
         assert apb.description == 'Deployment of Microsoft SQL Server on Linux'
         assert role_meta['tags'] == ['database', 'mssql']