Rename cves to cvenvs and add unit tests for AK properties

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jeremylenz

nailgun/entities.py

@@ -275,21 +275,21 @@ def read(self, entity=None, attrs=None, ignore=None, params=None):
     @property
     def content_view(self):
         """Backward-compat: extract the first content view from content_view_environments."""
-        cves = getattr(self, 'content_view_environments', None)
-        if not cves:
+        cvenvs = getattr(self, 'content_view_environments', None)
+        if not cvenvs:
             return None
-        cv_data = cves[0].get('content_view')
+        cv_data = cvenvs[0].get('content_view')
         if not cv_data:
             return None
         return ContentView(server_config=self._server_config, id=cv_data['id'])
 
     @property
     def environment(self):
         """Backward-compat: extract the first lifecycle environment from content_view_environments."""
-        cves = getattr(self, 'content_view_environments', None)
-        if not cves:
+        cvenvs = getattr(self, 'content_view_environments', None)
+        if not cvenvs:
             return None
-        lce_data = cves[0].get('lifecycle_environment')
+        lce_data = cvenvs[0].get('lifecycle_environment')
         if not lce_data:
             return None
         return LifecycleEnvironment(server_config=self._server_config, id=lce_data['id'])

tests/test_entities.py

@@ -2692,6 +2692,42 @@ def test_creation_and_update(self):
         expected_dct['name'] = 'test_ak_new'
         self.assertEqual(expected_dct, activation_key.update_payload())
 
+    def test_content_view_property(self):
+        """content_view property extracts CV from content_view_environments."""
+        cfg = config.ServerConfig(url='foo')
+        ak = entities.ActivationKey(cfg, name='test_ak', organization=42)
+        ak.content_view_environments = [
+            {
+                'content_view': {'id': 10, 'name': 'Default'},
+                'lifecycle_environment': {'id': 20, 'name': 'Library'},
+            }
+        ]
+        cv = ak.content_view
+        self.assertIsInstance(cv, entities.ContentView)
+        self.assertEqual(cv.id, 10)
+
+    def test_environment_property(self):
+        """Environment property extracts LCE from content_view_environments."""
+        cfg = config.ServerConfig(url='foo')
+        ak = entities.ActivationKey(cfg, name='test_ak', organization=42)
+        ak.content_view_environments = [
+            {
+                'content_view': {'id': 10, 'name': 'Default'},
+                'lifecycle_environment': {'id': 20, 'name': 'Library'},
+            }
+        ]
+        lce = ak.environment
+        self.assertIsInstance(lce, entities.LifecycleEnvironment)
+        self.assertEqual(lce.id, 20)
+
+    def test_content_view_property_empty(self):
+        """content_view returns None when content_view_environments is empty."""
+        cfg = config.ServerConfig(url='foo')
+        ak = entities.ActivationKey(cfg, name='test_ak', organization=42)
+        ak.content_view_environments = []
+        self.assertIsNone(ak.content_view)
+        self.assertIsNone(ak.environment)
+
 
 class ReportTemplateTestCase(TestCase):
     """Tests for :class:`nailgun.entities.ReportTemplate`."""