Skip to content

Commit 46b38fb

Browse files
author
David Linko
committed
updated to latest dtnma libraries
1 parent 0a9a245 commit 46b38fb

37 files changed

+444
-394
lines changed

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ RENDERER_PORT=8081
4949
RENDERER_HOST_PORT=${DOCKER_CTR_PREFIX}grafana-image-renderer:${RENDERER_PORT}
5050
ION_MGR_PORT=8089
5151
HTTP_PORT:80
52-
52+
SOCKDIR=/var/tmp/nm

‎anms-core/anms/components/schemas/ARIs/actual_object.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class ActualObjectBase(BaseModel):
3232
obj_metadata_id: Optional[int] = None
3333
type_name: Optional[str] = None
3434
obj_name: Optional[str] = None
35-
namespace_id: Optional[int] = None
36-
adm_name: Optional[str] = None
37-
adm_enum: Optional[int] = None
38-
adm_enum_label: Optional[int] = None
35+
data_model_id: Optional[int] = None
36+
data_model_name: Optional[str] = None
37+
enumeration: Optional[int] = None
38+
namespace_type: Optional[int] = None
3939
use_desc: Optional[str] = None
4040
obj_actual_definition_id: Optional[int] = None
4141
actual_desc: Optional[str] = None

‎anms-core/anms/components/schemas/ARIs/ari.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
class ARIBase(BaseModel):
3232
obj_metadata_id: Optional[int] = None
3333
obj_name: Optional[str] = None
34-
adm_name: Optional[str] = None
34+
data_model_name: Optional[str] = None
3535
type_name: Optional[str] = None
36-
namespace_id: Optional[int] = None
36+
data_model_id: Optional[int] = None
3737
obj_id: Optional[int] = None
3838
parm_id: Optional[int] = None
3939
actual: Optional[bool] = None
@@ -65,12 +65,12 @@ class ARICollection(BaseModel):
6565
obj_metadata_id: Optional[int] = None
6666
use_desc: Optional[str] = None
6767
obj_name: Optional[str] = None
68-
namespace_id: Optional[int] = None
68+
data_model_id: Optional[int] = None
6969
namespace_type: Optional[str] = None
7070
issuing_org: Optional[str] = None
7171
name_string: Optional[str] = None
7272
version_name: Optional[str] = None
73-
adm_enum: Optional[int] = None
73+
enumeration: Optional[int] = None
7474
obj_enum: Optional[int] = None
7575
type_desc: Optional[str] = None
7676
ns_desc: Optional[str] = None

‎anms-core/anms/components/schemas/ARIs/control.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
# Shared properties
3131
class ControlBase(BaseModel):
3232
obj_name: Optional[str] = None
33-
namespace_id: Optional[int] = None
34-
adm_name: Optional[str] = None
33+
data_model_id: Optional[int] = None
34+
data_model_name: Optional[str] = None
3535
obj_formal_definition_id: Optional[int] = None
3636
fp_spec_id: Optional[int] = None
3737
num_parms: Optional[int] = None

‎anms-core/anms/components/schemas/ARIs/edd_formal.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
class EddFormalBase(BaseModel):
3232
obj_metadata_id: Optional[int] = None
3333
obj_name: Optional[str] = None
34-
namespace_id: Optional[int] = None
34+
data_model_id: Optional[int] = None
3535
obj_formal_definition_id: Optional[int] = None
3636
fp_spec_id: Optional[int] = None
3737
use_desc: Optional[str] = None

‎anms-core/anms/components/schemas/ARIs/formal_object.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class FormalObjectBase(BaseModel):
3232
obj_metadata_id: Optional[int] = None
3333
type_name: Optional[str] = None
3434
obj_name: Optional[str] = None
35-
namespace_id: Optional[int] = None
36-
adm_name: Optional[str] = None
37-
adm_enum: Optional[int] = None
38-
adm_enum_label: Optional[int] = None
35+
data_model_id: Optional[int] = None
36+
data_model_name: Optional[str] = None
37+
enumeration: Optional[int] = None
38+
namespace_type: Optional[int] = None
3939
use_desc: Optional[str] = None
4040
obj_formal_definition_id: Optional[int] = None
4141
formal_desc: Optional[str] = None

‎anms-core/anms/components/schemas/ARIs/mac_formal.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
class MacFormalBase(BaseModel):
3232
obj_metadata_id: Optional[int] = None
3333
obj_name: Optional[str] = None
34-
namespace_id: Optional[int] = None
34+
data_model_id: Optional[int] = None
3535
obj_formal_definition_id: Optional[int] = None
3636
fp_spec_id: Optional[int] = None
3737
use_desc: Optional[str] = None

‎anms-core/anms/components/schemas/ARIs/rpt_formal.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
class RptFormalBase(BaseModel):
3232
obj_metadata_id: Optional[int] = None
3333
obj_name: Optional[str] = None
34-
namespace_id: Optional[int] = None
34+
data_model_id: Optional[int] = None
3535
obj_formal_definition_id: Optional[int] = None
3636
fp_spec_id: Optional[int] = None
3737
use_desc: Optional[str] = None

‎anms-core/anms/components/schemas/adm.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
from pydantic import BaseModel
2727

2828
class NamespaceViewSchema(BaseModel):
29-
adm_enum: int
30-
adm_name: str
29+
enumeration: int
30+
data_model_name: str
3131
name_string: Optional[str]
3232
version_name: Optional[str]
3333
use_desc: Optional[str]

‎anms-core/anms/models/relational/actual_object.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ class ActualObject(Model):
3535
__tablename__ = 'vw_obj_actual_def'
3636
obj_metadata_id = Column(Integer, primary_key=True)
3737
type_name = Column(String, nullable=False)
38-
obj_name = Column(String, nullable=False)
39-
namespace_id = Column(Integer, nullable=False)
40-
adm_name = Column(String)
41-
adm_enum = Column(Integer)
42-
adm_enum_label = Column(String)
38+
name = Column(String, nullable=False)
39+
data_model_id = Column(Integer, nullable=False)
40+
data_model_name = Column(String)
41+
enumeration = Column(Integer)
42+
namespace_type = Column(String)
4343
use_desc = Column(String)
4444
obj_actual_definition_id = Column(Integer, nullable=False)
4545
actual_desc = Column(String)
@@ -59,10 +59,11 @@ def as_dict(self) -> Dict[str, Any]:
5959
class VarActual(Model):
6060
__tablename__ = 'vw_var_actual'
6161
obj_metadata_id = Column(Integer, primary_key=True)
62-
obj_name = Column(String)
63-
namespace_id = Column(Integer)
62+
name = Column(String)
63+
data_model_id = Column(Integer)
6464
obj_actual_definition_id = Column(Integer)
65-
expression_id = Column(Integer)
65+
expression = Column(String)
66+
init_value = Column(String)
6667
data_type_id = Column(Integer)
6768
use_desc = Column(String)
6869

0 commit comments

Comments
 (0)
⚡