Revert "Renaming layers to rollouts (#68)"

This reverts commit 9f38b15.

Author: aliabbasrizvi

optimizely/decision_service.py

@@ -268,8 +268,8 @@ def get_variation_for_feature(self, feature, user_id, attributes=None):
                           'User "%s" is in variation %s of experiment %s.' % (user_id, variation.key, experiment.key))
 
     # Next check if user is part of a rollout
-    if not variation and feature.rolloutId:
-      rollout = self.config.get_layer_from_id(feature.rolloutId)
-      variation = self.get_variation_for_layer(rollout, user_id, attributes, ignore_user_profile=True)
+    if not variation and feature.layerId:
+      layer = self.config.get_layer_from_id(feature.layerId)
+      variation = self.get_variation_for_layer(layer, user_id, attributes, ignore_user_profile=True)
 
     return variation

optimizely/entities.py

@@ -59,13 +59,13 @@ def __init__(self, id, key, status, audienceIds, variations, forcedVariations,
     self.groupPolicy = groupPolicy
 
 
-class FeatureFlag(BaseEntity):
+class Feature(BaseEntity):
 
-  def __init__(self, id, key, experimentIds, rolloutId, variables, groupId=None, **kwargs):
+  def __init__(self, id, key, experimentIds, layerId, variables, groupId=None, **kwargs):
     self.id = id
     self.key = key
     self.experimentIds = experimentIds
-    self.rolloutId = rolloutId
+    self.layerId = layerId
     self.variables = variables
     self.groupId = groupId
 
@@ -81,8 +81,9 @@ def __init__(self, id, policy, experiments, trafficAllocation, **kwargs):
 
 class Layer(BaseEntity):
 
-  def __init__(self, id, experiments, **kwargs):
+  def __init__(self, id, policy, experiments, **kwargs):
     self.id = id
+    self.policy = policy
     self.experiments = experiments
 
 

optimizely/project_config.py

@@ -53,17 +53,17 @@ def __init__(self, datafile, logger, error_handler):
     self.events = config.get('events', [])
     self.attributes = config.get('attributes', [])
     self.audiences = config.get('audiences', [])
-    self.feature_flags = config.get('featureFlags', [])
-    self.rollouts = config.get('rollouts', [])
     self.anonymize_ip = config.get('anonymizeIP', False)
+    self.features = config.get('features', [])
+    self.layers = config.get('layers', [])
 
     # Utility maps for quick lookup
     self.group_id_map = self._generate_key_map(self.groups, 'id', entities.Group)
     self.experiment_key_map = self._generate_key_map(self.experiments, 'key', entities.Experiment)
     self.event_key_map = self._generate_key_map(self.events, 'key', entities.Event)
     self.attribute_key_map = self._generate_key_map(self.attributes, 'key', entities.Attribute)
     self.audience_id_map = self._generate_key_map(self.audiences, 'id', entities.Audience)
-    self.layer_id_map = self._generate_key_map(self.rollouts, 'id', entities.Layer)
+    self.layer_id_map = self._generate_key_map(self.layers, 'id', entities.Layer)
     for layer in self.layer_id_map.values():
       for experiment in layer.experiments:
         self.experiment_key_map[experiment['key']] = entities.Experiment(**experiment)
@@ -95,7 +95,7 @@ def __init__(self, datafile, logger, error_handler):
             variation.variables, 'id', entities.Variation.VariableUsage
           )
 
-    self.feature_key_map = self._generate_key_map(self.feature_flags, 'key', entities.FeatureFlag)
+    self.feature_key_map = self._generate_key_map(self.features, 'key', entities.Feature)
     for feature in self.feature_key_map.values():
       feature.variables = self._generate_key_map(feature.variables, 'key', entities.Variable)
 

tests/base.py

@@ -247,11 +247,11 @@ def setUp(self):
                       '{"name": "test_attribute", "type": "custom_attribute", "value": "test_value"}]]]',
         'id': '11154'
       }],
-      'rollouts': [{
+      'layers': [{
         'id': '211111',
+        'policy': 'ordered',
         'experiments': [{
-          'id': '211127',
-          'key': '211127',
+          'key': 'test_rollout_exp_1',
           'status': 'Running',
           'forcedVariations': {},
           'layerId': '211111',
@@ -263,20 +263,21 @@ def setUp(self):
             'entityId': '211129',
             'endOfRange': 9000
           }],
+          'id': '211127',
           'variations': [{
-            'key': '211128',
+            'key': 'control',
             'id': '211128'
           }, {
-            'key': '211129',
+            'key': 'variation',
             'id': '211129'
           }]
         }]
       }],
-      'featureFlags': [{
+      'features': [{
         'id': '91111',
         'key': 'test_feature_1',
         'experimentIds': ['111127'],
-        'rolloutId': '',
+        'layerId': '',
         'variables': [{
             'id': '127',
             'key': 'is_working',
@@ -292,19 +293,19 @@ def setUp(self):
         'id': '91112',
         'key': 'test_feature_2',
         'experimentIds': [],
-        'rolloutId': '211111',
+        'layerId': '211111',
         'variables': [],
       }, {
         'id': '91113',
         'key': 'test_feature_in_group',
         'experimentIds': ['32222'],
-        'rolloutId': '',
+        'layerId': '',
         'variables': [],
       }, {
         'id': '91114',
         'key': 'test_feature_in_experiment_and_rollout',
         'experimentIds': ['111127'],
-        'rolloutId': '211111',
+        'layerId': '211111',
         'variables': [],
       }]
     }
@@ -479,11 +480,11 @@ def setUp(self):
                       '{"name": "test_attribute", "type": "custom_attribute", "value": "test_value"}]]]',
         'id': '11154'
       }],
-      'rollouts': [{
+      'layers': [{
         'id': '211111',
+        'policy': 'ordered',
         'experiments': [{
-          'id': '211127',
-          'key': '211127',
+          'key': 'test_rollout_exp_1',
           'status': 'Running',
           'forcedVariations': {},
           'layerId': '211111',
@@ -495,36 +496,37 @@ def setUp(self):
             'entityId': '211129',
             'endOfRange': 9000
           }],
+          'id': '211127',
           'variations': [{
-            'key': '211128',
+            'key': 'control',
             'id': '211128'
           }, {
-            'key': '211129',
+            'key': 'variation',
             'id': '211129'
           }]
         }]
       }],
-      'featureFlags': [{
+      'features': [{
         'id': '91111',
-        'key': '91111',
+        'key': 'test_feature_1',
         'experimentIds': ['111127'],
-        'rolloutId': '',
+        'layerId': '',
         'variables': [{
             'id': '127',
-            'key': '127',
+            'key': 'is_working',
             'defaultValue': 'true',
             'type': 'boolean',
           }, {
             'id': '128',
-            'key': '128',
+            'key': 'environment',
             'defaultValue': 'devel',
             'type': 'string',
           }]
       }, {
         'id': '91112',
-        'key': '91112',
+        'key': 'test_feature_2',
         'experimentIds': [],
-        'rolloutId': '211111',
+        'layerId': '211111',
         'variables': [],
       }]
     }