Merge pull request 'renames memory/disk size fields to use MiB in app proto' (#7) from credits_app into credits-v2

Reviewed-on: #7

Cargo.lock

@@ -1,7 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+# SPDX-License-Identifier: Apache-2.0
 version = 4
 
 [[package]]

LICENSE

@@ -1,202 +1,338 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-                                 Apache License
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-                           Version 2.0, January 2004
+ <https://fsf.org/>
-                        http://www.apache.org/licenses/
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+                            Preamble
 
-   1. Definitions.
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
 
-      "License" shall mean the terms and conditions for use, reproduction,
+  When we speak of free software, we are referring to freedom, not
-      and distribution as defined by Sections 1 through 9 of this document.
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
+  To protect your rights, we need to make restrictions that forbid
-      the copyright owner that is granting the License.
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
-      "Legal Entity" shall mean the union of the acting entity and all
+  For example, if you distribute copies of such a program, whether
-      other entities that control, are controlled by, or are under common
+gratis or for a fee, you must give the recipients all the rights that
-      control with that entity. For the purposes of this definition,
+you have.  You must make sure that they, too, receive or can get the
-      "control" means (i) the power, direct or indirect, to cause the
+source code.  And you must show them these terms so they know their
-      direction or management of such entity, whether by contract or
+rights.
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
+  We protect your rights with two steps: (1) copyright the software, and
-      exercising permissions granted by this License.
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-      "Source" form shall mean the preferred form for making modifications,
+  Also, for each author's protection and ours, we want to make certain
-      including but not limited to software source code, documentation
+that everyone understands that there is no warranty for this free
-      source, and configuration files.
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
 
-      "Object" form shall mean any form resulting from mechanical
+  Finally, any free program is threatened constantly by software
-      transformation or translation of a Source form, including but
+patents.  We wish to avoid the danger that redistributors of a free
-      not limited to compiled object code, generated documentation,
+program will individually obtain patent licenses, in effect making the
-      and conversions to other media types.
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
-      "Work" shall mean the work of authorship, whether in Source or
+  The precise terms and conditions for copying, distribution and
-      Object form, made available under the License, as indicated by a
+modification follow.
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
 
-      "Derivative Works" shall mean any work, whether in Source or Object
+                    GNU GENERAL PUBLIC LICENSE
-      form, that is based on (or derived from) the Work and for which the
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
 
-      "Contribution" shall mean any work of authorship, including
+  0. This License applies to any program or other work which contains
-      the original version of the Work and any modifications or additions
+a notice placed by the copyright holder saying it may be distributed
-      to that Work or Derivative Works thereof, that is intentionally
+under the terms of this General Public License.  The "Program", below,
-      submitted to Licensor for inclusion in the Work by the copyright owner
+refers to any such program or work, and a "work based on the Program"
-      or by an individual or Legal Entity authorized to submit on behalf of
+means either the Program or any derivative work under copyright law:
-      the copyright owner. For the purposes of this definition, "submitted"
+that is to say, a work containing the Program or a portion of it,
-      means any form of electronic, verbal, or written communication sent
+either verbatim or with modifications and/or translated into another
-      to the Licensor or its representatives, including but not limited to
+language.  (Hereinafter, translation is included without limitation in
-      communication on electronic mailing lists, source code control systems,
+the term "modification".)  Each licensee is addressed as "you".
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
+Activities other than copying, distribution and modification are not
-      on behalf of whom a Contribution has been received by Licensor and
+covered by this License; they are outside its scope.  The act of
-      subsequently incorporated within the Work.
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
+  1. You may copy and distribute verbatim copies of the Program's
-      this License, each Contributor hereby grants to You a perpetual,
+source code as you receive it, in any medium, provided that you
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+conspicuously and appropriately publish on each copy an appropriate
-      copyright license to reproduce, prepare Derivative Works of,
+copyright notice and disclaimer of warranty; keep intact all the
-      publicly display, publicly perform, sublicense, and distribute the
+notices that refer to this License and to the absence of any warranty;
-      Work and such Derivative Works in Source or Object form.
+and give any other recipients of the Program a copy of this License
+along with the Program.
 
-   3. Grant of Patent License. Subject to the terms and conditions of
+You may charge a fee for the physical act of transferring a copy, and
-      this License, each Contributor hereby grants to You a perpetual,
+you may at your option offer warranty protection in exchange for a fee.
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
 
-   4. Redistribution. You may reproduce and distribute copies of the
+  2. You may modify your copy or copies of the Program or any portion
-      Work or Derivative Works thereof in any medium, with or without
+of it, thus forming a work based on the Program, and copy and
-      modifications, and in Source or Object form, provided that You
+distribute such modifications or work under the terms of Section 1
-      meet the following conditions:
+above, provided that you also meet all of these conditions:
 
-      (a) You must give any other recipients of the Work or
+    a) You must cause the modified files to carry prominent notices
-          Derivative Works a copy of this License; and
+    stating that you changed the files and the date of any change.
 
