Changes to the code based on upstreamed packet-python PRs - Githubissues

input-output-hk / nixops-packet

NixOps Packet.net Plugin

GNU Lesser General Public License v3.0

5 stars 5 forks source link

Changes to the code based on upstreamed packet-python PRs #14

Closed grahamc closed 4 years ago

grahamc commented 4 years ago

I upstreamed most of the patches in https://github.com/packethost/packet-python/compare/03165b26c6e740e1157d3a7e7df6cd3b6a2750e1...0aa7e7e9a7009b89d09f2dfa8d32a222d89bb829 (input-output-hk:hardware-reservation's branch at this time) in PRs:

https://github.com/packethost/packet-python/pull/71 device: capture hardware reservation
https://github.com/packethost/packet-python/pull/72 create_device: support customdata
https://github.com/packethost/packet-python/pull/73 device: capture spot_price_max, termination_time, provisioning_percentage
https://github.com/packethost/packet-python/pull/74 plan: intake available_in
https://github.com/packethost/packet-python/pull/75 manager: add create_project_ssh_key:

The only commit in https://github.com/packethost/packet-python/compare/03165b26c6e740e1157d3a7e7df6cd3b6a2750e1...0aa7e7e9a7009b89d09f2dfa8d32a222d89bb82 I didn't backport is https://github.com/packethost/packet-python/commit/e8bd41689fde2a46c08580208da25bd06e86c67d, because it is quite gnarly and I think working around an upstream issue -- I'm not sure. Anyway, this change to reservationId is the only thing I think needed -- and the second commit is just the way I've been testing the integrated branch.

Probably shouldn't merge this for now, and instead just use the upstream release once it is done.

johnalotoski commented 4 years ago

The reservationId change has been applied to master. We're pointing to the v1.42.0-patched branch of our packet-python fork as we need the project keys fix commit for now (https://github.com/input-output-hk/packet-python/commit/4baec99865cf97b0fbed6e7a7dc3ed6e438541dd on that branch).