Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OM-43683 Add the new Commodity VCPURequest and VMemRequest into SDK #62

Merged
merged 3 commits into from
Mar 21, 2019

Conversation

ading1977
Copy link
Collaborator

The followings are changed:

  • Remove golang.org/x/net pkg as it is not used
  • Update github.com/golang/protobuf pkg to v1.3.1, otherwise NonMarketEntityDTO.pb.go file generation will fail because the reserved value (introduced in Feb 2019) is not recognized
    // Enumerate non market entities
    enum NonMarketEntityType {
        CLOUD_SERVICE = 0;
        // decommissioned WORKFLOW
        reserved 1;
        reserved "WORKFLOW";
        ACCOUNT = 2;
        PLAN_REPOSITORY = 3;
    }
  • Update to 6.4.0 protobuf bindings that include the newly added commodity type VCPU_REQUEST and VMEM_REQUEST

@coveralls
Copy link

Coverage Status

Coverage remained the same at 75.353% when pulling 1409a70 on ading1977:OM-43683 into fd31e1e on turbonomic:master.

@enlinxu
Copy link
Contributor

enlinxu commented Mar 19, 2019

The change seems much bigger than just adding the two commodities. Are we sure we are creating the diff based on the same branch?

@ading1977
Copy link
Collaborator Author

ading1977 commented Mar 20, 2019

The change seems much bigger than just adding the two commodities. Are we sure we are creating the diff based on the same branch?

Let me be more clear and specific. This change contains three parts:

  • Remove the unnecessary golang.org/x/net package, because we are currently using gorilla/websocket for websocket, and do not use x/net/websocket any more. This is instructed by the dependency management tool dep ensure.
  • Update the vendor/github.com/golang/protobuf to v1.3.1. Otherwise the generation of the NonMarketEntityDTO.pb.go file will fail as explained in the pull request. As a result there is a lot of changes to vendor directory.
  • There are quite some changes to the proto files between 6.3.0 and develop branch, especially for the following two files:
    CommonDTO.proto - 200 lines
    ActionExecution.proto - 55 lines
    All the pb.go files are generated with protoc --go_out=. *.proto command
  • Finally I have sanity tested locally that kubeturbo built with the new turbo-go-sdk works with turbo server. Supply chains show up fine, and actions are generated as expected.

@ading1977 ading1977 requested a review from bcervenak March 20, 2019 14:39
@enlinxu
Copy link
Contributor

enlinxu commented Mar 21, 2019

LGTM

Copy link
Contributor

@maxwangvmt maxwangvmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants