Fix issues with expanding variant values

Author: douglasjacobsen

lib/ramble/ramble/expander.py

@@ -756,10 +756,12 @@ def satisfies(
                      the input requirement.
         """
 
-        if variant_set is not None:
-            variant_definitions = variant_set.as_set()
-        else:
-            variant_definitions = set()
+        variant_definitions = set()
+
+        if hasattr(variant_set, "as_set"):
+            for variant in variant_set.as_set():
+                exp_variant = self.expand_var(variant)
+                variant_definitions.add(exp_variant)
 
         satisfied = True
         if reqs is not None:

var/ramble/repos/builtin/base_classes/application-base/base_class.py

@@ -598,7 +598,8 @@ def set_variables_and_variants(self, variables, variants, experiment_set):
         for cls in base_chain:
             if hasattr(cls, "name") and cls.name is not None:
                 self.object_variants.multi_value_variant(
-                    "application_name", value=cls.name
+                    "application_name",
+                    value=self.expander.application_name,
                 )
 
         # Define workload_name variant as early as possible