Skip to content

Allow to POST and MO directly in the hierarchy #41

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

Open
giovannimeo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow to POST and MO directly in the hierarchy #41

Show file tree
Hide file tree
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
18 changes: 12 additions & 6 deletions pyaci/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ def GET(self, format=None, **kwargs):
def DELETE(self, format=None):
return self._performRequest('DELETE', format=format)

def POST(self, format=None, **kwargs):
def POST(self, format=None, useParentUrl=False, **kwargs):
return self._performRequest(
'POST', format=format, needData=True, **kwargs)
'POST', format=format, needData=True, useParentUrl=useParentUrl, **kwargs)

def _url(self, format=None, **kwargs):
def _url(self, format=None, useParentUrl=False, **kwargs):
if format is None:
format = payloadFormat

Expand All @@ -117,15 +117,18 @@ def loop(entity, accumulator):
else:
options = ''

return loop(self, '') + '.' + format + options
if useParentUrl:
return loop(self._parentApi, '') + '.' + format + options
else:
return loop(self, '') + '.' + format + options

def _performRequest(self, method, format=None, needData=False, **kwargs):
def _performRequest(self, method, format=None, needData=False, useParentUrl=False, **kwargs):
if format is None:
format = payloadFormat

logger = subLogger(method)
rootApi = self._rootApi()
url = self._url(format, **kwargs)
url = self._url(format, useParentUrl=useParentUrl, **kwargs)

if needData:
if format == 'json':
Expand Down Expand Up @@ -620,6 +623,9 @@ def GET(self, format=None, **kwargs):
else:
return result

def POST(self, format=None, **kwargs):
return super(Mo, self).POST(format, useParentUrl=(not self._isTopRoot()), **kwargs)

@property
def _relativeUrl(self):
if self._className == 'topRoot':
Expand Down
8 changes: 4 additions & 4 deletions tests/core-tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,21 +647,21 @@ def testMoXmlDELETE(self):
@httpretty.activate
def testMoJsonPOST(self):
httpretty.register_uri(httpretty.POST,
'http://localhost/api/mo/uni/tn-test.json')
'http://localhost/api/mo/uni.json')
tenant = self.tree.polUni().fvTenant('test')
tenant.POST(format='json')
(httpretty.last_request().method).should.equal('POST')
(httpretty.last_request().path).should.equal(
'/api/mo/uni/tn-test.json'
'/api/mo/uni.json'
)
(httpretty.last_request().body.decode("utf-8")).should.equal(tenant.Json)

@httpretty.activate
def testMoXmlPOST(self):
httpretty.register_uri(httpretty.POST,
'http://localhost/api/mo/uni/tn-test.xml')
'http://localhost/api/mo/uni.xml')
tenant = self.tree.polUni().fvTenant('test')
tenant.POST(format='xml')
(httpretty.last_request().method).should.equal('POST')
(httpretty.last_request().path).should.equal('/api/mo/uni/tn-test.xml')
(httpretty.last_request().path).should.equal('/api/mo/uni.xml')
(httpretty.last_request().body.decode('utf8')).should.equal(tenant.Xml)