Skip to content

ajusting dict to pass on if tests later on code, in this way arping i… #2806

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.

Sign up for GitHub

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

Merged
yadvr merged 1 commit into from
Aug 28, 2018
Merged

ajusting dict to pass on if tests later on code, in this way arping i… #2806

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion systemvm/debian/opt/cloud/bin/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def processCLItem(self, num, nw_type):
if('localgw' in self.qFile.data['cmd_line']):
dp['gateway'] = self.qFile.data['cmd_line']['localgw']
else:
dp['gateway'] = 'None'
dp['gateway'] = ''

@wido wido Aug 21, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why not use None instead of a empty string? Because None is the best way in Python to tell it's empty and does not contain anything.

@DaanHoogland DaanHoogland Aug 21, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

yes, or 'None' (in a string) I thought I commented that but cannot find my remarks.

@DaanHoogland DaanHoogland Aug 21, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ah made it on the ticket instead of here #2805

@lhmachado lhmachado Aug 21, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@wido later on code, there is a string literal concatenation, so if we use None (Type), will raise an "TypeError: cannot concatenate 'str' and 'NoneType' objects".

In python the '' also represent emptyness in if steatements, for this reason in this particular case i`ve used '' instead None (type) .

@DaanHoogland DaanHoogland Aug 21, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ok, good point. So either this (less code) or a check on the gateway later to prevent the faulty concat. I can live with this solution. @wido?

@yadvr yadvr Aug 28, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm okay with the change.

dp['nic_dev_id'] = num
dp['nw_type'] = nw_type
qf = QueueFile()
Expand Down