Skip to content

Commit d989ccf

Browse files
RahulBenakaRahulNagaraju15
RahulBenaka
and
RahulNagaraju15
authored
Updating param name from connector_i_ds to connector_ids in RFmx VNA (#1237)
* Fixing "i_ds" to "_ids" using ADDITIONAL_ACRONYM mechanism * Adding ^current_latest_version for setuptools and running poetry lock --------- Co-authored-by: rnagaraj <rahul.nagaraju@ni.com>
1 parent f878234 commit d989ccf

7 files changed

Lines changed: 347 additions & 276 deletions

File tree

‎examples/poetry.lock‎

Lines changed: 302 additions & 237 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ mypy-protobuf = "3.6.0"
1616
types-protobuf = ">=5.28.3.20241203"
1717
types-grpcio = ">=1.0"
1818
black = ">=23.3.0"
19+
setuptools = "^80.9.0"
1920

2021
[[tool.mypy.overrides]]
2122
# nifpga has a field named "property" which shadows the built-in "@property" decorator.

‎generated/nirfmxvna/nirfmxvna.proto‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ message CalkitManagerCalkitCalibrationElementGetPortConnectorsRequest {
915915

916916
message CalkitManagerCalkitCalibrationElementGetPortConnectorsResponse {
917917
int32 status = 1;
918-
string connector_i_ds = 2;
918+
string connector_ids = 2;
919919
}
920920

921921
message CalkitManagerCalkitCalibrationElementGetSParameterDefinitionRequest {
@@ -1413,7 +1413,7 @@ message CalkitManagerCalkitCalibrationElementSetMinimumFrequencyResponse {
14131413
message CalkitManagerCalkitCalibrationElementSetPortConnectorsRequest {
14141414
nidevice_grpc.Session instrument = 1;
14151415
string selector_string = 2;
1416-
string connector_i_ds = 3;
1416+
string connector_ids = 3;
14171417
int32 array_size = 4;
14181418
}
14191419

@@ -1575,7 +1575,7 @@ message CalkitManagerCalkitGetCalibrationElementIDsRequest {
15751575

15761576
message CalkitManagerCalkitGetCalibrationElementIDsResponse {
15771577
int32 status = 1;
1578-
string calibration_element_i_ds = 2;
1578+
string calibration_element_ids = 2;
15791579
}
15801580

15811581
message CalkitManagerCalkitGetConnectorIDsRequest {
@@ -1585,7 +1585,7 @@ message CalkitManagerCalkitGetConnectorIDsRequest {
15851585

15861586
message CalkitManagerCalkitGetConnectorIDsResponse {
15871587
int32 status = 1;
1588-
string connector_i_ds = 2;
1588+
string connector_ids = 2;
15891589
}
15901590

15911591
message CalkitManagerCalkitGetDescriptionRequest {
@@ -1720,7 +1720,7 @@ message CalkitManagerGetCalkitIDsRequest {
17201720

17211721
message CalkitManagerGetCalkitIDsResponse {
17221722
int32 status = 1;
1723-
string calkit_i_ds = 2;
1723+
string calkit_ids = 2;
17241724
}
17251725

17261726
message CalkitManagerImportCalkitRequest {

‎generated/nirfmxvna/nirfmxvna_client.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,14 +1342,14 @@ calkit_manager_calkit_calibration_element_set_minimum_frequency(const StubPtr& s
13421342
}
13431343

13441344
CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse
1345-
calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_i_ds, const pb::int32& array_size)
1345+
calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_ids, const pb::int32& array_size)
13461346
{
13471347
::grpc::ClientContext context;
13481348

13491349
auto request = CalkitManagerCalkitCalibrationElementSetPortConnectorsRequest{};
13501350
request.mutable_instrument()->CopyFrom(instrument);
13511351
request.set_selector_string(selector_string);
1352-
request.set_connector_i_ds(connector_i_ds);
1352+
request.set_connector_ids(connector_ids);
13531353
request.set_array_size(array_size);
13541354

13551355
auto response = CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse{};

‎generated/nirfmxvna/nirfmxvna_client.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CalkitManagerCalkitCalibrationElementSParameterSetSParamAvailabilityResponse cal
9393
CalkitManagerCalkitCalibrationElementSetDescriptionResponse calkit_manager_calkit_calibration_element_set_description(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& description);
9494
CalkitManagerCalkitCalibrationElementSetMaximumFrequencyResponse calkit_manager_calkit_calibration_element_set_maximum_frequency(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& maximum_frequency);
9595
CalkitManagerCalkitCalibrationElementSetMinimumFrequencyResponse calkit_manager_calkit_calibration_element_set_minimum_frequency(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& minimum_frequency);
96-
CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_i_ds, const pb::int32& array_size);
96+
CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_ids, const pb::int32& array_size);
9797
CalkitManagerCalkitCalibrationElementSetSParameterDefinitionResponse calkit_manager_calkit_calibration_element_set_s_parameter_definition(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<CalkitManagerCalkitCalibrationElementSParameterDefinition, pb::int32>& s_parameter_definition);
9898
CalkitManagerCalkitCalibrationElementSetTypesResponse calkit_manager_calkit_calibration_element_set_types(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::vector<pb::int32>& calibration_element_types);
9999
CalkitManagerCalkitConnectorGetDescriptionResponse calkit_manager_calkit_connector_get_description(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string);

‎generated/nirfmxvna/nirfmxvna_service.cpp‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -902,11 +902,11 @@ namespace nirfmxvna_grpc {
902902
}
903903
int32 array_size = status;
904904

905-
std::string connector_i_ds;
905+
std::string connector_ids;
906906
if (array_size > 0) {
907-
connector_i_ds.resize(array_size - 1);
907+
connector_ids.resize(array_size - 1);
908908
}
909-
status = library_->CalkitManagerCalkitCalibrationElementGetPortConnectors(instrument, selector_string, array_size, (char*)connector_i_ds.data());
909+
status = library_->CalkitManagerCalkitCalibrationElementGetPortConnectors(instrument, selector_string, array_size, (char*)connector_ids.data());
910910
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
911911
// buffer is now too small, try again
912912
continue;
@@ -915,10 +915,10 @@ namespace nirfmxvna_grpc {
915915
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
916916
}
917917
response->set_status(status);
918-
std::string connector_i_ds_utf8;
919-
convert_to_grpc(connector_i_ds, &connector_i_ds_utf8);
920-
response->set_connector_i_ds(connector_i_ds_utf8);
921-
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_i_ds()));
918+
std::string connector_ids_utf8;
919+
convert_to_grpc(connector_ids, &connector_ids_utf8);
920+
response->set_connector_ids(connector_ids_utf8);
921+
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_ids()));
922922
return ::grpc::Status::OK;
923923
}
924924
}
@@ -2412,10 +2412,10 @@ namespace nirfmxvna_grpc {
24122412
niRFmxInstrHandle instrument = session_repository_->access_session(instrument_grpc_session.name());
24132413
auto selector_string_mbcs = convert_from_grpc<std::string>(request->selector_string());
24142414
char* selector_string = (char*)selector_string_mbcs.c_str();
2415-
auto connector_i_ds_mbcs = convert_from_grpc<std::string>(request->connector_i_ds());
2416-
char* connector_i_ds = (char*)connector_i_ds_mbcs.c_str();
2415+
auto connector_ids_mbcs = convert_from_grpc<std::string>(request->connector_ids());
2416+
char* connector_ids = (char*)connector_ids_mbcs.c_str();
24172417
int32 array_size = request->array_size();
2418-
auto status = library_->CalkitManagerCalkitCalibrationElementSetPortConnectors(instrument, selector_string, connector_i_ds, array_size);
2418+
auto status = library_->CalkitManagerCalkitCalibrationElementSetPortConnectors(instrument, selector_string, connector_ids, array_size);
24192419
if (!status_ok(status)) {
24202420
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
24212421
}
@@ -2883,11 +2883,11 @@ namespace nirfmxvna_grpc {
28832883
}
28842884
int32 array_size = status;
28852885

2886-
std::string calibration_element_i_ds;
2886+
std::string calibration_element_ids;
28872887
if (array_size > 0) {
2888-
calibration_element_i_ds.resize(array_size - 1);
2888+
calibration_element_ids.resize(array_size - 1);
28892889
}
2890-
status = library_->CalkitManagerCalkitGetCalibrationElementIDs(instrument, selector_string, array_size, (char*)calibration_element_i_ds.data());
2890+
status = library_->CalkitManagerCalkitGetCalibrationElementIDs(instrument, selector_string, array_size, (char*)calibration_element_ids.data());
28912891
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
28922892
// buffer is now too small, try again
28932893
continue;
@@ -2896,10 +2896,10 @@ namespace nirfmxvna_grpc {
28962896
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
28972897
}
28982898
response->set_status(status);
2899-
std::string calibration_element_i_ds_utf8;
2900-
convert_to_grpc(calibration_element_i_ds, &calibration_element_i_ds_utf8);
2901-
response->set_calibration_element_i_ds(calibration_element_i_ds_utf8);
2902-
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calibration_element_i_ds()));
2899+
std::string calibration_element_ids_utf8;
2900+
convert_to_grpc(calibration_element_ids, &calibration_element_ids_utf8);
2901+
response->set_calibration_element_ids(calibration_element_ids_utf8);
2902+
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calibration_element_ids()));
29032903
return ::grpc::Status::OK;
29042904
}
29052905
}
@@ -2928,11 +2928,11 @@ namespace nirfmxvna_grpc {
29282928
}
29292929
int32 array_size = status;
29302930