-      (b) You must cause any modified files to carry prominent notices
+    b) You must cause any work that you distribute or publish, that in
-          stating that You changed the files; and
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
 
-      (c) You must retain, in the Source form of any Derivative Works
+    c) If the modified program normally reads commands interactively
-          that You distribute, all copyright, patent, trademark, and
+    when run, you must cause it, when started running for such
-          attribution notices from the Source form of the Work,
+    interactive use in the most ordinary way, to print or display an
-          excluding those notices that do not pertain to any part of
+    announcement including an appropriate copyright notice and a
-          the Derivative Works; and
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
 
-      (d) If the Work includes a "NOTICE" text file as part of its
+These requirements apply to the modified work as a whole.  If
-          distribution, then any Derivative Works that You distribute must
+identifiable sections of that work are not derived from the Program,
-          include a readable copy of the attribution notices contained
+and can be reasonably considered independent and separate works in
-          within such NOTICE file, excluding those notices that do not
+themselves, then this License, and its terms, do not apply to those
-          pertain to any part of the Derivative Works, in at least one
+sections when you distribute them as separate works.  But when you
-          of the following places: within a NOTICE text file distributed
+distribute the same sections as part of a whole which is a work based
-          as part of the Derivative Works; within the Source form or
+on the Program, the distribution of the whole must be on the terms of
-          documentation, if provided along with the Derivative Works; or,
+this License, whose permissions for other licensees extend to the
-          within a display generated by the Derivative Works, if and
+entire whole, and thus to each and every part regardless of who wrote it.
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
 
-      You may add Your own copyright statement to Your modifications and
+Thus, it is not the intent of this section to claim rights or contest
-      may provide additional or different license terms and conditions
+your rights to work written entirely by you; rather, the intent is to
-      for use, reproduction, or distribution of Your modifications, or
+exercise the right to control the distribution of derivative or
-      for any such Derivative Works as a whole, provided Your use,
+collective works based on the Program.
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
+In addition, mere aggregation of another work not based on the Program
-      any Contribution intentionally submitted for inclusion in the Work
+with the Program (or with a work based on the Program) on a volume of
-      by You to the Licensor shall be under the terms and conditions of
+a storage or distribution medium does not bring the other work under
-      this License, without any additional terms or conditions.
+the scope of this License.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
 
-   6. Trademarks. This License does not grant permission to use the trade
+  3. You may copy and distribute the Program (or a work based on it,
-      names, trademarks, service marks, or product names of the Licensor,
+under Section 2) in object code or executable form under the terms of
-      except as required for reasonable and customary use in describing the
+Sections 1 and 2 above provided that you also do one of the following:
-      origin of the Work and reproducing the content of the NOTICE file.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
+    a) Accompany it with the complete corresponding machine-readable
-      agreed to in writing, Licensor provides the Work (and each
+    source code, which must be distributed under the terms of Sections
-      Contributor provides its Contributions) on an "AS IS" BASIS,
+    1 and 2 above on a medium customarily used for software interchange; or,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
 
-   8. Limitation of Liability. In no event and under no legal theory,
+    b) Accompany it with a written offer, valid for at least three
-      whether in tort (including negligence), contract, or otherwise,
+    years, to give any third party, for a charge no more than your
-      unless required by applicable law (such as deliberate and grossly
+    cost of physically performing source distribution, a complete
-      negligent acts) or agreed to in writing, shall any Contributor be
+    machine-readable copy of the corresponding source code, to be
-      liable to You for damages, including any direct, indirect, special,
+    distributed under the terms of Sections 1 and 2 above on a medium
-      incidental, or consequential damages of any character arising as a
+    customarily used for software interchange; or,
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
+    c) Accompany it with the information you received as to the offer
-      the Work or Derivative Works thereof, You may choose to offer,
+    to distribute corresponding source code.  (This alternative is
-      and charge a fee for, acceptance of support, warranty, indemnity,
+    allowed only for noncommercial distribution and only if you
-      or other liability obligations and/or rights consistent with this
+    received the program in object code or executable form with such
-      License. However, in accepting such obligations, You may act only
+    an offer, in accord with Subsection b above.)
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
 
