Skip to content

4.13 forward merge#3699

Merged
yadvr merged 3 commits into
masterfrom
4.13
Nov 21, 2019
Merged

4.13 forward merge#3699
yadvr merged 3 commits into
masterfrom
4.13

Conversation

@yadvr
Copy link
Copy Markdown
Member

@yadvr yadvr commented Nov 21, 2019

Description

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

How Has This Been Tested?

@ustcweizhou @yadvr
vpc: fix acl rule with protocol number is not applied correctly in vp…
dcc798d 
…c vr (#3678)

When add a acl rule with protocol number, the iptables rules in vpc vr is not applied correctly.
for example, when add an ingress acl rule (protocol number:50, cidr: 2.2.2.2/32), we expect to have a iptables rule: "-A ACL_INBOUND_eth2 -s 2.2.2.2/32 -p esp -j ACCEPT"
the actual rule is "-A ACL_INBOUND_eth2 -j DROP"

It is because the rules in json are not correct.
network_acl.json.a8c52dca-0278-4e1c-b72b-987ca7121f4f.gz:{"device":"eth2","mac_address":"02:00:7d:27:00:02","private_gateway_acl":false,"nic_ip":"192.168.11.12","nic_netmask":"28","ingress_rules":[{"type":"protocol","protocol":50,"cidr":"ACCEPT","allowed":false},{"type":"all","cidr":"0.0.0.0/0","allowed":true},],"egress_rules":[],"type":"networkacl"}

Fixes: #3602
@ustcweizhou @yadvr
kvm: fix issue that network rules for secondary IPs are not applied (#…
23ca806 
…3636)

When I add a secondary IP to a nic on shared network in advanced zone with security groups, the network rules for new IP are not applied on KVM hypervisors.
It is because "--action -A" cannot be recognized in security_group.py after commit ac73e7e. changing to "--action=-A" will fix it.
@ustcweizhou @yadvr
server: acquire IPv4 address when add secondary IP to nic if IP is no…
d981edb 
…t specified (#3635)

After commit fbf4884, admin need to specify an ipv4 or ipv6 addresses when add IP to nic which breaks backward compatibity. If IP is not specified, a IPv4 address should be returned.
@yadvr yadvr merged commit 114df3d into master Nov 21, 2019
@yadvr yadvr added this to the 4.14.0.0 milestone Nov 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

4.14.0.0

Development

Successfully merging this pull request may close these issues.

2 participants

@yadvr @ustcweizhou