Intermediate changes

yt/yt/client/bundle_controller_client/bundle_controller_client.h

@@ -26,7 +26,7 @@ struct TBundleConfigDescriptor
 
     TBundleTargetConfigPtr Config;
     TBundleConfigConstraintsPtr ConfigConstraints;
-    TResourceQuotaPtr ResourceQuota;
+    TBundleResourceQuotaPtr ResourceQuota;
 
     REGISTER_YSON_STRUCT(TBundleConfigDescriptor);
 

yt/yt/client/bundle_controller_client/bundle_controller_settings.cpp

@@ -99,9 +99,10 @@ void TBundleConfigConstraints::Register(TRegistrar registrar)
         .Default();
 }
 
-void TResourceQuota::Register(TRegistrar registrar)
+
+void TBundleResourceQuota::Register(TRegistrar registrar)
 {
-    registrar.Parameter("cpu", &TThis::Cpu)
+    registrar.Parameter("vcpu", &TThis::Vcpu)
         .GreaterThanOrEqual(0)
         .Default(0);
 
@@ -110,12 +111,6 @@ void TResourceQuota::Register(TRegistrar registrar)
         .Default(0);
 }
 
-int TResourceQuota::Vcpu() const
-{
-    const int VFactor = 1000;
-    return static_cast<int>(Cpu * VFactor);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace NProto {
@@ -285,19 +280,16 @@ void FromProto(TBundleConfigConstraintsPtr bundleConfigConstraints, const NBundl
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void ToProto(NBundleController::NProto::TResourceQuota* protoResourceQuota, const TResourceQuotaPtr resourceQuota)
+void ToProto(NBundleController::NProto::TResourceQuota* protoResourceQuota, const TBundleResourceQuotaPtr resourceQuota)
 {
-    protoResourceQuota->set_vcpu(resourceQuota->Vcpu());
+    protoResourceQuota->set_vcpu(resourceQuota->Vcpu);
     protoResourceQuota->set_memory(resourceQuota->Memory);
 }
 
-void FromProto(TResourceQuotaPtr resourceQuota, const NBundleController::NProto::TResourceQuota* protoResourceQuota)
+void FromProto(TBundleResourceQuotaPtr resourceQuota, const NBundleController::NProto::TResourceQuota* protoResourceQuota)
 {
     YT_FROMPROTO_OPTIONAL_PTR(protoResourceQuota, memory, resourceQuota, Memory);
-    if (protoResourceQuota->has_vcpu()) {
-        int VFactor = 1000;
-        resourceQuota->Cpu = static_cast<double>(protoResourceQuota->vcpu()) / VFactor;
-    }
+    YT_FROMPROTO_OPTIONAL_PTR(protoResourceQuota, vcpu, resourceQuota, Vcpu);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

yt/yt/client/bundle_controller_client/bundle_controller_settings.h

@@ -137,20 +137,18 @@ DEFINE_REFCOUNTED_TYPE(TBundleConfigConstraints)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-struct TResourceQuota
+struct TBundleResourceQuota
     : public NYTree::TYsonStruct
 {
-    double Cpu;
+    int Vcpu;
     i64 Memory;
 
-    int Vcpu() const;
-
-    REGISTER_YSON_STRUCT(TResourceQuota);
+    REGISTER_YSON_STRUCT(TBundleResourceQuota);
 
     static void Register(TRegistrar registrar);
 };
 
-DEFINE_REFCOUNTED_TYPE(TResourceQuota)
+DEFINE_REFCOUNTED_TYPE(TBundleResourceQuota)
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -179,8 +177,8 @@ void FromProto(TBundleTargetConfigPtr bundleConfig, const NBundleController::NPr
 void ToProto(NBundleController::NProto::TBundleConfigConstraints* protoBundleConfigConstraints, const TBundleConfigConstraintsPtr bundleConfigConstraints);
 void FromProto(TBundleConfigConstraintsPtr bundleConfigConstraints, const NBundleController::NProto::TBundleConfigConstraints* protoBundleConfigConstraints);
 
-void ToProto(NBundleController::NProto::TResourceQuota* protoResourceQuota, const TResourceQuotaPtr resourceQuota);
-void FromProto(TResourceQuotaPtr resourceQuota, const NBundleController::NProto::TResourceQuota* protoResourceQuota);
+void ToProto(NBundleController::NProto::TResourceQuota* protoResourceQuota, const TBundleResourceQuotaPtr resourceQuota);
+void FromProto(TBundleResourceQuotaPtr resourceQuota, const NBundleController::NProto::TResourceQuota* protoResourceQuota);
 
 ////////////////////////////////////////////////////////////////////////////////
 

yt/yt/client/bundle_controller_client/public.h

@@ -18,7 +18,7 @@ DECLARE_REFCOUNTED_STRUCT(TInstanceSize)
 DECLARE_REFCOUNTED_STRUCT(TBundleTargetConfig)
 DECLARE_REFCOUNTED_STRUCT(TBundleConfigDescriptor)
 DECLARE_REFCOUNTED_STRUCT(TBundleConfigConstraints)
-DECLARE_REFCOUNTED_STRUCT(TResourceQuota)
+DECLARE_REFCOUNTED_STRUCT(TBundleResourceQuota)
 
 struct TBundleConfigDescriptor;
 
@@ -29,7 +29,7 @@ struct TDefaultInstanceConfig;
 struct TInstanceSize;
 struct TBundleTargetConfig;
 struct TBundleConfigConstraints;
-struct TResourceQuota;
+struct TBundleResourceQuota;
 
 ////////////////////////////////////////////////////////////////////////////////