include public ip in price calculation
This commit is contained in:
parent
c486bc049c
commit
dc316c0ad5
@ -170,15 +170,6 @@ impl Request {
|
|||||||
let memory_mib = vcpus * memory_per_cpu as u32;
|
let memory_mib = vcpus * memory_per_cpu as u32;
|
||||||
let disk_size_mib = vcpus * disk_per_cpu as u32;
|
let disk_size_mib = vcpus * disk_per_cpu as u32;
|
||||||
|
|
||||||
let nanocredits = super::calculate_nanocredits(
|
|
||||||
vcpus,
|
|
||||||
memory_mib,
|
|
||||||
disk_size_mib,
|
|
||||||
node.public_ipv4,
|
|
||||||
self.hours,
|
|
||||||
node.price,
|
|
||||||
);
|
|
||||||
|
|
||||||
let (extra_ports, public_ipv4): (Vec<u32>, bool) = match &self.ipv4 {
|
let (extra_ports, public_ipv4): (Vec<u32>, bool) = match &self.ipv4 {
|
||||||
IPv4Config::PublishPorts(vec) => (vec.to_vec(), false),
|
IPv4Config::PublishPorts(vec) => (vec.to_vec(), false),
|
||||||
IPv4Config::PublicIPv4 => (Vec::new(), true),
|
IPv4Config::PublicIPv4 => (Vec::new(), true),
|
||||||
@ -193,6 +184,15 @@ impl Request {
|
|||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let nanocredits = super::calculate_nanocredits(
|
||||||
|
vcpus,
|
||||||
|
memory_mib,
|
||||||
|
disk_size_mib,
|
||||||
|
public_ipv4,
|
||||||
|
self.hours,
|
||||||
|
node.price,
|
||||||
|
);
|
||||||
|
|
||||||
let brain_req = proto::NewVmReq {
|
let brain_req = proto::NewVmReq {
|
||||||
uuid: String::new(),
|
uuid: String::new(),
|
||||||
hostname: self.hostname.clone(),
|
hostname: self.hostname.clone(),
|
||||||
|
Loading…
Reference in New Issue
Block a user