update tests

Author: Christine WANJAU

src/azure-cli/azure/cli/command_modules/appconfig/_featuremodels.py

@@ -283,6 +283,7 @@ class FeatureUserAllocation:
     :ivar list Users:
         Collection of users where if any match the current user, the variant specified in the user allocation is used.
     '''
+
     def __init__(self,
                  variant,
                  users):
@@ -477,7 +478,7 @@ def convert_from_json(cls, json_string):
         if allocation_user:
             allocation_user_list = []
             for user in allocation_user:
-                feature_user_allocation = FeatureUserAllocation.convert_from_json(json.dumps(user))
+                feature_user_allocation = FeatureUserAllocation.convert_from_json(json.dumps(user, ensure_ascii=False))
                 if (feature_user_allocation):
                     allocation_user_list.append(feature_user_allocation)
 
@@ -488,7 +489,7 @@ def convert_from_json(cls, json_string):
         if allocation_group:
             allocation_group_list = []
             for group in allocation_group:
-                feature_group_allocation = FeatureGroupAllocation.convert_from_json(json.dumps(group))
+                feature_group_allocation = FeatureGroupAllocation.convert_from_json(json.dumps(group, ensure_ascii=False))
                 if (feature_group_allocation): 
                     allocation_group_list.append(feature_group_allocation)
 
@@ -499,7 +500,7 @@ def convert_from_json(cls, json_string):
         if allocation_percentile:
             allocation_percentile_list = []
             for percentile in allocation_percentile:
-                feature_percentile_allocation = FeaturePercentileAllocation.convert_from_json(json.dumps(percentile))
+                feature_percentile_allocation = FeaturePercentileAllocation.convert_from_json(json.dumps(percentile, ensure_ascii=False))
                 if (feature_percentile_allocation):
                     allocation_percentile_list.append(feature_percentile_allocation)
 
@@ -752,10 +753,7 @@ def map_keyvalue_to_featureflagvalue(keyvalue):
             FeatureFlagConstants.ID,
             FeatureFlagConstants.DESCRIPTION,
             FeatureFlagConstants.ENABLED,
-            FeatureFlagConstants.CONDITIONS,
-            FeatureFlagConstants.ALLOCATION,
-            FeatureFlagConstants.VARIANTS,
-            FeatureFlagConstants.TELEMETRY}
+            FeatureFlagConstants.CONDITIONS}
         if valid_fields != feature_flag_dict.keys():
             logger.debug("'%s' feature flag is missing required values or it contains ", keyvalue.key +
                          "unsupported values. Setting missing value to defaults and ignoring unsupported values\n")
@@ -795,14 +793,14 @@ def map_keyvalue_to_featureflagvalue(keyvalue):
         # Allocation
         allocation = feature_flag_dict.get(FeatureFlagConstants.ALLOCATION, None)
         if allocation:
-            feature_flag_dict[FeatureFlagConstants.ALLOCATION] = FeatureAllocation.convert_from_json(json.dumps(allocation))
+            feature_flag_dict[FeatureFlagConstants.ALLOCATION] = FeatureAllocation.convert_from_json(json.dumps(allocation, ensure_ascii=False))
 
         # Variants
         variants = feature_flag_dict.get(FeatureFlagConstants.VARIANTS, None)
         variant_list = []
         if variants:
             for variant in variants:
-                feature_variant = FeatureVariant.convert_from_json(json.dumps(variant))
+                feature_variant = FeatureVariant.convert_from_json(json.dumps(variant, ensure_ascii=False))
                 if (feature_variant):
                     variant_list.append(feature_variant)
 

src/azure-cli/azure/cli/command_modules/appconfig/_kv_import_helpers.py

@@ -242,12 +242,12 @@ def  __read_features_from_msfm_schema(feature_flags_list):
                         new_feature.conditions[FeatureFlagConstants.REQUIREMENT_TYPE] = requirement_type
 
             if allocation := feature.get(FeatureFlagConstants.ALLOCATION, None):
-                new_feature.allocation = FeatureAllocation.convert_from_json(json.dumps(allocation))
+                new_feature.allocation = FeatureAllocation.convert_from_json(json.dumps(allocation, ensure_ascii=False))
 
             if variants := feature.get(FeatureFlagConstants.VARIANTS, None):
                 new_feature.variants = []
                 for variant in variants:
-                    new_variant = FeatureVariant.convert_from_json(json.dumps(variant))
+                    new_variant = FeatureVariant.convert_from_json(json.dumps(variant, ensure_ascii=False))
                     if new_variant:
                         new_feature.variants.append(new_variant)
 

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/export_features_new_fm_schema_as_yaml.json

@@ -1,46 +1,46 @@
 feature_management:
   feature_flags:
-    - id: Variant_Override_True
-      description: ''
-      enabled: true
-      conditions:
-        client_filters: []
-      allocation:
-        default_when_enabled: True_Override
-      variants:
-        - name: True_Override
-          status_override: Disabled
-          configuration_value: default
-    - id: Variant_Override_False
-      description: ''
-      enabled: false
-      conditions:
-        client_filters: []
-      allocation:
-        default_when_disabled: False_Override
-      variants:
-        - name: False_Override
-          status_override: Enabled
-          configuration_value: default
-    - id: TestVariants
-      description: ''
-      enabled: true
-      conditions:
-        client_filters:
-          - Name: TimeWindow
-            Parameters:
-              Start: 'Wed, 01 May 2019 13:59:59 GMT'
-              End: 'Mon, 01 July 2019 00:00:00 GMT'
-      allocation:
-        user:
-          - variant: Alpha
-            users:
-              - Adam
-          - variant: Beta
-            users:
-              - Britney
-      variants:
-        - name: Alpha
-          configuration_value: The Variant Alpha.
-        - name: Beta
-          configuration_value: The Variant Beta.
+  - id: TestVariants
+    description: ''
+    enabled: true
+    conditions:
+      client_filters:
+      - name: TimeWindow
+        parameters:
+          Start: Wed, 01 May 2019 13:59:59 GMT
+          End: Mon, 01 July 2019 00:00:00 GMT
+    allocation:
+      user:
+      - variant: Alpha
+        users:
+        - Adam
+      - variant: Beta
+        users:
+        - Britney
+    variants:
+    - name: Alpha
+      configuration_value: The Variant Alpha.
+    - name: Beta
+      configuration_value: The Variant Beta.
+  - id: Variant_Override_False
+    description: ''
+    enabled: false
+    conditions:
+      client_filters: []
+    allocation:
+      default_when_disabled: False_Override
+    variants:
+    - name: False_Override
+      configuration_value: default
+      status_override: Enabled
+  - id: Variant_Override_True
+    description: ''
+    enabled: true
+    conditions:
+      client_filters: []
+    allocation:
+      default_when_enabled: True_Override
+    variants:
+    - name: True_Override
+      configuration_value: default
+      status_override: Disabled

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/respectBothFmSchemaHyphenCase.json

@@ -1,6 +1,16 @@
 {
     "feature-management": {
-      "FeatureX": true,
+      "FeatureX": {
+        "enabled-for": [
+          {
+            "Name": "TimeWindow",
+            "Parameters": {
+              "Start": "Wed, 01 May 2019 13:59:59 GMT",
+              "End": "Mon, 01 July 2019 00:00:00 GMT"
+            }
+          }
+        ]
+      },
       "FeatureY": true
     },
     "feature_management": {

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/respectBothFmSchemaPascalCase.json

@@ -1,6 +1,16 @@
 {
     "FeatureManagement": {
-      "FeatureX": true,
+      "FeatureX": {
+        "EnabledFor": [
+          {
+            "Name": "TimeWindow",
+            "Parameters": {
+              "Start": "Wed, 01 May 2019 13:59:59 GMT",
+              "End": "Mon, 01 July 2019 00:00:00 GMT"
+            }
+          }
+        ]
+      },
       "FeatureY": true
     },
     "feature_management": {

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/respectBothFmSchemaUnderscoreCase.json

@@ -10,7 +10,17 @@
         "enabled": false
       }
     ],
-      "FeatureX": true,
-      "FeatureY": true
+    "FeatureX": {
+      "enabled_for": [
+        {
+          "Name": "TimeWindow",
+          "Parameters": {
+            "Start": "Wed, 01 May 2019 13:59:59 GMT",
+            "End": "Mon, 01 July 2019 00:00:00 GMT"
+          }
+        }
+      ]
+    },
+    "FeatureY": true
     }
 }

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/test_appconfig_commands.py

@@ -1483,7 +1483,7 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         # Respect both fm schemas in file
         # # Camel case naming convention
         os.environ['AZURE_APPCONFIG_FM_COMPATIBILITY_MODE'] = 'False'
-        
+
         imported_both_schemas_camel_case_file_path = os.path.join(TEST_DIR, 'respectBothFmSchemaCamelCase.json')
         exported_both_schemas_camel_case_file_path = os.path.join(TEST_DIR, 'export_features_both_schema_camel_case_file_path.json')
         expected_exported_both_schemas_file_path = os.path.join(TEST_DIR, 'expected_export_features_both_schema_file_path.json')
@@ -1548,7 +1548,7 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         with open(expected_exported_both_schemas_file_path) as json_file:
             exported_kvs = json.load(json_file)
         assert exported_hyphen_case_kvs == exported_kvs
-        os.remove(exported_both_schemas_pascal_case_file_path)
+        os.remove(exported_both_schemas_hyphen_case_file_path)
 
 
         # # Underscore case naming convention
@@ -1565,13 +1565,13 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         self.cmd(
             'appconfig kv import -n {config_store_name} -s {import_source} --path "{imported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         self.cmd(
-            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --naming-convention {naming_convention} --label {label} -y')
+            'appconfig kv export -n {config_store_name} -d {import_source} --path "{exported_file_both_schemas_fm_path}" --format {imported_format} --label {label} -y')
         with open(exported_both_schemas_underscore_case_file_path) as json_file:
             exported_underscore_case_kvs = json.load(json_file)
         with open(expected_exported_both_schemas_file_path) as json_file:
             exported_kvs = json.load(json_file)
         assert exported_underscore_case_kvs == exported_kvs
-        os.remove(exported_both_schemas_pascal_case_file_path)
+        os.remove(exported_both_schemas_underscore_case_file_path)
 
         # Import/Export new fm yaml file
         os.environ['AZURE_APPCONFIG_FM_COMPATIBILITY_MODE'] = 'False'
@@ -1580,7 +1580,7 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         exported_new_fm_schema_as_yaml_file_path = os.path.join(TEST_DIR, 'export_features_new_fm_schema_as_yaml.json')
 
         self.kwargs.update({
-            'label': 'YamlTests',
+            'label': 'NewFmSchemaYamlTests',
             'imported_format': 'yaml',
             'naming_convention': 'hyphen',
             'imported_ffv2_file_path': imported_new_fm_schema_yaml_file_path,
@@ -1607,7 +1607,7 @@ def test_azconfig_import_export_naming_conventions(self, resource_group, locatio
         exported_as_kv_prop_file_path = os.path.join(TEST_DIR, 'export_as_kv_prop.json')
 
         self.kwargs.update({
-            'label': 'PropertiesTests',
+            'label': 'NewFmSchemaPropertiesTests',
             'imported_format': 'properties',
             'imported_file_path': imported_prop_file_path,
             'exported_file_path': exported_prop_file_path