> On Aug. 29, 2016, 1:59 a.m., Qian Zhang wrote: > > src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp, > > line 49 > > <https://reviews.apache.org/r/51097/diff/13/?file=1487596#file1487596line49> > > > > The indent should be 4 spaces, please see the following code as a > > reference. > > > > https://github.com/apache/mesos/blob/1.0.0/src/slave/containerizer/mesos/containerizer.cpp#L179:L180 > > > > Ditto for all other places.
Yeah, I saw that. The problem is that vim is doing this indentation, since it sees two function calls, I think it autoindents to 8 spaces. Not sure if that is the right thing. Let me check with Jie or one of the other shepherds. Its a bit of a pain to do this manually. > On Aug. 29, 2016, 1:59 a.m., Qian Zhang wrote: > > src/slave/containerizer/mesos/isolators/network/cni/spec.cpp, line 63 > > <https://reviews.apache.org/r/51097/diff/13/?file=1487598#file1487598line63> > > > > I would suggest to switch `msg` and `code`. You mean the parameters right? The default values should always be at the end. May be I didn't understand the comment? - Avinash ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/51097/#review147113 ----------------------------------------------------------- On Aug. 28, 2016, 7:14 p.m., Avinash sridharan wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/51097/ > ----------------------------------------------------------- > > (Updated Aug. 28, 2016, 7:14 p.m.) > > > Review request for mesos, Jie Yu and Qian Zhang. > > > Bugs: MESOS-6023 > https://issues.apache.org/jira/browse/MESOS-6023 > > > Repository: mesos > > > Description > ------- > > This class will embody the logic for implementing the CNI port-mapper > plugin. > > Also added helper functions in `cni::spec` to be able to log CNI > plugin error as a JSON formatted string of `spec::error`. > > > Diffs > ----- > > src/Makefile.am 120a715eeeb7fb222d1169500950b5c7643df554 > > src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/main.cpp > PRE-CREATION > > src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.hpp > PRE-CREATION > > src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp > PRE-CREATION > src/slave/containerizer/mesos/isolators/network/cni/spec.hpp > e6967415a689184f13d65a986f13b0af54364fb2 > src/slave/containerizer/mesos/isolators/network/cni/spec.cpp > 938a9f3bff2a95c8591450f0edafaddb01833e59 > > Diff: https://reviews.apache.org/r/51097/diff/ > > > Testing > ------- > > Tested the port-mapper with the following CNI config: > { > "name": "mynet", > "type": "port-mapper", > "chain": "MESOS", > "delegate": { > "type" : "bridge", > "bridge": "cni0", > "isGateway": true, > "ipMasq": true, > "ipam": { > "type": "host-local", > "subnet": "10.22.0.0/16", > "routes": [ > { "dst": "0.0.0.0/0" } > ] > } > }, > "args" : { > "org.apache.mesos" : { > "network_info" : { > "port_mappings": { > "host_port" : 80, > "container_port" : 80 > } > } > } > } > } > > and the following environment variables: > export CNI_COMMAND="ADD" > export CNI_CONTAINERID="0000000111101110" > export CNI_PATH="$MESOS_INSTALL:/home/vagrant/dev/go/cni/bin" > export CNI_IFNAME="eth0" > export CNI_NETNS="/etc/netns" > > If we remove fields from the above CNI config, or remove certain environment > variables the creation of the `PortMapper` correctly fails. However, if > config and environment variables are passed as is it will create the > `PortMapper` correctly. > > > Thanks, > > Avinash sridharan > >