-   APPENDIX: How to apply the Apache License to your work.
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
 
-      To apply the Apache License to your work, attach the following
+  4. You may not copy, modify, sublicense, or distribute the Program
-      boilerplate notice, with the fields enclosed by brackets "[]"
+except as expressly provided under this License.  Any attempt
-      replaced with your own identifying information. (Don't include
+otherwise to copy, modify, sublicense or distribute the Program is
-      the brackets!)  The text should be enclosed in the appropriate
+void, and will automatically terminate your rights under this License.
-      comment syntax for the file format. We also recommend that a
+However, parties who have received copies, or rights, from you under
-      file or class name and description of purpose be included on the
+this License will not have their licenses terminated so long as such
-      same "printed page" as the copyright notice for easier
+parties remain in full compliance.
-      identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
+  6. Each time you redistribute the Program (or any work based on the
-   you may not use this file except in compliance with the License.
+Program), the recipient automatically receives a license from the
-   You may obtain a copy of the License at
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
 
-   Unless required by applicable law or agreed to in writing, software
+If any portion of this section is held invalid or unenforceable under
-   distributed under the License is distributed on an "AS IS" BASIS,
+any particular circumstance, the balance of the section is intended to
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+apply and the section as a whole is intended to apply in other
-   See the License for the specific language governing permissions and
+circumstances.
-   limitations under the License.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Moe Ghoul>, 1 April 1989
+  Moe Ghoul, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

build.rs

@@ -9,7 +9,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "#[derive(serde::Serialize, serde::Deserialize)]",
         )
         .type_attribute(
-            ".app_proto.MappedPort",
+            ".common_proto.MappedPort",
             "#[derive(serde::Serialize, serde::Deserialize)]",
         )
         .type_attribute(
@@ -36,6 +36,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             ".vm_proto.VmNodeListResp",
             "#[derive(serde::Serialize, serde::Deserialize)]",
         )