2931-
std::string connector_i_ds;
2931+
std::string connector_ids;
29322932
if (array_size > 0) {
2933-
connector_i_ds.resize(array_size - 1);
2933+
connector_ids.resize(array_size - 1);
29342934
}
2935-
status = library_->CalkitManagerCalkitGetConnectorIDs(instrument, selector_string, array_size, (char*)connector_i_ds.data());
2935+
status = library_->CalkitManagerCalkitGetConnectorIDs(instrument, selector_string, array_size, (char*)connector_ids.data());
29362936
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
29372937
// buffer is now too small, try again
29382938
continue;
@@ -2941,10 +2941,10 @@ namespace nirfmxvna_grpc {
29412941
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
29422942
}
29432943
response->set_status(status);
2944-
std::string connector_i_ds_utf8;
2945-
convert_to_grpc(connector_i_ds, &connector_i_ds_utf8);
2946-
response->set_connector_i_ds(connector_i_ds_utf8);
2947-
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_i_ds()));
2944+
std::string connector_ids_utf8;
2945+
convert_to_grpc(connector_ids, &connector_ids_utf8);
2946+
response->set_connector_ids(connector_ids_utf8);
2947+
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_ids()));
29482948
return ::grpc::Status::OK;
29492949
}
29502950
}
@@ -3339,11 +3339,11 @@ namespace nirfmxvna_grpc {
33393339
}
33403340
int32 array_size = status;
33413341

