resolved PR comments

Author: Aravindhan Palanisamy

examples/assetmanagement/assets.py

@@ -2,9 +2,8 @@
 from nisystemlink.clients.assetmanagement.models import (
     AssetBusType,
     AssetDiscoveryType,
-    AssetLocation,
-    AssetPresence,
-    AssetPresenceWithSystemConnection,
+    AssetLocationForCreate,
+    AssetPresenceStatus,
     AssetType,
     CreateAssetRequest,
     ExternalCalibration,
@@ -45,10 +44,8 @@
         ),
         is_NI_asset=True,
         workspace="846e294a-a007-47ac-9fc2-fac07eab240e",
-        location=AssetLocation(
-            state=AssetPresenceWithSystemConnection(
-                asset_presence=AssetPresence.PRESENT
-            )
+        location=AssetLocationForCreate(
+            state=AssetLocationForCreate(asset_presence=AssetPresenceStatus.PRESENT)
         ),
         external_calibration=ExternalCalibration(
             temperature_sensors=[TemperatureSensor(name="Sensor0", reading=25.8)],

nisystemlink/clients/assetmanagement/models/__init__.py

@@ -7,8 +7,10 @@
 from ._query_assets_response import QueryAssetsResponse
 from ._asset_location import (
     AssetLocation,
+    AssetLocationForCreate,
     AssetPresence,
     AssetPresenceWithSystemConnection,
+    AssetPresenceStatus,
 )
 from ._asset_calibration import (
     CalibrationMode,

nisystemlink/clients/assetmanagement/models/_asset_location.py

@@ -4,7 +4,7 @@
 from nisystemlink.clients.core._uplink._json_model import JsonModel
 
 
-class AssetPresence(Enum):
+class AssetPresenceStatus(Enum):
     """Status of an asset's presence in a system."""
 
     INITIALIZING = "INITIALIZING"
@@ -20,20 +20,33 @@ class SystemConnection(Enum):
     [CONNECTED_UPDATE_PENDING, CONNECTED_UPDATE_SUCCESSFUL, CONNECTED_UPDATE_FAILED] are equivalent to CONNECTED.
     """
 
-    CONNECTED = "CONNECTED"
+    APPROVED = "APPROVED"
     DISCONNECTED = "DISCONNECTED"
+    CONNECTED_UPDATE_PENDING = "CONNECTED_UPDATE_PENDING"
+    CONNECTED = "CONNECTED"
+    CONNECTED_UPDATE_FAILED = "CONNECTED_UPDATE_FAILED"
+    UNSUPPORTED = "UNSUPPORTED"
+    ACTIVATED = "ACTIVATED"
+    CONNECTED_UPDATE_SUCCESSFUL = "CONNECTED_UPDATE_SUCCESSFUL"
 
 
 class AssetPresenceWithSystemConnection(JsonModel):
     """Model for the presence of an asset and the connection of the system in which it resides."""
 
-    asset_presence: AssetPresence
+    asset_presence: AssetPresenceStatus
     """Gets or sets the status of an asset's presence in a system."""
 
     system_connection: Optional[SystemConnection] = None
     """Gets or sets whether or not the minion is connected to the server and has updated the server with its data."""
 
 
+class AssetPresence(JsonModel):
+    """Model for the presence of an asset."""
+
+    asset_presence: AssetPresenceStatus
+    """Gets or sets the status of an asset's presence in a system."""
+
+
 class AssetLocation(JsonModel):
     """Model for information about the asset location, presence and the connection status of the system."""
 
@@ -54,3 +67,8 @@ class AssetLocation(JsonModel):
 
     state: AssetPresenceWithSystemConnection
     """Presence of an asset and the connection of the system in which it resides."""
+
+
+class AssetLocationForCreate(AssetLocation):
+
+    state: AssetPresence

nisystemlink/clients/assetmanagement/models/_create_asset_request.py

@@ -5,12 +5,12 @@
 from ._asset import (
     AssetBusType,
     AssetDiscoveryType,
-    AssetLocation,
     AssetType,
     ExternalCalibration,
     SelfCalibration,
     TemperatureSensor,
 )
+from ._asset_location import AssetLocationForCreate
 
 
 class CreateAssetRequest(JsonModel):
@@ -70,7 +70,7 @@ class CreateAssetRequest(JsonModel):
     workspace: Optional[str] = None
     """Gets or sets the ID of the workspace."""
 
-    location: AssetLocation
+    location: AssetLocationForCreate
     """Model for information about the asset location, presence and the connection status of the system"""
 
     external_calibration: Optional[ExternalCalibration] = None

tests/integration/assetmanagement/test_asset_management.py

@@ -8,9 +8,9 @@
     AssetBusType,
     AssetDiscoveryType,
     AssetField,
-    AssetLocation,
+    AssetLocationForCreate,
     AssetPresence,
-    AssetPresenceWithSystemConnection,
+    AssetPresenceStatus,
     AssetType,
     CreateAssetRequest,
     CreateAssetsPartialSuccessResponse,
@@ -49,10 +49,8 @@ def create_assets_request() -> List[CreateAssetRequest]:
             ),
             is_NI_asset=True,
             workspace="846e294a-a007-47ac-9fc2-fac07eab240e",
-            location=AssetLocation(
-                state=AssetPresenceWithSystemConnection(
-                    asset_presence=AssetPresence.PRESENT
-                )
+            location=AssetLocationForCreate(
+                state=AssetPresence(asset_presence=AssetPresenceStatus.PRESENT)
             ),
             external_calibration=ExternalCalibration(
                 temperature_sensors=[TemperatureSensor(name="Sensor0", reading=25.8)],
@@ -83,7 +81,7 @@ def create_asset(client: AssetManagementClient):
     def _create_assets(
         new_assets: CreateAssetRequest,
     ) -> CreateAssetsPartialSuccessResponse:
-        response = client.create_assets(assets = new_assets)
+        response = client.create_assets(assets=new_assets)
         responses.append(response)
         return response