+        .type_attribute(
+            ".vm_proto.MeasurementArgs",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
+        .type_attribute(
+            ".vm_proto.MeasurementIP",
+            "#[derive(serde::Serialize, serde::Deserialize)]",
+        )
         .type_attribute(
             ".dtpm_proto.FileEntry",
             "#[derive(serde::Serialize, serde::Deserialize, bincode::Encode, bincode::Decode)]",

proto/sgx/app.proto

@@ -13,7 +13,7 @@ message AppContract {
   string node_pubkey = 4;
   string public_ipv4 = 5;
   AppResource resource = 6;
-  repeated MappedPort mapped_ports = 7;
+  repeated common_proto.MappedPort mapped_ports = 7;
   string created_at = 8;
   string updated_at = 9;
   uint64 nano_per_minute = 10;
@@ -38,24 +38,19 @@ message NewAppReq {
 }
 
 message AppResource {
-  uint32 memory_mb = 1;
+  uint32 memory_mib = 1;
-  uint32 disk_mb = 2;
+  uint32 disk_size_mib = 2;
-  uint32 vcpu  = 3;
+  uint32 vcpus  = 3;
   repeated uint32 ports = 4;
 }
 
 message NewAppRes {
   string uuid = 1;
-  string status = 2;
+  string ip_address = 2;
-  string ip_address = 3;
+  repeated common_proto.MappedPort mapped_ports = 3;
-  repeated MappedPort mapped_ports = 4;
+  string error = 4;
-  string error = 5;
 }
 
-message MappedPort {
-  uint32 host_port = 1;
-  uint32 app_port = 2;
-}
 
 message DelAppReq {
   string uuid= 1;
@@ -71,13 +66,14 @@ message ListAppContractsReq {
 
 message AppNodeFilters {
   uint32 vcpus = 1;
-  uint32 memory_mb = 2;
+  uint32 memory_mib = 2;
-  uint32 storage_mb = 3;
+  uint32 storage_mib = 3;
   string country = 4;
   string region = 5;
   string city = 6;
   string ip = 7;
   string node_pubkey = 8;
+  uint32 free_ports = 9;
 }
 
 message AppNodeListResp {
@@ -87,12 +83,15 @@ message AppNodeListResp {
   string region = 4;
   string city = 5;
   string ip = 6; // required for latency test
-  uint64 price = 7; // nanoLP per unit per minute
+  repeated string reports = 7; // TODO: this will become an enum
-  repeated string reports = 8; // TODO: this will become an enum
+  uint64 price = 8; // nanocredits per unit per minute
+  uint64 vcpus = 9;
+  uint64 memory_mib = 10;
+  uint64 disk_mib = 11;
 }
 
 service BrainAppCli {
-  rpc DeployApp (NewAppReq) returns (NewAppRes);
+  rpc NewApp (NewAppReq) returns (NewAppRes);
   rpc DeleteApp (DelAppReq) returns (common_proto.Empty);
   rpc ListAppContracts (ListAppContractsReq) returns (stream AppContract);
   rpc ListAppNodes (AppNodeFilters) returns (stream AppNodeListResp);
@@ -116,8 +115,8 @@ message AppNodeResources {
   string node_pubkey = 1;
   uint32 avail_no_of_port = 2;
   uint32 avail_vcpus = 3;
-  uint32 avail_memory_mb = 4;
+  uint32 avail_memory_mib = 4;
-  uint32 avail_storage_mb = 5;
+  uint32 avail_storage_mib = 5;
   uint32 max_ports_per_app = 6;
 }
 
@@ -144,7 +143,7 @@ message DaemonMessageApp {
 }
 
 service BrainAppDaemon {
-  rpc RegisterAppNode (RegisterAppNodeReq) returns (stream AppContract);
+  rpc RegisterAppNode (RegisterAppNodeReq) returns (stream DelAppReq);
   rpc BrainMessages (DaemonAuth) returns (stream BrainMessageApp);
   rpc DaemonMessages (stream DaemonMessageApp) returns (common_proto.Empty);
-}
+}

proto/shared/common.proto

@@ -9,3 +9,8 @@ message Empty {
 message Pubkey {
   string pubkey = 1;
 }
+
+message MappedPort {
+  uint32 host_port = 1;
+  uint32 guest_port = 2;
+}

proto/shared/general.proto

@@ -47,7 +47,7 @@ message KickReq {
 }
 
 message KickResp {
-  uint64 nano_lp = 1;
+  uint64 nano_credits = 1;
 }
 
 message BanUserReq {
@@ -90,4 +90,4 @@ service BrainGeneralCli {
       returns (stream vm_proto.VmContract);
   rpc ListAllAppContracts (common_proto.Empty)
       returns (stream app_proto.AppContract);
-}
+}

proto/snp/vm.proto

@@ -10,20 +10,22 @@ message VmContract {
   string hostname = 2;
   string admin_pubkey = 3;
   string node_pubkey = 4;
-  repeated uint32 exposed_ports = 5;
+  string node_ip = 5;
-  string public_ipv4 = 6;
+  string location = 6;
-  string public_ipv6 = 7;
+  repeated common_proto.MappedPort mapped_ports = 7;
-  uint32 disk_size_gb = 8;
+  string vm_public_ipv4 = 8;
-  uint32 vcpus = 9;
+  string vm_public_ipv6 = 9;
-  uint32 memory_mb = 10;
+  uint32 disk_size_gb = 10;
-  string kernel_sha = 11;
+  uint32 vcpus = 11;
-  string dtrfs_sha = 12;
+  uint32 memory_mb = 12;
-  string created_at = 13;
+  string kernel_sha = 13;
-  string updated_at = 14;
+  string dtrfs_sha = 14;
-  // total nanoLP cost per minute (for all units)
+  string created_at = 15;
-  uint64 nano_per_minute = 15;
+  string updated_at = 16;
-  uint64 locked_nano = 16;
+  // total nanocredits cost per minute (for all units)
-  string collected_at = 17;
+  uint64 nano_per_minute = 17;
+  uint64 locked_nano = 18;
+  string collected_at = 19;
 }
 
 message MeasurementArgs {
@@ -52,7 +54,7 @@ message RegisterVmNodeReq {
   string country = 4;
   string region = 5;
   string city = 6;
-  // nanoLP per unit per minute
+  // nanocredits per unit per minute
   uint64 price = 7;
 }
 
@@ -62,8 +64,8 @@ message VmNodeResources {
   uint32 avail_ipv4 = 3;
   uint32 avail_ipv6 = 4;
   uint32 avail_vcpus = 5;
-  uint32 avail_memory_mb = 6;
+  uint32 avail_memory_mib = 6;
-  uint32 avail_storage_gb = 7;
+  uint32 avail_storage_mib = 7;
   uint32 max_ports_per_vm = 8;
 }
 
@@ -75,9 +77,9 @@ message NewVmReq {
   repeated uint32 extra_ports = 5;
   bool public_ipv4 = 6;
   bool public_ipv6 = 7;
-  uint32 disk_size_gb = 8;
+  uint32 disk_size_mib = 8;
   uint32 vcpus = 9;
-  uint32 memory_mb = 10;
+  uint32 memory_mib = 10;
   string kernel_url = 11;
   string kernel_sha = 12;
   string dtrfs_url = 13;
@@ -96,9 +98,9 @@ message UpdateVmReq {
   string uuid = 1;
   string hostname = 2;
   string admin_pubkey = 3;
-  uint32 disk_size_gb = 4;
+  uint32 disk_size_mib = 4;
   uint32 vcpus = 5;
-  uint32 memory_mb = 6;
+  uint32 memory_mib = 6;
   string kernel_url = 7;
   string kernel_sha = 8;
   string dtrfs_url = 9;
@@ -141,7 +143,7 @@ message VmDaemonMessage {
 }
 
 service BrainVmDaemon {
-  rpc RegisterVmNode (RegisterVmNodeReq) returns (stream VmContract);
+  rpc RegisterVmNode (RegisterVmNodeReq) returns (stream DeleteVmReq);
   rpc BrainMessages (DaemonStreamAuth) returns (stream BrainVmMessage);
   rpc DaemonMessages (stream VmDaemonMessage) returns (common_proto.Empty);
 }
@@ -157,8 +159,8 @@ message VmNodeFilters {
   bool offers_ipv4 = 2;
   bool offers_ipv6 = 3;
   uint32 vcpus = 4;
-  uint32 memory_mb = 5;
+  uint32 memory_mib = 5;
-  uint32 storage_gb = 6;
+  uint32 storage_mib = 6;
   string country = 7;
   string region = 8;
   string city = 9;
@@ -174,7 +176,12 @@ message VmNodeListResp {
   string city = 5;
   string ip = 6; // required for latency test
   repeated string reports = 7; // TODO: this will become an enum
-  uint64 price = 8; // nanoLP per unit per minute
+  uint64 price = 8; // nanocredits per unit per minute
+  uint64 vcpus = 9;
+  uint64 memory_mib = 10;
+  uint64 disk_mib = 11;
+  bool public_ipv4 = 12;
+  bool public_ipv6 = 13;
 }
 
 message ExtendVmReq {

src/sgx/types/brain.rs

@@ -1,23 +1,24 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::app_proto::{daemon_message_app, AppNodeResources, DaemonMessageApp};
-use crate::app_proto::{AppResource, DaemonAuth, MappedPort, NewAppReq, NewAppRes};
+use crate::app_proto::{AppResource, DaemonAuth, NewAppReq, NewAppRes};
+use crate::common_proto::MappedPort;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
 pub struct Resource {
-    pub memory_mb: u32,
+    pub memory_mib: u32,
-    pub disk_mb: u32,
+    pub disk_size_mib: u32,
-    pub vcpu: u32,
+    pub vcpus: u32,
     pub port: Vec<u32>,
 }
 
 impl From<AppResource> for Resource {
     fn from(pb_val: AppResource) -> Self {
         Self {
-            memory_mb: pb_val.memory_mb,
+            memory_mib: pb_val.memory_mib,
-            disk_mb: pb_val.disk_mb,
+            disk_size_mib: pb_val.disk_size_mib,
-            vcpu: pb_val.vcpu,
+            vcpus: pb_val.vcpus,
             port: pb_val.ports,
         }
     }
@@ -25,9 +26,9 @@ impl From<AppResource> for Resource {
 impl From<Resource> for AppResource {
     fn from(val: Resource) -> AppResource {
         AppResource {
-            memory_mb: val.memory_mb,
+            memory_mib: val.memory_mib,
-            disk_mb: val.disk_mb,
+            disk_size_mib: val.disk_size_mib,
-            vcpu: val.vcpu,
+            vcpus: val.vcpus,
             ports: val.port,
         }
     }
@@ -95,14 +96,14 @@ impl From<(u16, u16)> for MappedPort {
     fn from(val: (u16, u16)) -> Self {
         Self {
             host_port: val.0 as u32,
-            app_port: val.1 as u32,
+            guest_port: val.1 as u32,
         }
     }
 }
 
 impl From<MappedPort> for (u16, u16) {
     fn from(val: MappedPort) -> Self {
-        (val.host_port as u16, val.app_port as u16)
+        (val.host_port as u16, val.guest_port as u16)
     }
 }