3342-
std::string calkit_i_ds;
3342+
std::string calkit_ids;
33433343
if (array_size > 0) {
3344-
calkit_i_ds.resize(array_size - 1);
3344+
calkit_ids.resize(array_size - 1);
33453345
}
3346-
status = library_->CalkitManagerGetCalkitIDs(instrument, selector_string, array_size, (char*)calkit_i_ds.data());
3346+
status = library_->CalkitManagerGetCalkitIDs(instrument, selector_string, array_size, (char*)calkit_ids.data());
33473347
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
33483348
// buffer is now too small, try again
33493349
continue;
@@ -3352,10 +3352,10 @@ namespace nirfmxvna_grpc {
33523352
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
33533353
}
33543354
response->set_status(status);
3355-
std::string calkit_i_ds_utf8;
3356-
convert_to_grpc(calkit_i_ds, &calkit_i_ds_utf8);
3357-
response->set_calkit_i_ds(calkit_i_ds_utf8);
3358-
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calkit_i_ds()));
3355+
std::string calkit_ids_utf8;
3356+
convert_to_grpc(calkit_ids, &calkit_ids_utf8);
3357+
response->set_calkit_ids(calkit_ids_utf8);
3358+
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calkit_ids()));
33593359
return ::grpc::Status::OK;
33603360
}
33613361
}

‎source/codegen/metadata/nirfmxvna/functions.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@
600600
},
601601
{
602602
'direction': 'out',
603+
'grpc_name': 'connector_ids',
603604
'name': 'connectorIDs',
604605
'size': {
605606
'mechanism': 'ivi-dance',
@@ -1902,6 +1903,7 @@
19021903
},
19031904
{
19041905
'direction': 'in',
1906+
'grpc_name': 'connector_ids',
19051907
'name': 'connectorIDs',
19061908
'type': 'char[]'
19071909
},
@@ -2258,6 +2260,7 @@
22582260
},
22592261
{
22602262
'direction': 'out',
2263+
'grpc_name': 'calibration_element_ids',
22612264
'name': 'calibrationElementIDs',
22622265
'size': {
22632266
'mechanism': 'ivi-dance',
@@ -2288,6 +2291,7 @@
22882291
},
22892292
{
22902293
'direction': 'out',
2294+
'grpc_name': 'connector_ids',
22912295
'name': 'connectorIDs',
22922296
'size': {
22932297
'mechanism': 'ivi-dance',
@@ -2595,6 +2599,7 @@
25952599
},
25962600
{
25972601
'direction': 'out',
2602+
'grpc_name': 'calkit_ids',
25982603
'name': 'calkitIDs',
25992604
'size': {
26002605
'mechanism': 'ivi-dance',

0 commit comments

Comments
 (0)